Merge drm/drm-next into drm-intel-next-queued

[sfrench/cifs-2.6.git] / drivers / gpu / drm / drm_atomic.c

diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c
index 9bdd67781917d3291736311695ac642a8132cc59..3c181d217f8b1ae7361ba035faf58fa50d0975b6 100644 (file)
--- a/drivers/gpu/drm/drm_atomic.c
+++ b/drivers/gpu/drm/drm_atomic.c
@@ -1714,11 +1714,15 @@ int drm_atomic_check_only(struct drm_atomic_state *state)
                }
        }
 
-       if (config->funcs->atomic_check)
+       if (config->funcs->atomic_check) {
                ret = config->funcs->atomic_check(state->dev, state);
 
-       if (ret)
-               return ret;
+               if (ret) {
+                       DRM_DEBUG_ATOMIC("atomic driver check for %p failed: %d\n",
+                                        state, ret);
+                       return ret;
+               }
+       }
 
        if (!state->allow_modeset) {
                for_each_new_crtc_in_state(state, crtc, crtc_state, i) {