From: Anson Jacob <anson.ja...@amd.com>

[Why]
dc_cursor_position do not initialise position.translate_by_source when
crtc or plane->state->fb is NULL. UBSAN caught this error in
dce110_set_cursor_position, as the value was garbage.

[How]
Initialise dc_cursor_position structure elements to 0 in handle_cursor_update
before calling get_cursor_position.

Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1471
Reported-by: Lyude Paul <ly...@redhat.com>
Signed-off-by: Anson Jacob <anson.ja...@amd.com>
Reviewed-by: Aurabindo Jayamohanan Pillai <aurabindo.pil...@amd.com>
Acked-by: Solomon Chiu <solomon.c...@amd.com>
---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c 
b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 7347a3dd66fc..df060c354eb8 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -7612,10 +7612,6 @@ static int get_cursor_position(struct drm_plane *plane, 
struct drm_crtc *crtc,
        int x, y;
        int xorigin = 0, yorigin = 0;
 
-       position->enable = false;
-       position->x = 0;
-       position->y = 0;
-
        if (!crtc || !plane->state->fb)
                return 0;
 
@@ -7662,7 +7658,7 @@ static void handle_cursor_update(struct drm_plane *plane,
        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;
+       struct dc_cursor_position position = {0};
        struct dc_cursor_attributes attributes;
        int ret;
 
-- 
2.29.0

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Reply via email to