drm: reset empty state in transitional helpers
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Thu, 2 Jul 2015 14:33:53 +0000 (16:33 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Fri, 3 Jul 2015 07:16:10 +0000 (09:16 +0200)
Transitional drivers might not have all the state frobbing lined up
yet. But since the initial code has been merged a lot more state was
added, so we really need this.

Cc: Daniel Stone <daniels@collabora.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Reported-and-tested-by: John Hunter <zhaojunwang@pku.edu.cn>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/drm_crtc_helper.c
drivers/gpu/drm/drm_plane_helper.c

index 93104f3555f5fd0e8c44f9ece3038c158ac197a7..d3dfb0ebbeb297ccd14d7d77cce5003c2d79d92a 100644 (file)
@@ -927,10 +927,12 @@ int drm_helper_crtc_mode_set(struct drm_crtc *crtc, struct drm_display_mode *mod
 
        if (crtc->funcs->atomic_duplicate_state)
                crtc_state = crtc->funcs->atomic_duplicate_state(crtc);
-       else if (crtc->state)
+       else {
+               if (!crtc->state)
+                       drm_atomic_helper_crtc_reset(crtc);
+
                crtc_state = drm_atomic_helper_crtc_duplicate_state(crtc);
-       else
-               crtc_state = kzalloc(sizeof(*crtc_state), GFP_KERNEL);
+       }
 
        if (!crtc_state)
                return -ENOMEM;
index 2f0ed11024eb8322676e000066a238e55b0dcb9b..b07a213f565541f4d652681b24f33a2689a277b7 100644 (file)
@@ -525,10 +525,12 @@ int drm_plane_helper_update(struct drm_plane *plane, struct drm_crtc *crtc,
 
        if (plane->funcs->atomic_duplicate_state)
                plane_state = plane->funcs->atomic_duplicate_state(plane);
-       else if (plane->state)
+       else {
+               if (!plane->state)
+                       drm_atomic_helper_plane_reset(plane);
+
                plane_state = drm_atomic_helper_plane_duplicate_state(plane);
-       else
-               plane_state = kzalloc(sizeof(*plane_state), GFP_KERNEL);
+       }
        if (!plane_state)
                return -ENOMEM;
        plane_state->plane = plane;
@@ -572,10 +574,12 @@ int drm_plane_helper_disable(struct drm_plane *plane)
 
        if (plane->funcs->atomic_duplicate_state)
                plane_state = plane->funcs->atomic_duplicate_state(plane);
-       else if (plane->state)
+       else {
+               if (!plane->state)
+                       drm_atomic_helper_plane_reset(plane);
+
                plane_state = drm_atomic_helper_plane_duplicate_state(plane);
-       else
-               plane_state = kzalloc(sizeof(*plane_state), GFP_KERNEL);
+       }
        if (!plane_state)
                return -ENOMEM;
        plane_state->plane = plane;