UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Signed-off-by: Simon 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: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Simon Ser 2020-12-02 21:09:13 +00:00 committed by Alex Deucher
parent 03a6636730
commit 9bf1019c5f
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
View File

@ -8994,6 +8994,7 @@ static int dm_update_plane_state(struct dc *dc,
struct amdgpu_crtc *new_acrtc; struct amdgpu_crtc *new_acrtc;
bool needs_reset; bool needs_reset;
int ret = 0; int ret = 0;
unsigned int pitch;
new_plane_crtc = new_plane_state->crtc; new_plane_crtc = new_plane_state->crtc;
@ -9027,15 +9028,25 @@ static int dm_update_plane_state(struct dc *dc,
return -EINVAL; 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 64:
case 128: case 128:
case 256: case 256:
/* FB width is supported by cursor plane */ /* FB pitch is supported by cursor plane */
break; break;
default: default:
DRM_DEBUG_ATOMIC("Bad cursor FB width %d\n", DRM_DEBUG_ATOMIC("Bad cursor FB pitch %d px\n",
new_plane_state->fb->width); pitch);
return -EINVAL; return -EINVAL;
} }
} }