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