[Intel-gfx] [PATCH] drm: Fix drm_crtc vs. drm_plane type bug in plane->reset() handling

ville.syrjala at linux.intel.com ville.syrjala at linux.intel.com
Mon Aug 11 14:12:34 CEST 2014


From: Ville Syrjälä <ville.syrjala at linux.intel.com>

s/struct drm_crtc/struct drm_plane/ in drm_mode_config_reset() so that we
actually dereference the correct type of structure when calling the
plane->reset() hook.

Imre mentioned that his VLV was crashing there on resume. I deciced to have
a quick look at the code and immediately spotted the problem.

The problem was introduced when the plane->reset() hook was added here:
 commit 2aaa4b6f6f6be8c23de8ae60ee30e5d6059c3c64
 Author: Daniel Vetter <daniel.vetter at ffwll.ch>
 Date:   Tue Jul 29 15:32:37 2014 +0200

    drm: Add a plane->reset hook

Cc: Daniel Vetter <daniel.vetter at ffwll.ch>
Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
---
 drivers/gpu/drm/drm_crtc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index 23c9c9f..f09b752 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -4664,7 +4664,7 @@ out:
 void drm_mode_config_reset(struct drm_device *dev)
 {
 	struct drm_crtc *crtc;
-	struct drm_crtc *plane;
+	struct drm_plane *plane;
 	struct drm_encoder *encoder;
 	struct drm_connector *connector;
 
-- 
1.8.5.5




More information about the Intel-gfx mailing list