Message-ID: <56F8D1A4.2080603@rock-chips.com>
Date: Mon, 28 Mar 2016 14:39:32 +0800
From: Mark yao <mark.yao@rock-chips.com>
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.8.0
MIME-Version: 1.0
To: Tomeu Vizoso <tomeu.vizoso@collabora.com>, linux-kernel@vger.kernel.org
CC: David Airlie <airlied@linux.ie>, Heiko Stuebner <heiko@sntech.de>,
        dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org,
        linux-rockchip@lists.infradead.org
Subject: Re: [PATCH v2] drm/rockchip: vop: Disable planes when disabling CRTC
References: <1458659284-14039-1-git-send-email-tomeu.vizoso@collabora.com>
In-Reply-To: <1458659284-14039-1-git-send-email-tomeu.vizoso@collabora.com>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 8bit
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1729
Lines: 54

On 2016年03月22日 23:08, Tomeu Vizoso wrote:
> When a VOP is re-enabled, it will start scanning right away the
> framebuffers that were configured from the last time, even if those have
> been destroyed already.
>
> To prevent the VOP from trying to access freed memory, disable all its
> windows when the CRTC is being disabled, then each window will get a
> valid framebuffer address before it's enabled again.
>
> Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
> Link: http://lkml.kernel.org/g/CAAObsKAv+05ih5U+=4kic_NsjGMhfxYheHR8xXXmacZs+p5SHw@mail.gmail.com
> ---
>   drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 15 +++++++++++++++
>   1 file changed, 15 insertions(+)
>
> diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
> index 5e57f5b2e4b0..e2118e62345b 100644
> --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
> +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
> @@ -499,10 +499,25 @@ err_disable_hclk:
>   static void vop_crtc_disable(struct drm_crtc *crtc)
>   {
>   	struct vop *vop = to_vop(crtc);
> +	int i;
>   
>   	if (!vop->is_enabled)
>   		return;
>   
> +	/*
> +	 * We need to make sure that all windows are disabled before we
> +	 * disable that crtc. Otherwise we might try to scan from a destroyed
> +	 * buffer later.
> +	 */
> +	for (i = 0; i < vop->data->win_size; i++) {
> +		struct vop_win *vop_win = &vop->win[i];
> +		const struct vop_win_data *win = vop_win->data;
> +
> +		spin_lock(&vop->reg_lock);
> +		VOP_WIN_SET(vop, win, enable, 0);
> +		spin_unlock(&vop->reg_lock);
> +	}
> +
>   	drm_crtc_vblank_off(crtc);
>   
>   	/*
Looks good for me, and it works on my board.

Applied to my drm-fixes.

Thanks

-- 
Ｍark Yao