Commit 9bf1019c authored by Simon Ser's avatar Simon Ser Committed by Alex Deucher
Browse files

drm/amd/display: add cursor pitch check 



Replace the width check with a pitch check, which matches DM internals.
Add a new check to make sure the pitch (in pixels) matches the width.

Reviewed-by: default avatarNicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Signed-off-by: default avatarSimon Ser <contact@emersion.fr>
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: Harry Wentland <hwentlan@amd.com>
Cc: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 03a66367

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+15 −4
Original line number Diff line number Diff line
@@ -8994,6 +8994,7 @@ static int dm_update_plane_state(struct dc *dc, 
	struct amdgpu_crtc *new_acrtc;

	bool needs_reset;

	int ret = 0;

	unsigned int pitch;





	new_plane_crtc = new_plane_state->crtc;
@@ -9027,15 +9028,25 @@ static int dm_update_plane_state(struct dc *dc, 
				return -EINVAL;

			}



			switch (new_plane_state->fb->width) {

			/* Pitch in pixels */

			pitch = new_plane_state->fb->pitches[0] / new_plane_state->fb->format->cpp[0];



			if (new_plane_state->fb->width != pitch) {

				DRM_DEBUG_ATOMIC("Cursor FB width %d doesn't match pitch %d",

						 new_plane_state->fb->width,

						 pitch);

				return -EINVAL;

			}



			switch (pitch) {

			case 64:

			case 128:

			case 256:

				/* FB width is supported by cursor plane */

				/* FB pitch is supported by cursor plane */

				break;

			default:

				DRM_DEBUG_ATOMIC("Bad cursor FB width %d\n",

						 new_plane_state->fb->width);

				DRM_DEBUG_ATOMIC("Bad cursor FB pitch %d px\n",

						 pitch);

				return -EINVAL;

			}

		}