From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mark yao Subject: Re: [PATCH] drm/rockchip: allocate correct crtc state structure on reset Date: Fri, 15 Jul 2016 10:46:38 +0800 Message-ID: <57884E8E.3000504@rock-chips.com> References: <20160714152915.31235-1-john@metanate.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20160714152915.31235-1-john@metanate.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: John Keeping Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-rockchip@lists.infradead.org, stable@vger.kernel.org, linux-arm-kernel@lists.infradead.org List-Id: linux-rockchip.vger.kernel.org T24gMjAxNuW5tDA35pyIMTTml6UgMjM6MjksIEpvaG4gS2VlcGluZyB3cm90ZToKPiBCZWNhdXNl IHdlIGFyZSB1c2luZyBhIGN1c3RvbSBjcnRjX3N0YXRlIHN0cnVjdHVyZSwgd2UgbXVzdCBvdmVy cmlkZSB0aGUKPiByZXNldCBoZWxwZXIgdG8gYWxsb2NhdGUgdGhlIGNvcnJlY3QgYW1vdW50IG9m IG1lbW9yeS4KPgo+IENjOiBzdGFibGVAdmdlci5rZXJuZWwub3JnCj4gRml4ZXM6IDRlMjU3ZDll ZWUyMyAoImRybS9yb2NrY2hpcDogZ2V0IHJpZCBvZiByb2NrY2hpcF9kcm1fY3J0Y19tb2RlX2Nv bmZpZyIpCj4gU2lnbmVkLW9mZi1ieTogSm9obiBLZWVwaW5nIDxqb2huQG1ldGFuYXRlLmNvbT4K PiAtLS0KPiAgIGRyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9yb2NrY2hpcF9kcm1fdm9wLmMgfCAx MyArKysrKysrKysrKystCj4gICAxIGZpbGUgY2hhbmdlZCwgMTIgaW5zZXJ0aW9ucygrKSwgMSBk ZWxldGlvbigtKQpUaGFua3MgZm9yIHRoZSBmaXhlcywgQXBwbGllZCB0byBteSBkcm0tZml4ZXMK Cgo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvcm9ja2NoaXBfZHJtX3Zv cC5jIGIvZHJpdmVycy9ncHUvZHJtL3JvY2tjaGlwL3JvY2tjaGlwX2RybV92b3AuYwo+IGluZGV4 IDFjNGQ1YjVhNzBhMi4uMjFlMTI0NzA5OGJlIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9yb2NrY2hpcC9yb2NrY2hpcF9kcm1fdm9wLmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vcm9j a2NoaXAvcm9ja2NoaXBfZHJtX3ZvcC5jCj4gQEAgLTEwNDgsNiArMTA0OCwxNyBAQCBzdGF0aWMg dm9pZCB2b3BfY3J0Y19kZXN0cm95KHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKPiAgIAlkcm1fY3J0 Y19jbGVhbnVwKGNydGMpOwo+ICAgfQo+ICAgCj4gK3N0YXRpYyB2b2lkIHZvcF9jcnRjX3Jlc2V0 KHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKPiArewo+ICsJaWYgKGNydGMtPnN0YXRlKQo+ICsJCV9f ZHJtX2F0b21pY19oZWxwZXJfY3J0Y19kZXN0cm95X3N0YXRlKGNydGMsIGNydGMtPnN0YXRlKTsK PiArCWtmcmVlKGNydGMtPnN0YXRlKTsKPiArCj4gKwljcnRjLT5zdGF0ZSA9IGt6YWxsb2Moc2l6 ZW9mKHN0cnVjdCByb2NrY2hpcF9jcnRjX3N0YXRlKSwgR0ZQX0tFUk5FTCk7Cj4gKwlpZiAoY3J0 Yy0+c3RhdGUpCj4gKwkJY3J0Yy0+c3RhdGUtPmNydGMgPSBjcnRjOwo+ICt9Cj4gKwo+ICAgc3Rh dGljIHN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqdm9wX2NydGNfZHVwbGljYXRlX3N0YXRlKHN0cnVj dCBkcm1fY3J0YyAqY3J0YykKPiAgIHsKPiAgIAlzdHJ1Y3Qgcm9ja2NoaXBfY3J0Y19zdGF0ZSAq cm9ja2NoaXBfc3RhdGU7Cj4gQEAgLTEwNzMsNyArMTA4NCw3IEBAIHN0YXRpYyBjb25zdCBzdHJ1 Y3QgZHJtX2NydGNfZnVuY3Mgdm9wX2NydGNfZnVuY3MgPSB7Cj4gICAJLnNldF9jb25maWcgPSBk cm1fYXRvbWljX2hlbHBlcl9zZXRfY29uZmlnLAo+ICAgCS5wYWdlX2ZsaXAgPSBkcm1fYXRvbWlj X2hlbHBlcl9wYWdlX2ZsaXAsCj4gICAJLmRlc3Ryb3kgPSB2b3BfY3J0Y19kZXN0cm95LAo+IC0J LnJlc2V0ID0gZHJtX2F0b21pY19oZWxwZXJfY3J0Y19yZXNldCwKPiArCS5yZXNldCA9IHZvcF9j cnRjX3Jlc2V0LAo+ICAgCS5hdG9taWNfZHVwbGljYXRlX3N0YXRlID0gdm9wX2NydGNfZHVwbGlj YXRlX3N0YXRlLAo+ICAgCS5hdG9taWNfZGVzdHJveV9zdGF0ZSA9IHZvcF9jcnRjX2Rlc3Ryb3lf c3RhdGUsCj4gICB9OwoKCi0tIArvvK1hcmsgWWFvCgoKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxA bGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxt YW4vbGlzdGluZm8vZHJpLWRldmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 From: mark.yao@rock-chips.com (Mark yao) Date: Fri, 15 Jul 2016 10:46:38 +0800 Subject: [PATCH] drm/rockchip: allocate correct crtc state structure on reset In-Reply-To: <20160714152915.31235-1-john@metanate.com> References: <20160714152915.31235-1-john@metanate.com> Message-ID: <57884E8E.3000504@rock-chips.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 2016?07?14? 23:29, John Keeping wrote: > Because we are using a custom crtc_state structure, we must override the > reset helper to allocate the correct amount of memory. > > Cc: stable at vger.kernel.org > Fixes: 4e257d9eee23 ("drm/rockchip: get rid of rockchip_drm_crtc_mode_config") > Signed-off-by: John Keeping > --- > drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 13 ++++++++++++- > 1 file changed, 12 insertions(+), 1 deletion(-) Thanks for the fixes, Applied to my drm-fixes > diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c > index 1c4d5b5a70a2..21e1247098be 100644 > --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c > +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c > @@ -1048,6 +1048,17 @@ static void vop_crtc_destroy(struct drm_crtc *crtc) > drm_crtc_cleanup(crtc); > } > > +static void vop_crtc_reset(struct drm_crtc *crtc) > +{ > + if (crtc->state) > + __drm_atomic_helper_crtc_destroy_state(crtc, crtc->state); > + kfree(crtc->state); > + > + crtc->state = kzalloc(sizeof(struct rockchip_crtc_state), GFP_KERNEL); > + if (crtc->state) > + crtc->state->crtc = crtc; > +} > + > static struct drm_crtc_state *vop_crtc_duplicate_state(struct drm_crtc *crtc) > { > struct rockchip_crtc_state *rockchip_state; > @@ -1073,7 +1084,7 @@ static const struct drm_crtc_funcs vop_crtc_funcs = { > .set_config = drm_atomic_helper_set_config, > .page_flip = drm_atomic_helper_page_flip, > .destroy = vop_crtc_destroy, > - .reset = drm_atomic_helper_crtc_reset, > + .reset = vop_crtc_reset, > .atomic_duplicate_state = vop_crtc_duplicate_state, > .atomic_destroy_state = vop_crtc_destroy_state, > }; -- ?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 S1752524AbcGOCrE (ORCPT ); Thu, 14 Jul 2016 22:47:04 -0400 Received: from regular1.263xmail.com ([211.150.99.138]:43305 "EHLO regular1.263xmail.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752455AbcGOCq5 (ORCPT ); Thu, 14 Jul 2016 22:46:57 -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: stable@vger.kernel.org X-SENDER-IP: 58.22.7.114 X-LOGIN-NAME: mark.yao@rock-chips.com X-UNIQUE-TAG: <6a33dc57a2608d34d9131e6d5c2d4add> X-ATTACHMENT-NUM: 0 X-DNS-TYPE: 0 Subject: Re: [PATCH] drm/rockchip: allocate correct crtc state structure on reset To: John Keeping References: <20160714152915.31235-1-john@metanate.com> Cc: David Airlie , Heiko Stuebner , dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org From: Mark yao Message-ID: <57884E8E.3000504@rock-chips.com> Date: Fri, 15 Jul 2016 10:46:38 +0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 In-Reply-To: <20160714152915.31235-1-john@metanate.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年07月14日 23:29, John Keeping wrote: > Because we are using a custom crtc_state structure, we must override the > reset helper to allocate the correct amount of memory. > > Cc: stable@vger.kernel.org > Fixes: 4e257d9eee23 ("drm/rockchip: get rid of rockchip_drm_crtc_mode_config") > Signed-off-by: John Keeping > --- > drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 13 ++++++++++++- > 1 file changed, 12 insertions(+), 1 deletion(-) Thanks for the fixes, Applied to my drm-fixes > diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c > index 1c4d5b5a70a2..21e1247098be 100644 > --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c > +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c > @@ -1048,6 +1048,17 @@ static void vop_crtc_destroy(struct drm_crtc *crtc) > drm_crtc_cleanup(crtc); > } > > +static void vop_crtc_reset(struct drm_crtc *crtc) > +{ > + if (crtc->state) > + __drm_atomic_helper_crtc_destroy_state(crtc, crtc->state); > + kfree(crtc->state); > + > + crtc->state = kzalloc(sizeof(struct rockchip_crtc_state), GFP_KERNEL); > + if (crtc->state) > + crtc->state->crtc = crtc; > +} > + > static struct drm_crtc_state *vop_crtc_duplicate_state(struct drm_crtc *crtc) > { > struct rockchip_crtc_state *rockchip_state; > @@ -1073,7 +1084,7 @@ static const struct drm_crtc_funcs vop_crtc_funcs = { > .set_config = drm_atomic_helper_set_config, > .page_flip = drm_atomic_helper_page_flip, > .destroy = vop_crtc_destroy, > - .reset = drm_atomic_helper_crtc_reset, > + .reset = vop_crtc_reset, > .atomic_duplicate_state = vop_crtc_duplicate_state, > .atomic_destroy_state = vop_crtc_destroy_state, > }; -- Ｍark Yao