From: John Keeping Date: Thu, 14 Jul 2016 15:29:15 +0000 (+0100) Subject: UPSTREAM: drm/rockchip: allocate correct crtc state structure on reset X-Git-Tag: firefly_0821_release~1952 X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=46d10109aeafd2954aeef7e67529c3dadddea19a;p=firefly-linux-kernel-4.4.55.git UPSTREAM: drm/rockchip: allocate correct crtc state structure on reset 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 Change-Id: I1895dbe994232991c1659cf2f4d63c4aa957b794 Fixes: 4e257d9eee23 ("drm/rockchip: get rid of rockchip_drm_crtc_mode_config") Signed-off-by: John Keeping Signed-off-by: Mark Yao Reviewed-by: Sean Paul (cherry picked from dc0b408f5a87cce3ea3f81a6800244fb7d395435) --- diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c index aeb5b6cd74bd..4205c68a9623 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c @@ -1284,6 +1284,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; @@ -1309,7 +1320,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, };