drm: Don't pass clip to drm_atomic_helper_check_plane_state()

Move the plane clip rectangle handling into
drm_atomic_helper_check_plane_state(). Drivers no longer
have to worry about such mundane details.

v2: Convert armada, rcar, and sun4i as well
v3: Resolve simple_kms_helper conflict

Cc: Liviu Dudau <liviu.dudau@arm.com>
Cc: Brian Starkey <brian.starkey@arm.com>
Cc: Mali DP Maintainers <malidp@foss.arm.com>
Cc: Daniel Vetter <daniel.vetter@intel.com>
Cc: Gustavo Padovan <gustavo@padovan.org>
Cc: Sean Paul <seanpaul@chromium.org>
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Cc: CK Hu <ck.hu@mediatek.com>
Cc: Neil Armstrong <narmstrong@baylibre.com>
Cc: Rob Clark <robdclark@gmail.com>
Cc: Ben Skeggs <bskeggs@redhat.com>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Sandy Huang <hjc@rock-chips.com>
Cc: "Heiko Stübner" <heiko@sntech.de>
Cc: Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: Thierry Reding <thierry.reding@gmail.com>
Cc: VMware Graphics <linux-graphics-maintainer@vmware.com>
Cc: Sinclair Yeh <syeh@vmware.com>
Cc: Thomas Hellstrom <thellstrom@vmware.com>
Cc: Shawn Guo <shawnguo@kernel.org>
Cc: Archit Taneja <architt@codeaurora.org>
Cc: linux-amlogic@lists.infradead.org
Cc: linux-arm-msm@vger.kernel.org
Cc: freedreno@lists.freedesktop.org
Cc: nouveau@lists.freedesktop.org
Cc: linux-renesas-soc@vger.kernel.org
Cc: linux-tegra@vger.kernel.org
Cc: Russell King <rmk+kernel@armlinux.org.uk>
Suggested-by: Daniel Vetter <daniel@ffwll.ch>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Thierry Reding <treding@nvidia.com>
Reviewed-by: Archit Taneja <architt@codeaurora.org> #msm
Link: https://patchwork.freedesktop.org/patch/msgid/20180123170857.13818-5-ville.syrjala@linux.intel.com
Acked-by: Liviu Dudau <liviu.dudau@arm.com> #hdlcd,malidp
Acked-by: Philipp Zabel <p.zabel@pengutronix.de> #imx,mtk
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Sinclair Yeh <syeh@vmware.com> #vmwgfx
Acked-by: Neil Armstrong <narmstrong@baylibre.com> #meson
Acked-by: Shawn Guo <shawnguo@kernel.org> #zte

diff --git a/drivers/gpu/drm/arm/hdlcd_crtc.c b/drivers/gpu/drm/arm/hdlcd_crtc.c
index 877647ef35a99c6dd9bd22391f5411436d200c11..cf5cbd63ecdffcc1143ddcb48ecfb4d80c1b4328 100644 (file)
--- a/drivers/gpu/drm/arm/hdlcd_crtc.c
+++ b/drivers/gpu/drm/arm/hdlcd_crtc.c
@@ -229,7 +229,6 @@ static const struct drm_crtc_helper_funcs hdlcd_crtc_helper_funcs = {
 static int hdlcd_plane_atomic_check(struct drm_plane *plane,
                                    struct drm_plane_state *state)
 {
-       struct drm_rect clip = { 0 };
        struct drm_crtc_state *crtc_state;
        u32 src_h = state->src_h >> 16;
 
@@ -249,11 +248,7 @@ static int hdlcd_plane_atomic_check(struct drm_plane *plane,
                return -EINVAL;
        }
 
-       if (crtc_state->enable)
-               drm_mode_get_hv_timing(&crtc_state->mode,
-                                      &clip.x2, &clip.y2);
-
-       return drm_atomic_helper_check_plane_state(state, crtc_state, &clip,
+       return drm_atomic_helper_check_plane_state(state, crtc_state,
                                                   DRM_PLANE_HELPER_NO_SCALING,
                                                   DRM_PLANE_HELPER_NO_SCALING,
                                                   false, true);

diff --git a/drivers/gpu/drm/arm/malidp_planes.c b/drivers/gpu/drm/arm/malidp_planes.c
index 2885d69af456d4178e6766987822843f45c3320d..ee32361c87ac27f9faa13aac1f95378b72da40a9 100644 (file)
--- a/drivers/gpu/drm/arm/malidp_planes.c
+++ b/drivers/gpu/drm/arm/malidp_planes.c
@@ -141,18 +141,13 @@ static int malidp_se_check_scaling(struct malidp_plane *mp,
        struct drm_crtc_state *crtc_state =
                drm_atomic_get_existing_crtc_state(state->state, state->crtc);
        struct malidp_crtc_state *mc;
-       struct drm_rect clip = { 0 };
        u32 src_w, src_h;
        int ret;
 
        if (!crtc_state)
                return -EINVAL;
 
-       if (crtc_state->enable)
-               drm_mode_get_hv_timing(&crtc_state->mode,
-                                      &clip.x2, &clip.y2);
-
-       ret = drm_atomic_helper_check_plane_state(state, crtc_state, &clip,
+       ret = drm_atomic_helper_check_plane_state(state, crtc_state,
                                                  0, INT_MAX, true, true);
        if (ret)
                return ret;

diff --git a/drivers/gpu/drm/armada/armada_crtc.c b/drivers/gpu/drm/armada/armada_crtc.c
index fdc34ad4ca627ff2ccb932c105ea18a1e8f1304f..03eeee11dd5bd2f4ed000b2f86ca5eda6253f9ca 100644 (file)
--- a/drivers/gpu/drm/armada/armada_crtc.c
+++ b/drivers/gpu/drm/armada/armada_crtc.c
@@ -1203,15 +1203,11 @@ static int armada_drm_primary_update(struct drm_plane *plane,
        struct drm_crtc_state crtc_state = {
                .crtc = crtc,
                .enable = crtc->enabled,
+               .mode = crtc->mode,
        };
-       struct drm_rect clip = {};
        int ret;
 
-       if (crtc->enabled)
-               drm_mode_get_hv_timing(&crtc->mode,
-                                      &clip.x2, &clip.y2);
-
-       ret = drm_atomic_helper_check_plane_state(&state, &crtc_state, &clip, 0,
+       ret = drm_atomic_helper_check_plane_state(&state, &crtc_state, 0,
                                                  INT_MAX, true, false);
        if (ret)
                return ret;

diff --git a/drivers/gpu/drm/armada/armada_overlay.c b/drivers/gpu/drm/armada/armada_overlay.c
index 4f2a7a6e0fd398924aeb0f92d27ee3166f6889f5..c391955009d6051a6bb67b8a9a7bcebee38a8983 100644 (file)
--- a/drivers/gpu/drm/armada/armada_overlay.c
+++ b/drivers/gpu/drm/armada/armada_overlay.c
@@ -208,19 +208,15 @@ armada_ovl_plane_update(struct drm_plane *plane, struct drm_crtc *crtc,
        struct drm_crtc_state crtc_state = {
                .crtc = crtc,
                .enable = crtc->enabled,
+               .mode = crtc->mode,
        };
-       struct drm_rect clip = {};
        int ret;
 
        trace_armada_ovl_plane_update(plane, crtc, fb,
                                 crtc_x, crtc_y, crtc_w, crtc_h,
                                 src_x, src_y, src_w, src_h);
 
-       if (crtc->enabled)
-               drm_mode_get_hv_timing(&crtc->mode,
-                                      &clip.x2, &clip.y2);
-
-       ret = drm_atomic_helper_check_plane_state(&state, &crtc_state, &clip, 0,
+       ret = drm_atomic_helper_check_plane_state(&state, &crtc_state, 0,
                                                  INT_MAX, true, false);
        if (ret)
                return ret;

diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
index ae3cbfe9e01cd6a52cc7c6a15ec809e971139ee4..00c78c1c968196241be1302d06f45f4cff360709 100644 (file)
--- a/drivers/gpu/drm/drm_atomic_helper.c
+++ b/drivers/gpu/drm/drm_atomic_helper.c
@@ -699,7 +699,6 @@ EXPORT_SYMBOL(drm_atomic_helper_check_modeset);
  * drm_atomic_helper_check_plane_state() - Check plane state for validity
  * @plane_state: plane state to check
  * @crtc_state: crtc 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
@@ -719,7 +718,6 @@ EXPORT_SYMBOL(drm_atomic_helper_check_modeset);
  */
 int drm_atomic_helper_check_plane_state(struct drm_plane_state *plane_state,
                                        const struct drm_crtc_state *crtc_state,
-                                       const struct drm_rect *clip,
                                        int min_scale,
                                        int max_scale,
                                        bool can_position,
@@ -729,6 +727,7 @@ int drm_atomic_helper_check_plane_state(struct drm_plane_state *plane_state,
        struct drm_rect *src = &plane_state->src;
        struct drm_rect *dst = &plane_state->dst;
        unsigned int rotation = plane_state->rotation;
+       struct drm_rect clip = {};
        int hscale, vscale;
 
        WARN_ON(plane_state->crtc && plane_state->crtc != crtc_state->crtc);
@@ -764,7 +763,10 @@ int drm_atomic_helper_check_plane_state(struct drm_plane_state *plane_state,
                return -ERANGE;
        }
 
-       plane_state->visible = drm_rect_clip_scaled(src, dst, clip, hscale, vscale);
+       if (crtc_state->enable)
+               drm_mode_get_hv_timing(&crtc_state->mode, &clip.x2, &clip.y2);
+
+       plane_state->visible = drm_rect_clip_scaled(src, dst, &clip, hscale, vscale);
 
        drm_rect_rotate_inv(src, fb->width << 16, fb->height << 16, rotation);
 
@@ -778,10 +780,10 @@ int drm_atomic_helper_check_plane_state(struct drm_plane_state *plane_state,
                 */
                return 0;
 
-       if (!can_position && !drm_rect_equals(dst, clip)) {
+       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);
+               drm_rect_debug_print("clip: ", &clip, false);
                return -EINVAL;
        }
 

diff --git a/drivers/gpu/drm/drm_plane_helper.c b/drivers/gpu/drm/drm_plane_helper.c
index f1be8cd4e387feb40da81f8937ceb31702de611c..f88f681615193040e5375ecaca9c05c4590267d0 100644 (file)
--- a/drivers/gpu/drm/drm_plane_helper.c
+++ b/drivers/gpu/drm/drm_plane_helper.c
@@ -106,7 +106,6 @@ static int get_connectors_for_crtc(struct drm_crtc *crtc,
  * @fb: framebuffer to flip onto plane
  * @src: source coordinates in 16.16 fixed point
  * @dst: integer destination coordinates
- * @clip: integer clipping coordinates
  * @rotation: plane rotation
  * @min_scale: minimum @src:@dest scaling factor in 16.16 fixed point
  * @max_scale: maximum @src:@dest scaling factor in 16.16 fixed point
@@ -131,7 +130,6 @@ int drm_plane_helper_check_update(struct drm_plane *plane,
                                  struct drm_framebuffer *fb,
                                  struct drm_rect *src,
                                  struct drm_rect *dst,
-                                 const struct drm_rect *clip,
                                  unsigned int rotation,
                                  int min_scale,
                                  int max_scale,
@@ -157,11 +155,12 @@ int drm_plane_helper_check_update(struct drm_plane *plane,
        struct drm_crtc_state crtc_state = {
                .crtc = crtc,
                .enable = crtc->enabled,
+               .mode = crtc->mode,
        };
        int ret;
 
        ret = drm_atomic_helper_check_plane_state(&plane_state, &crtc_state,
-                                                 clip, min_scale, max_scale,
+                                                 min_scale, max_scale,
                                                  can_position,
                                                  can_update_disabled);
        if (ret)
@@ -239,16 +238,12 @@ int drm_primary_helper_update(struct drm_plane *plane, struct drm_crtc *crtc,
                .x2 = crtc_x + crtc_w,
                .y2 = crtc_y + crtc_h,
        };
-       const struct drm_rect clip = {
-               .x2 = crtc->mode.hdisplay,
-               .y2 = crtc->mode.vdisplay,
-       };
        struct drm_connector **connector_list;
        int num_connectors, ret;
        bool visible;
 
        ret = drm_plane_helper_check_update(plane, crtc, fb,
-                                           &src, &dest, &clip,
+                                           &src, &dest,
                                            DRM_MODE_ROTATE_0,
                                            DRM_PLANE_HELPER_NO_SCALING,
                                            DRM_PLANE_HELPER_NO_SCALING,

diff --git a/drivers/gpu/drm/drm_simple_kms_helper.c b/drivers/gpu/drm/drm_simple_kms_helper.c
index 6808f732f285913455e1ba5c001aefd42899d210..987a353c7f720113fe4e07e81d76ba4a581d4394 100644 (file)
--- a/drivers/gpu/drm/drm_simple_kms_helper.c
+++ b/drivers/gpu/drm/drm_simple_kms_helper.c
@@ -128,7 +128,6 @@ static const struct drm_crtc_funcs drm_simple_kms_crtc_funcs = {
 static int drm_simple_kms_plane_atomic_check(struct drm_plane *plane,
                                        struct drm_plane_state *plane_state)
 {
-       struct drm_rect clip = { 0 };
        struct drm_simple_display_pipe *pipe;
        struct drm_crtc_state *crtc_state;
        int ret;
@@ -138,7 +137,6 @@ static int drm_simple_kms_plane_atomic_check(struct drm_plane *plane,
                                                   &pipe->crtc);
 
        ret = drm_atomic_helper_check_plane_state(plane_state, crtc_state,
-                                                 &clip,
                                                  DRM_PLANE_HELPER_NO_SCALING,
                                                  DRM_PLANE_HELPER_NO_SCALING,
                                                  false, true);
@@ -148,8 +146,6 @@ static int drm_simple_kms_plane_atomic_check(struct drm_plane *plane,
        if (!plane_state->visible)
                return 0;
 
-       drm_mode_get_hv_timing(&crtc_state->mode, &clip.x2, &clip.y2);
-
        if (!pipe->funcs || !pipe->funcs->check)
                return 0;
 

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 2dceb4cc5f3087b1429e3e0576a8aee2655c5fe8..250597e6f580c80197808af09661a29853825ee8 100644 (file)
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -9360,18 +9360,12 @@ static int intel_check_cursor(struct intel_crtc_state *crtc_state,
                              struct intel_plane_state *plane_state)
 {
        const struct drm_framebuffer *fb = plane_state->base.fb;
-       struct drm_rect clip = {};
        int src_x, src_y;
        u32 offset;
        int ret;
 
-       if (crtc_state->base.enable)
-               drm_mode_get_hv_timing(&crtc_state->base.mode,
-                                      &clip.x2, &clip.y2);
-
        ret = drm_atomic_helper_check_plane_state(&plane_state->base,
                                                  &crtc_state->base,
-                                                 &clip,
                                                  DRM_PLANE_HELPER_NO_SCALING,
                                                  DRM_PLANE_HELPER_NO_SCALING,
                                                  true, true);
@@ -12806,7 +12800,6 @@ intel_check_primary_plane(struct intel_plane *plane,
        int min_scale = DRM_PLANE_HELPER_NO_SCALING;
        int max_scale = DRM_PLANE_HELPER_NO_SCALING;
        bool can_position = false;
-       struct drm_rect clip = {};
        int ret;
 
        if (INTEL_GEN(dev_priv) >= 9) {
@@ -12818,13 +12811,8 @@ intel_check_primary_plane(struct intel_plane *plane,
                can_position = true;
        }
 
-       if (crtc_state->base.enable)
-               drm_mode_get_hv_timing(&crtc_state->base.mode,
-                                      &clip.x2, &clip.y2);
-
        ret = drm_atomic_helper_check_plane_state(&state->base,
                                                  &crtc_state->base,
-                                                 &clip,
                                                  min_scale, max_scale,
                                                  can_position, true);
        if (ret)

diff --git a/drivers/gpu/drm/imx/ipuv3-plane.c b/drivers/gpu/drm/imx/ipuv3-plane.c
index 150628293c51303e8e35eec5e7d9115aef13dda8..d7e3583e608ec7f1cf3df531f6415ded53a7988b 100644 (file)
--- a/drivers/gpu/drm/imx/ipuv3-plane.c
+++ b/drivers/gpu/drm/imx/ipuv3-plane.c
@@ -351,7 +351,6 @@ static int ipu_plane_atomic_check(struct drm_plane *plane,
        struct drm_framebuffer *old_fb = old_state->fb;
        unsigned long eba, ubo, vbo, old_ubo, old_vbo, alpha_eba;
        bool can_position = (plane->type == DRM_PLANE_TYPE_OVERLAY);
-       struct drm_rect clip = {};
        int hsub, vsub;
        int ret;
 
@@ -367,11 +366,7 @@ static int ipu_plane_atomic_check(struct drm_plane *plane,
        if (WARN_ON(!crtc_state))
                return -EINVAL;
 
-       if (crtc_state->enable)
-               drm_mode_get_hv_timing(&crtc_state->mode,
-                                      &clip.x2, &clip.y2);
-
-       ret = drm_atomic_helper_check_plane_state(state, crtc_state, &clip,
+       ret = drm_atomic_helper_check_plane_state(state, crtc_state,
                                                  DRM_PLANE_HELPER_NO_SCALING,
                                                  DRM_PLANE_HELPER_NO_SCALING,
                                                  can_position, true);

diff --git a/drivers/gpu/drm/mediatek/mtk_drm_plane.c b/drivers/gpu/drm/mediatek/mtk_drm_plane.c
index b5c6eec9a584fcf624ee8897c4f77e5735218527..2f4b0ffee598948e12a00822c073ca9f34d3fb31 100644 (file)
--- a/drivers/gpu/drm/mediatek/mtk_drm_plane.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_plane.c
@@ -91,7 +91,6 @@ static int mtk_plane_atomic_check(struct drm_plane *plane,
 {
        struct drm_framebuffer *fb = state->fb;
        struct drm_crtc_state *crtc_state;
-       struct drm_rect clip = { 0, };
 
        if (!fb)
                return 0;
@@ -108,11 +107,7 @@ static int mtk_plane_atomic_check(struct drm_plane *plane,
        if (IS_ERR(crtc_state))
                return PTR_ERR(crtc_state);
 
-       if (crtc_state->enable)
-               drm_mode_get_hv_timing(&crtc_state->mode,
-                                      &clip.x2, &clip.y2);
-
-       return drm_atomic_helper_check_plane_state(state, crtc_state, &clip,
+       return drm_atomic_helper_check_plane_state(state, crtc_state,
                                                   DRM_PLANE_HELPER_NO_SCALING,
                                                   DRM_PLANE_HELPER_NO_SCALING,
                                                   true, true);

diff --git a/drivers/gpu/drm/meson/meson_plane.c b/drivers/gpu/drm/meson/meson_plane.c
index 3801bee1f9e627bfa32b2b22725bba7d18556414..c78a3a59f58cbcf29b6d6c80b532eb51e9fdd6c0 100644 (file)
--- a/drivers/gpu/drm/meson/meson_plane.c
+++ b/drivers/gpu/drm/meson/meson_plane.c
@@ -49,7 +49,6 @@ static int meson_plane_atomic_check(struct drm_plane *plane,
                                    struct drm_plane_state *state)
 {
        struct drm_crtc_state *crtc_state;
-       struct drm_rect clip = { 0, };
 
        if (!state->crtc)
                return 0;
@@ -58,11 +57,7 @@ static int meson_plane_atomic_check(struct drm_plane *plane,
        if (IS_ERR(crtc_state))
                return PTR_ERR(crtc_state);
 
-       if (crtc_state->enable)
-               drm_mode_get_hv_timing(&crtc_state->mode,
-                                      &clip.x2, &clip.y2);
-
-       return drm_atomic_helper_check_plane_state(state, crtc_state, &clip,
+       return drm_atomic_helper_check_plane_state(state, crtc_state,
                                                   DRM_PLANE_HELPER_NO_SCALING,
                                                   DRM_PLANE_HELPER_NO_SCALING,
                                                   true, true);

diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c
index 98d4d73317677621dd7f1bae2a51ec635c54fbda..44fc9fe4737abf3b8e78458411dca39d8a2c1192 100644 (file)
--- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c
+++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c
@@ -286,7 +286,6 @@ static int mdp5_plane_atomic_check_with_state(struct drm_crtc_state *crtc_state,
        uint32_t max_width, max_height;
        bool out_of_bounds = false;
        uint32_t caps = 0;
-       struct drm_rect clip = {};
        int min_scale, max_scale;
        int ret;
 
@@ -323,11 +322,7 @@ static int mdp5_plane_atomic_check_with_state(struct drm_crtc_state *crtc_state,
        min_scale = FRAC_16_16(1, 8);
        max_scale = FRAC_16_16(8, 1);
 
-       if (crtc_state->enable)
-               drm_mode_get_hv_timing(&crtc_state->mode,
-                                      &clip.x2, &clip.y2);
-
-       ret = drm_atomic_helper_check_plane_state(state, crtc_state, &clip,
+       ret = drm_atomic_helper_check_plane_state(state, crtc_state,
                                                  min_scale, max_scale,
                                                  true, true);
        if (ret)
@@ -471,7 +466,6 @@ static int mdp5_plane_atomic_async_check(struct drm_plane *plane,
 {
        struct mdp5_plane_state *mdp5_state = to_mdp5_plane_state(state);
        struct drm_crtc_state *crtc_state;
-       struct drm_rect clip = {};
        int min_scale, max_scale;
        int ret;
 
@@ -502,11 +496,7 @@ static int mdp5_plane_atomic_async_check(struct drm_plane *plane,
        min_scale = FRAC_16_16(1, 8);
        max_scale = FRAC_16_16(8, 1);
 
-       if (crtc_state->enable)
-               drm_mode_get_hv_timing(&crtc_state->mode,
-                                      &clip.x2, &clip.y2);
-
-       ret = drm_atomic_helper_check_plane_state(state, crtc_state, &clip,
+       ret = drm_atomic_helper_check_plane_state(state, crtc_state,
                                                  min_scale, max_scale,
                                                  true, true);
        if (ret)

diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c
index 1f55b3d80a566d2ecc80202327f35c558934c9e7..6af3bc483c8461baa23c54970cede36f4cbf5dac 100644 (file)
--- a/drivers/gpu/drm/nouveau/nv50_display.c
+++ b/drivers/gpu/drm/nouveau/nv50_display.c
@@ -1143,15 +1143,9 @@ static int
 nv50_curs_acquire(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw,
                  struct nv50_head_atom *asyh)
 {
-       struct drm_rect clip = {};
        int ret;
 
-       if (asyh->state.enable)
-               drm_mode_get_hv_timing(&asyh->state.mode,
-                                      &clip.x2, &clip.y2);
-
        ret = drm_atomic_helper_check_plane_state(&asyw->state, &asyh->state,
-                                                 &clip,
                                                  DRM_PLANE_HELPER_NO_SCALING,
                                                  DRM_PLANE_HELPER_NO_SCALING,
                                                  true, true);
@@ -1435,18 +1429,12 @@ nv50_base_acquire(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw,
                  struct nv50_head_atom *asyh)
 {
        const struct drm_framebuffer *fb = asyw->state.fb;
-       struct drm_rect clip = {};
        int ret;
 
        if (!fb->format->depth)
                return -EINVAL;
 
-       if (asyh->state.enable)
-               drm_mode_get_hv_timing(&asyh->state.mode,
-                                      &clip.x2, &clip.y2);
-
        ret = drm_atomic_helper_check_plane_state(&asyw->state, &asyh->state,
-                                                 &clip,
                                                  DRM_PLANE_HELPER_NO_SCALING,
                                                  DRM_PLANE_HELPER_NO_SCALING,
                                                  false, true);

diff --git a/drivers/gpu/drm/rcar-du/rcar_du_plane.c b/drivers/gpu/drm/rcar-du/rcar_du_plane.c
index 5687a94d4cb1be0c81021bdc287fdcaa576bb05b..68556bd9dad2c42988c6f02d5be5a82d97c69cf5 100644 (file)
--- a/drivers/gpu/drm/rcar-du/rcar_du_plane.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_plane.c
@@ -572,7 +572,6 @@ int __rcar_du_plane_atomic_check(struct drm_plane *plane,
 {
        struct drm_device *dev = plane->dev;
        struct drm_crtc_state *crtc_state;
-       struct drm_rect clip = {};
        int ret;
 
        if (!state->crtc) {
@@ -589,11 +588,7 @@ int __rcar_du_plane_atomic_check(struct drm_plane *plane,
        if (IS_ERR(crtc_state))
                return PTR_ERR(crtc_state);
 
-       if (crtc_state->enable)
-               drm_mode_get_hv_timing(&crtc_state->mode,
-                                      &clip.x2, &clip.y2);
-
-       ret = drm_atomic_helper_check_plane_state(state, crtc_state, &clip,
+       ret = drm_atomic_helper_check_plane_state(state, crtc_state,
                                                  DRM_PLANE_HELPER_NO_SCALING,
                                                  DRM_PLANE_HELPER_NO_SCALING,
                                                  true, true);

diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
index 9f72762532bf02f58a7fd4f8fc8e32c6f3bfd892..998e65d76bf8f4017e49fe628a0f51e8e828ce02 100644 (file)
--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
@@ -630,7 +630,6 @@ static int vop_plane_atomic_check(struct drm_plane *plane,
        struct vop_win *vop_win = to_vop_win(plane);
        const struct vop_win_data *win = vop_win->data;
        int ret;
-       struct drm_rect clip = {};
        int min_scale = win->phy->scl ? FRAC_16_16(1, 8) :
                                        DRM_PLANE_HELPER_NO_SCALING;
        int max_scale = win->phy->scl ? FRAC_16_16(8, 1) :
@@ -643,11 +642,7 @@ static int vop_plane_atomic_check(struct drm_plane *plane,
        if (WARN_ON(!crtc_state))
                return -EINVAL;
 
-       if (crtc_state->enable)
-               drm_mode_get_hv_timing(&crtc_state->mode,
-                                      &clip.x2, &clip.y2);
-
-       ret = drm_atomic_helper_check_plane_state(state, crtc_state, &clip,
+       ret = drm_atomic_helper_check_plane_state(state, crtc_state,
                                                  min_scale, max_scale,
                                                  true, true);
        if (ret)

diff --git a/drivers/gpu/drm/sun4i/sun8i_ui_layer.c b/drivers/gpu/drm/sun4i/sun8i_ui_layer.c
index 2f0ccd50b54d6ffff580e25356a7637ee97f3a4d..9a540330cb79808f74c7e5c944f77953ab4b1ccd 100644 (file)
--- a/drivers/gpu/drm/sun4i/sun8i_ui_layer.c
+++ b/drivers/gpu/drm/sun4i/sun8i_ui_layer.c
@@ -211,7 +211,6 @@ static int sun8i_ui_layer_atomic_check(struct drm_plane *plane,
        struct drm_crtc *crtc = state->crtc;
        struct drm_crtc_state *crtc_state;
        int min_scale, max_scale;
-       struct drm_rect clip = {};
 
        if (!crtc)
                return 0;
@@ -220,10 +219,6 @@ static int sun8i_ui_layer_atomic_check(struct drm_plane *plane,
        if (WARN_ON(!crtc_state))
                return -EINVAL;
 
-       if (crtc_state->enable)
-               drm_mode_get_hv_timing(&crtc_state->mode,
-                                      &clip.x2, &clip.y2);
-
        min_scale = DRM_PLANE_HELPER_NO_SCALING;
        max_scale = DRM_PLANE_HELPER_NO_SCALING;
 
@@ -232,7 +227,7 @@ static int sun8i_ui_layer_atomic_check(struct drm_plane *plane,
                max_scale = SUN8I_UI_SCALER_SCALE_MAX;
        }
 
-       return drm_atomic_helper_check_plane_state(state, crtc_state, &clip,
+       return drm_atomic_helper_check_plane_state(state, crtc_state,
                                                   min_scale, max_scale,
                                                   true, true);
 }

diff --git a/drivers/gpu/drm/sun4i/sun8i_vi_layer.c b/drivers/gpu/drm/sun4i/sun8i_vi_layer.c
index eb3bf2d7291a29386874826f62551883516dfb11..5877f8ef5895fd19a70edea0c4f7ed89cd4ed0d9 100644 (file)
--- a/drivers/gpu/drm/sun4i/sun8i_vi_layer.c
+++ b/drivers/gpu/drm/sun4i/sun8i_vi_layer.c
@@ -239,7 +239,6 @@ static int sun8i_vi_layer_atomic_check(struct drm_plane *plane,
        struct drm_crtc *crtc = state->crtc;
        struct drm_crtc_state *crtc_state;
        int min_scale, max_scale;
-       struct drm_rect clip = {};
 
        if (!crtc)
                return 0;
@@ -248,10 +247,6 @@ static int sun8i_vi_layer_atomic_check(struct drm_plane *plane,
        if (WARN_ON(!crtc_state))
                return -EINVAL;
 
-       if (crtc_state->enable)
-               drm_mode_get_hv_timing(&crtc_state->mode,
-                                      &clip.x2, &clip.y2);
-
        min_scale = DRM_PLANE_HELPER_NO_SCALING;
        max_scale = DRM_PLANE_HELPER_NO_SCALING;
 
@@ -260,7 +255,7 @@ static int sun8i_vi_layer_atomic_check(struct drm_plane *plane,
                max_scale = SUN8I_VI_SCALER_SCALE_MAX;
        }
 
-       return drm_atomic_helper_check_plane_state(state, crtc_state, &clip,
+       return drm_atomic_helper_check_plane_state(state, crtc_state,
                                                   min_scale, max_scale,
                                                   true, true);
 }

diff --git a/drivers/gpu/drm/tegra/plane.c b/drivers/gpu/drm/tegra/plane.c
index 7267a01e6f088ebcf5e2ddafb1174a41535b2585..a056fbf83b53adb9b26947d79037b00537edf302 100644 (file)
--- a/drivers/gpu/drm/tegra/plane.c
+++ b/drivers/gpu/drm/tegra/plane.c
@@ -82,7 +82,6 @@ int tegra_plane_state_add(struct tegra_plane *plane,
 {
        struct drm_crtc_state *crtc_state;
        struct tegra_dc_state *tegra;
-       struct drm_rect clip = {};
        int err;
 
        /* Propagate errors from allocation or locking failures. */
@@ -90,12 +89,8 @@ int tegra_plane_state_add(struct tegra_plane *plane,
        if (IS_ERR(crtc_state))
                return PTR_ERR(crtc_state);
 
-       if (crtc_state->enable)
-               drm_mode_get_hv_timing(&crtc_state->mode,
-                                      &clip.x2, &clip.y2);
-
        /* Check plane state for visibility and calculate clipping bounds */
-       err = drm_atomic_helper_check_plane_state(state, crtc_state, &clip,
+       err = drm_atomic_helper_check_plane_state(state, crtc_state,
                                                  0, INT_MAX, true, true);
        if (err < 0)
                return err;

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
index 1107d6d0350641974e9fdd902266e6a3b19b558b..34ecc27fc30a234a5b277996bc3a0272bbc20815 100644 (file)
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
@@ -443,17 +443,12 @@ int vmw_du_primary_plane_atomic_check(struct drm_plane *plane,
 {
        struct drm_crtc_state *crtc_state = NULL;
        struct drm_framebuffer *new_fb = state->fb;
-       struct drm_rect clip = {};
        int ret;
 
        if (state->crtc)
                crtc_state = drm_atomic_get_new_crtc_state(state->state, state->crtc);
 
-       if (crtc_state && crtc_state->enable)
-               drm_mode_get_hv_timing(&crtc_state->mode,
-                                      &clip.x2, &clip.y2);
-
-       ret = drm_atomic_helper_check_plane_state(state, crtc_state, &clip,
+       ret = drm_atomic_helper_check_plane_state(state, crtc_state,
                                                  DRM_PLANE_HELPER_NO_SCALING,
                                                  DRM_PLANE_HELPER_NO_SCALING,
                                                  false, true);

diff --git a/drivers/gpu/drm/zte/zx_plane.c b/drivers/gpu/drm/zte/zx_plane.c
index 8e1f34274e246e8a8059800edbc21d8e864453a9..94545adac50d2d727cb19e8ade00b1b0b74e29d9 100644 (file)
--- a/drivers/gpu/drm/zte/zx_plane.c
+++ b/drivers/gpu/drm/zte/zx_plane.c
@@ -55,7 +55,6 @@ static int zx_vl_plane_atomic_check(struct drm_plane *plane,
        struct drm_framebuffer *fb = plane_state->fb;
        struct drm_crtc *crtc = plane_state->crtc;
        struct drm_crtc_state *crtc_state;
-       struct drm_rect clip = {};
        int min_scale = FRAC_16_16(1, 8);
        int max_scale = FRAC_16_16(8, 1);
 
@@ -75,12 +74,8 @@ static int zx_vl_plane_atomic_check(struct drm_plane *plane,
        if (!plane_state->crtc)
                return -EINVAL;
 
-       if (crtc_state->enable)
-               drm_mode_get_hv_timing(&crtc_state->mode,
-                                      &clip.x2, &clip.y2);
-
        return drm_atomic_helper_check_plane_state(plane_state, crtc_state,
-                                                  &clip, min_scale, max_scale,
+                                                  min_scale, max_scale,
                                                   true, true);
 }
 
@@ -291,7 +286,6 @@ static int zx_gl_plane_atomic_check(struct drm_plane *plane,
        struct drm_framebuffer *fb = plane_state->fb;
        struct drm_crtc *crtc = plane_state->crtc;
        struct drm_crtc_state *crtc_state;
-       struct drm_rect clip = {};
 
        if (!crtc || !fb)
                return 0;
@@ -309,12 +303,7 @@ static int zx_gl_plane_atomic_check(struct drm_plane *plane,
        if (!plane_state->crtc)
                return -EINVAL;
 
-       if (crtc_state->enable)
-               drm_mode_get_hv_timing(&crtc_state->mode,
-                                      &clip.x2, &clip.y2);
-
        return drm_atomic_helper_check_plane_state(plane_state, crtc_state,
-                                                  &clip,
                                                   DRM_PLANE_HELPER_NO_SCALING,
                                                   DRM_PLANE_HELPER_NO_SCALING,
                                                   false, true);

diff --git a/include/drm/drm_atomic_helper.h b/include/drm/drm_atomic_helper.h
index 4842ee9485ceccad21d980ae8eb006e1507179f9..26aaba58d6ceb34f53608ed5411fc370c06fa7f7 100644 (file)
--- a/include/drm/drm_atomic_helper.h
+++ b/include/drm/drm_atomic_helper.h
@@ -40,7 +40,6 @@ int drm_atomic_helper_check_modeset(struct drm_device *dev,
                                struct drm_atomic_state *state);
 int drm_atomic_helper_check_plane_state(struct drm_plane_state *plane_state,
                                        const struct drm_crtc_state *crtc_state,
-                                       const struct drm_rect *clip,
                                        int min_scale,
                                        int max_scale,
                                        bool can_position,

diff --git a/include/drm/drm_plane_helper.h b/include/drm/drm_plane_helper.h
index 8aa49c0ecd4d6e0d5214d8e1028a5b7ed0bff897..28d7ce620729d48797bc0b0e41f773bc51e7c50b 100644 (file)
--- a/include/drm/drm_plane_helper.h
+++ b/include/drm/drm_plane_helper.h
@@ -43,7 +43,6 @@ int drm_plane_helper_check_update(struct drm_plane *plane,
                                  struct drm_framebuffer *fb,
                                  struct drm_rect *src,
                                  struct drm_rect *dest,
-                                 const struct drm_rect *clip,
                                  unsigned int rotation,
                                  int min_scale,
                                  int max_scale,