Merge tag 'drm-intel-next-2017-12-01' of git://anongit.freedesktop.org/drm/drm-intel...

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

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 47a2f6acee50158339ff89a532d193e7c0541598..1f7e312d0d0d12bf7af3c51d0cc2b563d9ca7d1f 100644 (file)
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -9288,11 +9288,12 @@ static int intel_check_cursor(struct intel_crtc_state *crtc_state,
        u32 offset;
        int ret;
 
-       ret = drm_plane_helper_check_state(&plane_state->base,
-                                          &plane_state->clip,
-                                          DRM_PLANE_HELPER_NO_SCALING,
-                                          DRM_PLANE_HELPER_NO_SCALING,
-                                          true, true);
+       ret = drm_atomic_helper_check_plane_state(&plane_state->base,
+                                                 &crtc_state->base,
+                                                 &plane_state->clip,
+                                                 DRM_PLANE_HELPER_NO_SCALING,
+                                                 DRM_PLANE_HELPER_NO_SCALING,
+                                                 true, true);
        if (ret)
                return ret;
 
@@ -12862,10 +12863,11 @@ intel_check_primary_plane(struct intel_plane *plane,
                can_position = true;
        }
 
-       ret = drm_plane_helper_check_state(&state->base,
-                                          &state->clip,
-                                          min_scale, max_scale,
-                                          can_position, true);
+       ret = drm_atomic_helper_check_plane_state(&state->base,
+                                                 &crtc_state->base,
+                                                 &state->clip,
+                                                 min_scale, max_scale,
+                                                 can_position, true);
        if (ret)
                return ret;