OSDN Git Service

drm/amd/display: add cursor FB size check
authorSimon Ser <contact@emersion.fr>
Fri, 20 Nov 2020 20:18:55 +0000 (20:18 +0000)
committerAlex Deucher <alexander.deucher@amd.com>
Tue, 24 Nov 2020 17:09:52 +0000 (12:09 -0500)
commit24f99d2b21db3be1da2800470fecfa583a181929
treed69df40783de7fe77339276d60d639d6469791d8
parent7fe466153e5618716f06d09b1b3e1af309dcf0be
drm/amd/display: add cursor FB size check

This patch expands the cursor checks added in "drm/amd/display: add basic
atomic check for cursor plane" to also include a FB size check. Without
this patch, setting a FB smaller than max_cursor_size with an invalid
width would result in amdgpu error messages and a fallback to a 64-byte
width:

    [drm:hubp1_cursor_set_attributes [amdgpu]] *ERROR* Invalid cursor pitch of 100. Only 64/128/256 is supported on DCN.

Note that DC uses the word "pitch" when actually checking the FB width.
Indeed, the function handle_cursor_update does this:

    attributes.pitch = attributes.width;

In my tests, the cursor FB actually had a pitch of 512 bytes.

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Simon Ser <contact@emersion.fr>
Reported-by: Pierre-Loup A. Griffais <pgriffais@valvesoftware.com>
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>
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c