diff options
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 878acc432a4b..e0fffd883b54 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c | |||
@@ -9314,11 +9314,12 @@ static int intel_check_cursor(struct intel_crtc_state *crtc_state, | |||
9314 | u32 offset; | 9314 | u32 offset; |
9315 | int ret; | 9315 | int ret; |
9316 | 9316 | ||
9317 | ret = drm_plane_helper_check_state(&plane_state->base, | 9317 | ret = drm_atomic_helper_check_plane_state(&plane_state->base, |
9318 | &plane_state->clip, | 9318 | &crtc_state->base, |
9319 | DRM_PLANE_HELPER_NO_SCALING, | 9319 | &plane_state->clip, |
9320 | DRM_PLANE_HELPER_NO_SCALING, | 9320 | DRM_PLANE_HELPER_NO_SCALING, |
9321 | true, true); | 9321 | DRM_PLANE_HELPER_NO_SCALING, |
9322 | true, true); | ||
9322 | if (ret) | 9323 | if (ret) |
9323 | return ret; | 9324 | return ret; |
9324 | 9325 | ||
@@ -12794,10 +12795,11 @@ intel_check_primary_plane(struct intel_plane *plane, | |||
12794 | can_position = true; | 12795 | can_position = true; |
12795 | } | 12796 | } |
12796 | 12797 | ||
12797 | ret = drm_plane_helper_check_state(&state->base, | 12798 | ret = drm_atomic_helper_check_plane_state(&state->base, |
12798 | &state->clip, | 12799 | &crtc_state->base, |
12799 | min_scale, max_scale, | 12800 | &state->clip, |
12800 | can_position, true); | 12801 | min_scale, max_scale, |
12802 | can_position, true); | ||
12801 | if (ret) | 12803 | if (ret) |
12802 | return ret; | 12804 | return ret; |
12803 | 12805 | ||