Patch "drm/rockchip: allocate correct crtc state structure on reset" has been added to the 4.7-stable tree

This is a note to let you know that I've just added the patch titled

drm/rockchip: allocate correct crtc state structure on reset

to the 4.7-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
drm-rockchip-allocate-correct-crtc-state-structure-on-reset.patch
and it can be found in the queue-4.7 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: John Keeping <[email protected]>
Date: Thu, 14 Jul 2016 16:29:15 +0100
Subject: drm/rockchip: allocate correct crtc state structure on reset

From: John Keeping <[email protected]>

commit dc0b408f5a87cce3ea3f81a6800244fb7d395435 upstream.

Because we are using a custom crtc_state structure, we must override the reset helper to allocate the correct amount of memory.

---
 drivers/gpu/drm/rockchip/rockchip_drm_vop.c |   13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

@@ -1048,6 +1048,17 @@ static void vop_crtc_destroy(struct drm_
 	drm_crtc_cleanup(crtc);
 }
 
+static void vop_crtc_reset(struct drm_crtc *crtc)
+{
+	if (crtc->state)
+		__drm_atomic_helper_crtc_destroy_state(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_c
 	.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,
 };

Patches currently in stable-queue which might be from [email protected] are

queue-4.7/drm-rockchip-allocate-correct-crtc-state-structure-on-reset.patch