Merge tag 'topic/atomic-core-2015-01-27' of git://anongit.freedesktop.org/drm-intel...

[firefly-linux-kernel-4.4.55.git] / drivers / gpu / drm / drm_atomic_helper.c

diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
index 6efb94116237d009d77a797f24fdc93175eff232..7e3a52b97c7d4154b82870f2c2d2ebb04298a5e0 100644 (file)
--- a/drivers/gpu/drm/drm_atomic_helper.c
+++ b/drivers/gpu/drm/drm_atomic_helper.c
@@ -297,13 +297,22 @@ mode_fixup(struct drm_atomic_state *state)
                        }
                }
 
-
-               ret = funcs->mode_fixup(encoder, &crtc_state->mode,
-                                       &crtc_state->adjusted_mode);
-               if (!ret) {
-                       DRM_DEBUG_KMS("[ENCODER:%d:%s] fixup failed\n",
-                                     encoder->base.id, encoder->name);
-                       return -EINVAL;
+               if (funcs->atomic_check) {
+                       ret = funcs->atomic_check(encoder, crtc_state,
+                                                 conn_state);
+                       if (ret) {
+                               DRM_DEBUG_KMS("[ENCODER:%d:%s] check failed\n",
+                                             encoder->base.id, encoder->name);
+                               return ret;
+                       }
+               } else {
+                       ret = funcs->mode_fixup(encoder, &crtc_state->mode,
+                                               &crtc_state->adjusted_mode);
+                       if (!ret) {
+                               DRM_DEBUG_KMS("[ENCODER:%d:%s] fixup failed\n",
+                                             encoder->base.id, encoder->name);
+                               return -EINVAL;
+                       }
                }
        }
 
@@ -1181,12 +1190,19 @@ void drm_atomic_helper_commit_planes(struct drm_device *dev,
 
                funcs = plane->helper_private;
 
-               if (!funcs || !funcs->atomic_update)
+               if (!funcs)
                        continue;
 
                old_plane_state = old_state->plane_states[i];
 
-               funcs->atomic_update(plane, old_plane_state);
+               /*
+                * Special-case disabling the plane if drivers support it.
+                */
+               if (drm_atomic_plane_disabling(plane, old_plane_state) &&
+                   funcs->atomic_disable)
+                       funcs->atomic_disable(plane, old_plane_state);
+               else
+                       funcs->atomic_update(plane, old_plane_state);
        }
 
        for (i = 0; i < ncrtcs; i++) {