Revert "drm/amd/display: Add null check for 'afb' in amdgpu_dm_update_cursor"
Subsystems (3)
PATCH 1/2 Revert "drm/amd/display: Add null check for 'afb' in amdgpu_dm_update_cursor"
From: Ivan Lipski <[email protected]>
[WHY]
This commit introduced a regression with kms_plane_cursor IGT tests, causing AMD Asics to fail these tests.
This reverts commit 14bcf29b706f8ef423b86c9b783055b5b0c2cd35.
Signed-off-by Ivan Lipski <[email protected]>
--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +4 -12
@@ -8637,22 +8637,14 @@ static void amdgpu_dm_update_cursor(struct drm_plane *plane, {struct amdgpu_device *adev =drm_to_adev (plane->dev);struct amdgpu_framebuffer *afb =to_amdgpu_framebuffer (plane->state->fb); -struct drm_crtc *crtc; -struct dm_crtc_state *crtc_state; -struct amdgpu_crtc *amdgpu_crtc; -u64 address; +struct drm_crtc *crtc = afb ? plane->state->crtc : old_plane_state->crtc; +struct dm_crtc_state *crtc_state = crtc ?to_dm_crtc_state (crtc->state) :NULL ; +struct amdgpu_crtc *amdgpu_crtc =to_amdgpu_crtc (crtc); +uint64_t address = afb ? afb->address :0 ;struct dc_cursor_position position = {0 };struct dc_cursor_attributes attributes;int ret; -if (!afb) -return ; - - crtc = plane->state->crtc ? plane->state->crtc : old_plane_state->crtc; - crtc_state = crtc ?to_dm_crtc_state (crtc->state) :NULL ; - amdgpu_crtc =to_amdgpu_crtc (crtc); - address = afb->address; -if (!plane->state->fb && !old_plane_state->fb)return ;
Signature · 1 line
2.34.1