1 files changed, 12 insertions, 99 deletions

diff --git a/drivers/gpu/drm/drm_plane_helper.c b/drivers/gpu/drm/drm_plane_helper.c
index 759ed93f4ba8..f1be8cd4e387 100644
--- a/drivers/gpu/drm/drm_plane_helper.c
+++ b/drivers/gpu/drm/drm_plane_helper.c
@@ -100,97 +100,6 @@ static int get_connectors_for_crtc(struct drm_crtc *crtc,
 }
 
 /**
- * drm_plane_helper_check_state() - Check plane state for validity
- * @state: plane state to check
- * @clip: integer clipping coordinates
- * @min_scale: minimum @src:@dest scaling factor in 16.16 fixed point
- * @max_scale: maximum @src:@dest scaling factor in 16.16 fixed point
- * @can_position: is it legal to position the plane such that it
- *                doesn't cover the entire crtc?  This will generally
- *                only be false for primary planes.
- * @can_update_disabled: can the plane be updated while the crtc
- *                       is disabled?
- *
- * Checks that a desired plane update is valid, and updates various
- * bits of derived state (clipped coordinates etc.). Drivers that provide
- * their own plane handling rather than helper-provided implementations may
- * still wish to call this function to avoid duplication of error checking
- * code.
- *
- * RETURNS:
- * Zero if update appears valid, error code on failure
- */
-int drm_plane_helper_check_state(struct drm_plane_state *state,
-                                 const struct drm_rect *clip,
-                                 int min_scale,
-                                 int max_scale,
-                                 bool can_position,
-                                 bool can_update_disabled)
-{
-        struct drm_crtc *crtc = state->crtc;
-        struct drm_framebuffer *fb = state->fb;
-        struct drm_rect *src = &state->src;
-        struct drm_rect *dst = &state->dst;
-        unsigned int rotation = state->rotation;
-        int hscale, vscale;
-
-        *src = drm_plane_state_src(state);
-        *dst = drm_plane_state_dest(state);
-
-        if (!fb) {
-                state->visible = false;
-                return 0;
-        }
-
-        /* crtc should only be NULL when disabling (i.e., !fb) */
-        if (WARN_ON(!crtc)) {
-                state->visible = false;
-                return 0;
-        }
-
-        if (!crtc->enabled && !can_update_disabled) {
-                DRM_DEBUG_KMS("Cannot update plane of a disabled CRTC.\n");
-                return -EINVAL;
-        }
-
-        drm_rect_rotate(src, fb->width << 16, fb->height << 16, rotation);
-
-        /* Check scaling */
-        hscale = drm_rect_calc_hscale(src, dst, min_scale, max_scale);
-        vscale = drm_rect_calc_vscale(src, dst, min_scale, max_scale);
-        if (hscale < 0 || vscale < 0) {
-                DRM_DEBUG_KMS("Invalid scaling of plane\n");
-                drm_rect_debug_print("src: ", &state->src, true);
-                drm_rect_debug_print("dst: ", &state->dst, false);
-                return -ERANGE;
-        }
-
-        state->visible = drm_rect_clip_scaled(src, dst, clip, hscale, vscale);
-
-        drm_rect_rotate_inv(src, fb->width << 16, fb->height << 16, rotation);
-
-        if (!state->visible)
-                /*
-                 * Plane isn't visible; some drivers can handle this
-                 * so we just return success here.  Drivers that can't
-                 * (including those that use the primary plane helper's
-                 * update function) will return an error from their
-                 * update_plane handler.
-                 */
-                return 0;
-
-        if (!can_position && !drm_rect_equals(dst, clip)) {
-                DRM_DEBUG_KMS("Plane must cover entire CRTC\n");
-                drm_rect_debug_print("dst: ", dst, false);
-                drm_rect_debug_print("clip: ", clip, false);
-                return -EINVAL;
-        }
-
-        return 0;
-}
-EXPORT_SYMBOL(drm_plane_helper_check_state);
-
-/**
  * drm_plane_helper_check_update() - Check plane update for validity
  * @plane: plane object to update
  * @crtc: owning CRTC of owning plane
@@ -230,7 +139,7 @@ int drm_plane_helper_check_update(struct drm_plane *plane,
                                   bool can_update_disabled,
                                   bool *visible)
 {
-        struct drm_plane_state state = {
+        struct drm_plane_state plane_state = {
                 .plane = plane,
                 .crtc = crtc,
                 .fb = fb,
@@ -245,18 +154,22 @@ int drm_plane_helper_check_update(struct drm_plane *plane,
                 .rotation = rotation,
                 .visible = *visible,
         };
+        struct drm_crtc_state crtc_state = {
+                .crtc = crtc,
+                .enable = crtc->enabled,
+        };
         int ret;
 
-        ret = drm_plane_helper_check_state(&state, clip,
-                                           min_scale, max_scale,
-                                           can_position,
-                                           can_update_disabled);
+        ret = drm_atomic_helper_check_plane_state(&plane_state, &crtc_state,
+                                                  clip, min_scale, max_scale,
+                                                  can_position,
+                                                  can_update_disabled);
         if (ret)
                 return ret;
 
-        *src = state.src;
-        *dst = state.dst;
-        *visible = state.visible;
+        *src = plane_state.src;
+        *dst = plane_state.dst;
+        *visible = plane_state.visible;
 
         return 0;
 }