Commit 15af755f authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/plane: drop atomic from intel_atomic_plane_check_clipping() 



Align with intel_plane_check_src_coordinates(). The "atomic" is
superfluous.

Reviewed-by: default avatarGustavo Sousa <gustavo.sousa@intel.com>
Link: https://lore.kernel.org/r/0bebd67e583b6ca56f788bd795ffe77db342e809.1750147992.git.jani.nikula@intel.com


Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent a649c2ab

drivers/gpu/drm/i915/display/i9xx_plane.c

+4 −4
Original line number Diff line number Diff line
@@ -336,7 +336,7 @@ i9xx_plane_check(struct intel_crtc_state *crtc_state, 
	if (ret)

		return ret;



	ret = intel_atomic_plane_check_clipping(plane_state, crtc_state,

	ret = intel_plane_check_clipping(plane_state, crtc_state,

					 DRM_PLANE_NO_SCALING,

					 DRM_PLANE_NO_SCALING,

					 i9xx_plane_has_windowing(plane));

drivers/gpu/drm/i915/display/intel_cursor.c

+4 −4
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ static int intel_check_cursor(struct intel_crtc_state *crtc_state, 
		return -EINVAL;

	}



	ret = intel_atomic_plane_check_clipping(plane_state, crtc_state,

	ret = intel_plane_check_clipping(plane_state, crtc_state,

					 DRM_PLANE_NO_SCALING,

					 DRM_PLANE_NO_SCALING,

					 true);

drivers/gpu/drm/i915/display/intel_plane.c

+4 −4
Original line number Diff line number Diff line
@@ -983,7 +983,7 @@ 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,

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)

drivers/gpu/drm/i915/display/intel_plane.h

+4 −4
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ 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,

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);

drivers/gpu/drm/i915/display/intel_sprite.c

+6 −6
Original line number Diff line number Diff line
@@ -1366,7 +1366,7 @@ g4x_sprite_check(struct intel_crtc_state *crtc_state, 
		}

	}



	ret = intel_atomic_plane_check_clipping(plane_state, crtc_state,

	ret = intel_plane_check_clipping(plane_state, crtc_state,

					 min_scale, max_scale, true);

	if (ret)

		return ret;
@@ -1421,7 +1421,7 @@ vlv_sprite_check(struct intel_crtc_state *crtc_state, 
	if (ret)

		return ret;



	ret = intel_atomic_plane_check_clipping(plane_state, crtc_state,

	ret = intel_plane_check_clipping(plane_state, crtc_state,

					 DRM_PLANE_NO_SCALING,

					 DRM_PLANE_NO_SCALING,

					 true);