[RESEND 2/5] drm/i915/plane: drop atomic from intel_atomic_plane_check_clipping()
Gustavo Sousa
gustavo.sousa at intel.com
Thu Jun 12 12:23:32 UTC 2025
Quoting Jani Nikula (2025-06-12 08:37:08-03:00)
>Align with intel_plane_check_src_coordinates(). The "atomic" is
>superfluous.
>
>Signed-off-by: Jani Nikula <jani.nikula at intel.com>
Reviewed-by: Gustavo Sousa <gustavo.sousa at intel.com>
>---
> drivers/gpu/drm/i915/display/i9xx_plane.c | 8 ++++----
> drivers/gpu/drm/i915/display/intel_cursor.c | 8 ++++----
> drivers/gpu/drm/i915/display/intel_plane.c | 8 ++++----
> drivers/gpu/drm/i915/display/intel_plane.h | 8 ++++----
> drivers/gpu/drm/i915/display/intel_sprite.c | 12 ++++++------
> drivers/gpu/drm/i915/display/skl_universal_plane.c | 4 ++--
> 6 files changed, 24 insertions(+), 24 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/display/i9xx_plane.c b/drivers/gpu/drm/i915/display/i9xx_plane.c
>index eba8eb745aa7..ac84558006c7 100644
>--- a/drivers/gpu/drm/i915/display/i9xx_plane.c
>+++ b/drivers/gpu/drm/i915/display/i9xx_plane.c
>@@ -336,10 +336,10 @@ i9xx_plane_check(struct intel_crtc_state *crtc_state,
> if (ret)
> return ret;
>
>- ret = intel_atomic_plane_check_clipping(plane_state, crtc_state,
>- DRM_PLANE_NO_SCALING,
>- DRM_PLANE_NO_SCALING,
>- i9xx_plane_has_windowing(plane));
>+ ret = intel_plane_check_clipping(plane_state, crtc_state,
>+ DRM_PLANE_NO_SCALING,
>+ DRM_PLANE_NO_SCALING,
>+ i9xx_plane_has_windowing(plane));
> if (ret)
> return ret;
>
>diff --git a/drivers/gpu/drm/i915/display/intel_cursor.c b/drivers/gpu/drm/i915/display/intel_cursor.c
>index 27d86549af2c..198e69efe9ac 100644
>--- a/drivers/gpu/drm/i915/display/intel_cursor.c
>+++ b/drivers/gpu/drm/i915/display/intel_cursor.c
>@@ -158,10 +158,10 @@ static int intel_check_cursor(struct intel_crtc_state *crtc_state,
> return -EINVAL;
> }
>
>- ret = intel_atomic_plane_check_clipping(plane_state, crtc_state,
>- DRM_PLANE_NO_SCALING,
>- DRM_PLANE_NO_SCALING,
>- true);
>+ ret = intel_plane_check_clipping(plane_state, crtc_state,
>+ DRM_PLANE_NO_SCALING,
>+ DRM_PLANE_NO_SCALING,
>+ true);
> if (ret)
> return ret;
>
>diff --git a/drivers/gpu/drm/i915/display/intel_plane.c b/drivers/gpu/drm/i915/display/intel_plane.c
>index f079963c5dff..f68432d28d36 100644
>--- a/drivers/gpu/drm/i915/display/intel_plane.c
>+++ b/drivers/gpu/drm/i915/display/intel_plane.c
>@@ -983,10 +983,10 @@ void intel_crtc_planes_update_arm(struct intel_dsb *dsb,
> i9xx_crtc_planes_update_arm(dsb, state, crtc);
> }
>
>-int intel_atomic_plane_check_clipping(struct intel_plane_state *plane_state,
>- struct intel_crtc_state *crtc_state,
>- int min_scale, int max_scale,
>- bool can_position)
>+int intel_plane_check_clipping(struct intel_plane_state *plane_state,
>+ struct intel_crtc_state *crtc_state,
>+ int min_scale, int max_scale,
>+ bool can_position)
> {
> struct intel_display *display = to_intel_display(plane_state);
> struct intel_plane *plane = to_intel_plane(plane_state->uapi.plane);
>diff --git a/drivers/gpu/drm/i915/display/intel_plane.h b/drivers/gpu/drm/i915/display/intel_plane.h
>index 1dd32586ac16..10a94b9a135c 100644
>--- a/drivers/gpu/drm/i915/display/intel_plane.h
>+++ b/drivers/gpu/drm/i915/display/intel_plane.h
>@@ -74,10 +74,10 @@ int intel_plane_atomic_check(struct intel_atomic_state *state,
> int intel_plane_calc_min_cdclk(struct intel_atomic_state *state,
> struct intel_plane *plane,
> bool *need_cdclk_calc);
>-int intel_atomic_plane_check_clipping(struct intel_plane_state *plane_state,
>- struct intel_crtc_state *crtc_state,
>- int min_scale, int max_scale,
>- bool can_position);
>+int intel_plane_check_clipping(struct intel_plane_state *plane_state,
>+ struct intel_crtc_state *crtc_state,
>+ int min_scale, int max_scale,
>+ bool can_position);
> int intel_plane_check_src_coordinates(struct intel_plane_state *plane_state);
> void intel_plane_set_invisible(struct intel_crtc_state *crtc_state,
> struct intel_plane_state *plane_state);
>diff --git a/drivers/gpu/drm/i915/display/intel_sprite.c b/drivers/gpu/drm/i915/display/intel_sprite.c
>index db0c48d0c743..e6844df837af 100644
>--- a/drivers/gpu/drm/i915/display/intel_sprite.c
>+++ b/drivers/gpu/drm/i915/display/intel_sprite.c
>@@ -1366,8 +1366,8 @@ g4x_sprite_check(struct intel_crtc_state *crtc_state,
> }
> }
>
>- ret = intel_atomic_plane_check_clipping(plane_state, crtc_state,
>- min_scale, max_scale, true);
>+ ret = intel_plane_check_clipping(plane_state, crtc_state,
>+ min_scale, max_scale, true);
> if (ret)
> return ret;
>
>@@ -1421,10 +1421,10 @@ vlv_sprite_check(struct intel_crtc_state *crtc_state,
> if (ret)
> return ret;
>
>- ret = intel_atomic_plane_check_clipping(plane_state, crtc_state,
>- DRM_PLANE_NO_SCALING,
>- DRM_PLANE_NO_SCALING,
>- true);
>+ ret = intel_plane_check_clipping(plane_state, crtc_state,
>+ DRM_PLANE_NO_SCALING,
>+ DRM_PLANE_NO_SCALING,
>+ true);
> if (ret)
> return ret;
>
>diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c b/drivers/gpu/drm/i915/display/skl_universal_plane.c
>index 9c8dac97cc40..68f18f18bacd 100644
>--- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
>+++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
>@@ -2327,8 +2327,8 @@ static int skl_plane_check(struct intel_crtc_state *crtc_state,
> max_scale = skl_plane_max_scale(display, fb);
> }
>
>- ret = intel_atomic_plane_check_clipping(plane_state, crtc_state,
>- min_scale, max_scale, true);
>+ ret = intel_plane_check_clipping(plane_state, crtc_state,
>+ min_scale, max_scale, true);
> if (ret)
> return ret;
>
>--
>2.39.5
>
More information about the Intel-gfx
mailing list