diff options
Diffstat (limited to 'drivers/gpu/drm/drm_atomic_helper.c')
-rw-r--r-- | drivers/gpu/drm/drm_atomic_helper.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index 2fa0840694d0..2ee509c92034 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c | |||
@@ -1222,7 +1222,7 @@ retry: | |||
1222 | goto fail; | 1222 | goto fail; |
1223 | } | 1223 | } |
1224 | 1224 | ||
1225 | ret = drm_atomic_set_crtc_for_plane(plane_state, crtc); | 1225 | ret = drm_atomic_set_crtc_for_plane(state, plane, crtc); |
1226 | if (ret != 0) | 1226 | if (ret != 0) |
1227 | goto fail; | 1227 | goto fail; |
1228 | drm_atomic_set_fb_for_plane(plane_state, fb); | 1228 | drm_atomic_set_fb_for_plane(plane_state, fb); |
@@ -1301,7 +1301,7 @@ retry: | |||
1301 | goto fail; | 1301 | goto fail; |
1302 | } | 1302 | } |
1303 | 1303 | ||
1304 | ret = drm_atomic_set_crtc_for_plane(plane_state, NULL); | 1304 | ret = drm_atomic_set_crtc_for_plane(state, plane, NULL); |
1305 | if (ret != 0) | 1305 | if (ret != 0) |
1306 | goto fail; | 1306 | goto fail; |
1307 | drm_atomic_set_fb_for_plane(plane_state, NULL); | 1307 | drm_atomic_set_fb_for_plane(plane_state, NULL); |
@@ -1472,7 +1472,7 @@ retry: | |||
1472 | goto fail; | 1472 | goto fail; |
1473 | } | 1473 | } |
1474 | 1474 | ||
1475 | ret = drm_atomic_set_crtc_for_plane(primary_state, crtc); | 1475 | ret = drm_atomic_set_crtc_for_plane(state, crtc->primary, crtc); |
1476 | if (ret != 0) | 1476 | if (ret != 0) |
1477 | goto fail; | 1477 | goto fail; |
1478 | drm_atomic_set_fb_for_plane(primary_state, set->fb); | 1478 | drm_atomic_set_fb_for_plane(primary_state, set->fb); |
@@ -1744,7 +1744,7 @@ retry: | |||
1744 | goto fail; | 1744 | goto fail; |
1745 | } | 1745 | } |
1746 | 1746 | ||
1747 | ret = drm_atomic_set_crtc_for_plane(plane_state, crtc); | 1747 | ret = drm_atomic_set_crtc_for_plane(state, plane, crtc); |
1748 | if (ret != 0) | 1748 | if (ret != 0) |
1749 | goto fail; | 1749 | goto fail; |
1750 | drm_atomic_set_fb_for_plane(plane_state, fb); | 1750 | drm_atomic_set_fb_for_plane(plane_state, fb); |