From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mark yao Subject: Re: [PATCH v2] drm/rockchip: vop: Disable planes when disabling CRTC Date: Mon, 28 Mar 2016 14:39:32 +0800 Message-ID: <56F8D1A4.2080603@rock-chips.com> References: <1458659284-14039-1-git-send-email-tomeu.vizoso@collabora.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1458659284-14039-1-git-send-email-tomeu.vizoso@collabora.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Tomeu Vizoso , linux-kernel@vger.kernel.org Cc: linux-rockchip@lists.infradead.org, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org List-Id: linux-rockchip.vger.kernel.org T24gMjAxNuW5tDAz5pyIMjLml6UgMjM6MDgsIFRvbWV1IFZpem9zbyB3cm90ZToKPiBXaGVuIGEg Vk9QIGlzIHJlLWVuYWJsZWQsIGl0IHdpbGwgc3RhcnQgc2Nhbm5pbmcgcmlnaHQgYXdheSB0aGUK PiBmcmFtZWJ1ZmZlcnMgdGhhdCB3ZXJlIGNvbmZpZ3VyZWQgZnJvbSB0aGUgbGFzdCB0aW1lLCBl dmVuIGlmIHRob3NlIGhhdmUKPiBiZWVuIGRlc3Ryb3llZCBhbHJlYWR5Lgo+Cj4gVG8gcHJldmVu dCB0aGUgVk9QIGZyb20gdHJ5aW5nIHRvIGFjY2VzcyBmcmVlZCBtZW1vcnksIGRpc2FibGUgYWxs IGl0cwo+IHdpbmRvd3Mgd2hlbiB0aGUgQ1JUQyBpcyBiZWluZyBkaXNhYmxlZCwgdGhlbiBlYWNo IHdpbmRvdyB3aWxsIGdldCBhCj4gdmFsaWQgZnJhbWVidWZmZXIgYWRkcmVzcyBiZWZvcmUgaXQn cyBlbmFibGVkIGFnYWluLgo+Cj4gU2lnbmVkLW9mZi1ieTogVG9tZXUgVml6b3NvIDx0b21ldS52 aXpvc29AY29sbGFib3JhLmNvbT4KPiBMaW5rOiBodHRwOi8vbGttbC5rZXJuZWwub3JnL2cvQ0FB T2JzS0F2KzA1aWg1VSs9NGtpY19Oc2pHTWhmeFloZUhSOHhYWG1hY1pzK3A1U0h3QG1haWwuZ21h aWwuY29tCj4gLS0tCj4gICBkcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvcm9ja2NoaXBfZHJtX3Zv cC5jIHwgMTUgKysrKysrKysrKysrKysrCj4gICAxIGZpbGUgY2hhbmdlZCwgMTUgaW5zZXJ0aW9u cygrKQo+Cj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9yb2NrY2hpcF9k cm1fdm9wLmMgYi9kcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvcm9ja2NoaXBfZHJtX3ZvcC5jCj4g aW5kZXggNWU1N2Y1YjJlNGIwLi5lMjExOGU2MjM0NWIgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9n cHUvZHJtL3JvY2tjaGlwL3JvY2tjaGlwX2RybV92b3AuYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9yb2NrY2hpcC9yb2NrY2hpcF9kcm1fdm9wLmMKPiBAQCAtNDk5LDEwICs0OTksMjUgQEAgZXJy X2Rpc2FibGVfaGNsazoKPiAgIHN0YXRpYyB2b2lkIHZvcF9jcnRjX2Rpc2FibGUoc3RydWN0IGRy bV9jcnRjICpjcnRjKQo+ICAgewo+ICAgCXN0cnVjdCB2b3AgKnZvcCA9IHRvX3ZvcChjcnRjKTsK PiArCWludCBpOwo+ICAgCj4gICAJaWYgKCF2b3AtPmlzX2VuYWJsZWQpCj4gICAJCXJldHVybjsK PiAgIAo+ICsJLyoKPiArCSAqIFdlIG5lZWQgdG8gbWFrZSBzdXJlIHRoYXQgYWxsIHdpbmRvd3Mg YXJlIGRpc2FibGVkIGJlZm9yZSB3ZQo+ICsJICogZGlzYWJsZSB0aGF0IGNydGMuIE90aGVyd2lz ZSB3ZSBtaWdodCB0cnkgdG8gc2NhbiBmcm9tIGEgZGVzdHJveWVkCj4gKwkgKiBidWZmZXIgbGF0 ZXIuCj4gKwkgKi8KPiArCWZvciAoaSA9IDA7IGkgPCB2b3AtPmRhdGEtPndpbl9zaXplOyBpKysp IHsKPiArCQlzdHJ1Y3Qgdm9wX3dpbiAqdm9wX3dpbiA9ICZ2b3AtPndpbltpXTsKPiArCQljb25z dCBzdHJ1Y3Qgdm9wX3dpbl9kYXRhICp3aW4gPSB2b3Bfd2luLT5kYXRhOwo+ICsKPiArCQlzcGlu X2xvY2soJnZvcC0+cmVnX2xvY2spOwo+ICsJCVZPUF9XSU5fU0VUKHZvcCwgd2luLCBlbmFibGUs IDApOwo+ICsJCXNwaW5fdW5sb2NrKCZ2b3AtPnJlZ19sb2NrKTsKPiArCX0KPiArCj4gICAJZHJt X2NydGNfdmJsYW5rX29mZihjcnRjKTsKPiAgIAo+ICAgCS8qCkxvb2tzIGdvb2QgZm9yIG1lLCBh bmQgaXQgd29ya3Mgb24gbXkgYm9hcmQuCgpBcHBsaWVkIHRvIG15IGRybS1maXhlcy4KClRoYW5r cwoKLS0gCu+8rWFyayBZYW8KCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVz a3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9k cmktZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 From: mark.yao@rock-chips.com (Mark yao) Date: Mon, 28 Mar 2016 14:39:32 +0800 Subject: [PATCH v2] drm/rockchip: vop: Disable planes when disabling CRTC In-Reply-To: <1458659284-14039-1-git-send-email-tomeu.vizoso@collabora.com> References: <1458659284-14039-1-git-send-email-tomeu.vizoso@collabora.com> Message-ID: <56F8D1A4.2080603@rock-chips.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org 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 > Link: http://lkml.kernel.org/g/CAAObsKAv+05ih5U+=4kic_NsjGMhfxYheHR8xXXmacZs+p5SHw at 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 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753840AbcC1Gju (ORCPT ); Mon, 28 Mar 2016 02:39:50 -0400 Received: from regular1.263xmail.com ([211.150.99.132]:43869 "EHLO regular1.263xmail.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752644AbcC1Gjm (ORCPT ); Mon, 28 Mar 2016 02:39:42 -0400 X-263anti-spam: KSV:0;BIG:0;ABS:1;DNS:0;ATT:0;SPF:S; X-MAIL-GRAY: 0 X-MAIL-DELIVERY: 1 X-KSVirus-check: 0 X-ABS-CHECKED: 1 X-SKE-CHECKED: 1 X-ADDR-CHECKED: 0 X-RL-SENDER: mark.yao@rock-chips.com X-FST-TO: linux-rockchip@lists.infradead.org X-SENDER-IP: 58.22.7.114 X-LOGIN-NAME: mark.yao@rock-chips.com X-UNIQUE-TAG: X-ATTACHMENT-NUM: 0 X-DNS-TYPE: 0 Message-ID: <56F8D1A4.2080603@rock-chips.com> Date: Mon, 28 Mar 2016 14:39:32 +0800 From: Mark yao 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 , linux-kernel@vger.kernel.org CC: David Airlie , Heiko Stuebner , 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 List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 > 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