Merge airlied/drm-next into drm-misc-next

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

diff --git a/drivers/gpu/drm/drm_framebuffer.c b/drivers/gpu/drm/drm_framebuffer.c
index b3ef4f1c2630fd5973132f43c809b1dfe05a169c..af279844d7ceb69d44ec9bf260ea63d9435b6de4 100644 (file)
--- a/drivers/gpu/drm/drm_framebuffer.c
+++ b/drivers/gpu/drm/drm_framebuffer.c
@@ -817,7 +817,7 @@ retry:
                plane->old_fb = plane->fb;
        }
 
-       for_each_connector_in_state(state, conn, conn_state, i) {
+       for_each_new_connector_in_state(state, conn, conn_state, i) {
                ret = drm_atomic_set_crtc_for_connector(conn_state, NULL);
 
                if (ret)