drm/amdgpu: Store CRTC relative amdgpu_crtc->cursor_x/y values
Subsystems (2)
PATCH 1/3 drm/amdgpu: Store CRTC relative amdgpu_crtc->cursor_x/y values
From: Michel Dänzer <[email protected]>
We were storing viewport relative coordinates. However, crtc_cursor_set2 and cursor_reset pass amdgpu_crtc->cursor_x/y as the x/y parameters of cursor_move_locked, which would break if the CRTC isn't located at (0, 0).
--- drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 6 +++--- drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 6 +++--- drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 5 +++-- drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 6 +++--- 4 files changed, 12 insertions(+), 11 deletions(-)
drivers/gpu/drm/amd/amdgpu/dce_v10_0.c +3 -3
@@ -2493,6 +2493,9 @@ static int dce_v10_0_cursor_move_locked(struct drm_crtc *crtc,struct amdgpu_device *adev = crtc->dev->dev_private;int xorigin =0 , yorigin =0 ; + amdgpu_crtc->cursor_x = x; + amdgpu_crtc->cursor_y = y; +/* avivo cursor are offset into the total surface */ x += crtc->x; y += crtc->y;
@@ -2512,9 +2515,6 @@ static int dce_v10_0_cursor_move_locked(struct drm_crtc *crtc,WREG32 (mmCUR_SIZE + amdgpu_crtc->crtc_offset, ((amdgpu_crtc->cursor_width -1 ) <<16 ) | (amdgpu_crtc->cursor_height -1 )); - amdgpu_crtc->cursor_x = x; - amdgpu_crtc->cursor_y = y; -return 0 ; }
drivers/gpu/drm/amd/amdgpu/dce_v11_0.c +3 -3
@@ -2509,6 +2509,9 @@ static int dce_v11_0_cursor_move_locked(struct drm_crtc *crtc,struct amdgpu_device *adev = crtc->dev->dev_private;int xorigin =0 , yorigin =0 ; + amdgpu_crtc->cursor_x = x; + amdgpu_crtc->cursor_y = y; +/* avivo cursor are offset into the total surface */ x += crtc->x; y += crtc->y;
@@ -2528,9 +2531,6 @@ static int dce_v11_0_cursor_move_locked(struct drm_crtc *crtc,WREG32 (mmCUR_SIZE + amdgpu_crtc->crtc_offset, ((amdgpu_crtc->cursor_width -1 ) <<16 ) | (amdgpu_crtc->cursor_height -1 )); - amdgpu_crtc->cursor_x = x; - amdgpu_crtc->cursor_y = y; -return 0 ; }
drivers/gpu/drm/amd/amdgpu/dce_v6_0.c +3 -2
@@ -1855,6 +1855,9 @@ static int dce_v6_0_cursor_move_locked(struct drm_crtc *crtc,int w = amdgpu_crtc->cursor_width; + amdgpu_crtc->cursor_x = x; + amdgpu_crtc->cursor_y = y; +/* avivo cursor are offset into the total surface */ x += crtc->x; y += crtc->y;
@@ -1874,8 +1877,6 @@ static int dce_v6_0_cursor_move_locked(struct drm_crtc *crtc,WREG32 (EVERGREEN_CUR_SIZE + amdgpu_crtc->crtc_offset, ((w -1 ) <<16 ) | (amdgpu_crtc->cursor_height -1 )); - amdgpu_crtc->cursor_x = x; - amdgpu_crtc->cursor_y = y;return 0 ; }
drivers/gpu/drm/amd/amdgpu/dce_v8_0.c +3 -3
@@ -2344,6 +2344,9 @@ static int dce_v8_0_cursor_move_locked(struct drm_crtc *crtc,struct amdgpu_device *adev = crtc->dev->dev_private;int xorigin =0 , yorigin =0 ; + amdgpu_crtc->cursor_x = x; + amdgpu_crtc->cursor_y = y; +/* avivo cursor are offset into the total surface */ x += crtc->x; y += crtc->y;
@@ -2363,9 +2366,6 @@ static int dce_v8_0_cursor_move_locked(struct drm_crtc *crtc,WREG32 (mmCUR_SIZE + amdgpu_crtc->crtc_offset, ((amdgpu_crtc->cursor_width -1 ) <<16 ) | (amdgpu_crtc->cursor_height -1 )); - amdgpu_crtc->cursor_x = x; - amdgpu_crtc->cursor_y = y; -return 0 ; }
Signature · 6 lines
2.10.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 20161027085128.1598-1-michel-otUistvHUpPR7s880joybQ@public.gmane.org
PATCH 2/3 drm/amdgpu: Also call cursor_move_locked when the cursor size changes
From: Michel Dänzer <[email protected]>
The cursor size also affects the register programming.
--- drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 9 +++++---- drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 9 +++++---- drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 9 +++++---- drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 9 +++++---- 4 files changed, 20 insertions(+), 16 deletions(-)
drivers/gpu/drm/amd/amdgpu/dce_v10_0.c +5 -4
@@ -2577,12 +2577,11 @@ static int dce_v10_0_crtc_cursor_set2(struct drm_crtc *crtc,return ret; } - amdgpu_crtc->cursor_width = width; - amdgpu_crtc->cursor_height = height; -dce_v10_0_lock_cursor (crtc, true); -if (hot_x != amdgpu_crtc->cursor_hot_x || +if (width != amdgpu_crtc->cursor_width || + height != amdgpu_crtc->cursor_height || + hot_x != amdgpu_crtc->cursor_hot_x || hot_y != amdgpu_crtc->cursor_hot_y) {int x, y;
@@ -2591,6 +2590,8 @@ static int dce_v10_0_crtc_cursor_set2(struct drm_crtc *crtc,dce_v10_0_cursor_move_locked (crtc, x, y); + amdgpu_crtc->cursor_width = width; + amdgpu_crtc->cursor_height = height; amdgpu_crtc->cursor_hot_x = hot_x; amdgpu_crtc->cursor_hot_y = hot_y; }
drivers/gpu/drm/amd/amdgpu/dce_v11_0.c +5 -4
@@ -2593,12 +2593,11 @@ static int dce_v11_0_crtc_cursor_set2(struct drm_crtc *crtc,return ret; } - amdgpu_crtc->cursor_width = width; - amdgpu_crtc->cursor_height = height; -dce_v11_0_lock_cursor (crtc, true); -if (hot_x != amdgpu_crtc->cursor_hot_x || +if (width != amdgpu_crtc->cursor_width || + height != amdgpu_crtc->cursor_height || + hot_x != amdgpu_crtc->cursor_hot_x || hot_y != amdgpu_crtc->cursor_hot_y) {int x, y;
@@ -2607,6 +2606,8 @@ static int dce_v11_0_crtc_cursor_set2(struct drm_crtc *crtc,dce_v11_0_cursor_move_locked (crtc, x, y); + amdgpu_crtc->cursor_width = width; + amdgpu_crtc->cursor_height = height; amdgpu_crtc->cursor_hot_x = hot_x; amdgpu_crtc->cursor_hot_y = hot_y; }
drivers/gpu/drm/amd/amdgpu/dce_v6_0.c +5 -4
@@ -1939,12 +1939,11 @@ static int dce_v6_0_crtc_cursor_set2(struct drm_crtc *crtc,return ret; } - amdgpu_crtc->cursor_width = width; - amdgpu_crtc->cursor_height = height; -dce_v6_0_lock_cursor (crtc, true); -if (hot_x != amdgpu_crtc->cursor_hot_x || +if (width != amdgpu_crtc->cursor_width || + height != amdgpu_crtc->cursor_height || + hot_x != amdgpu_crtc->cursor_hot_x || hot_y != amdgpu_crtc->cursor_hot_y) {int x, y;
@@ -1953,6 +1952,8 @@ static int dce_v6_0_crtc_cursor_set2(struct drm_crtc *crtc,dce_v6_0_cursor_move_locked (crtc, x, y); + amdgpu_crtc->cursor_width = width; + amdgpu_crtc->cursor_height = height; amdgpu_crtc->cursor_hot_x = hot_x; amdgpu_crtc->cursor_hot_y = hot_y; }
drivers/gpu/drm/amd/amdgpu/dce_v8_0.c +5 -4
@@ -2428,12 +2428,11 @@ static int dce_v8_0_crtc_cursor_set2(struct drm_crtc *crtc,return ret; } - amdgpu_crtc->cursor_width = width; - amdgpu_crtc->cursor_height = height; -dce_v8_0_lock_cursor (crtc, true); -if (hot_x != amdgpu_crtc->cursor_hot_x || +if (width != amdgpu_crtc->cursor_width || + height != amdgpu_crtc->cursor_height || + hot_x != amdgpu_crtc->cursor_hot_x || hot_y != amdgpu_crtc->cursor_hot_y) {int x, y;
@@ -2442,6 +2441,8 @@ static int dce_v8_0_crtc_cursor_set2(struct drm_crtc *crtc,dce_v8_0_cursor_move_locked (crtc, x, y); + amdgpu_crtc->cursor_width = width; + amdgpu_crtc->cursor_height = height; amdgpu_crtc->cursor_hot_x = hot_x; amdgpu_crtc->cursor_hot_y = hot_y; }
Signature · 6 lines
2.10.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/3 drm/amdgpu: Only update the CUR_SIZE register when necessary
In reply to a message not in the archiveFrom: Michel Dänzer <[email protected]>
Normally only necessary when the cursor size changes.
--- drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 22 +++++++++++++++------- drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 22 +++++++++++++++------- drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 18 ++++++++++++++---- drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 20 +++++++++++++++----- 4 files changed, 59 insertions(+), 23 deletions(-)
drivers/gpu/drm/amd/amdgpu/dce_v10_0.c +15 -7
@@ -2512,8 +2512,6 @@ static int dce_v10_0_cursor_move_locked(struct drm_crtc *crtc,WREG32 (mmCUR_POSITION + amdgpu_crtc->crtc_offset, (x <<16 ) | y);WREG32 (mmCUR_HOT_SPOT + amdgpu_crtc->crtc_offset, (xorigin <<16 ) | yorigin); -WREG32 (mmCUR_SIZE + amdgpu_crtc->crtc_offset, - ((amdgpu_crtc->cursor_width -1 ) <<16 ) | (amdgpu_crtc->cursor_height -1 ));return 0 ; }
@@ -2539,6 +2537,7 @@ static int dce_v10_0_crtc_cursor_set2(struct drm_crtc *crtc, int32_t hot_y) {struct amdgpu_crtc *amdgpu_crtc =to_amdgpu_crtc (crtc); +struct amdgpu_device *adev = crtc->dev->dev_private;struct drm_gem_object *obj;struct amdgpu_bo *aobj;int ret;
@@ -2579,9 +2578,7 @@ static int dce_v10_0_crtc_cursor_set2(struct drm_crtc *crtc,dce_v10_0_lock_cursor (crtc, true); -if (width != amdgpu_crtc->cursor_width || - height != amdgpu_crtc->cursor_height || - hot_x != amdgpu_crtc->cursor_hot_x || +if (hot_x != amdgpu_crtc->cursor_hot_x || hot_y != amdgpu_crtc->cursor_hot_y) {int x, y;
@@ -2590,12 +2587,18 @@ static int dce_v10_0_crtc_cursor_set2(struct drm_crtc *crtc,dce_v10_0_cursor_move_locked (crtc, x, y); - amdgpu_crtc->cursor_width = width; - amdgpu_crtc->cursor_height = height; amdgpu_crtc->cursor_hot_x = hot_x; amdgpu_crtc->cursor_hot_y = hot_y; } +if (width != amdgpu_crtc->cursor_width || + height != amdgpu_crtc->cursor_height) { +WREG32 (mmCUR_SIZE + amdgpu_crtc->crtc_offset, + (width -1 ) <<16 | (height -1 )); + amdgpu_crtc->cursor_width = width; + amdgpu_crtc->cursor_height = height; + } +dce_v10_0_show_cursor (crtc);dce_v10_0_lock_cursor (crtc, false);
@@ -2617,6 +2620,7 @@ unpin:static void dce_v10_0_cursor_reset (struct drm_crtc *crtc) {struct amdgpu_crtc *amdgpu_crtc =to_amdgpu_crtc (crtc); +struct amdgpu_device *adev = crtc->dev->dev_private;if (amdgpu_crtc->cursor_bo) {dce_v10_0_lock_cursor (crtc, true);
@@ -2624,6 +2628,10 @@ static void dce_v10_0_cursor_reset(struct drm_crtc *crtc)dce_v10_0_cursor_move_locked (crtc, amdgpu_crtc->cursor_x, amdgpu_crtc->cursor_y); +WREG32 (mmCUR_SIZE + amdgpu_crtc->crtc_offset, + (amdgpu_crtc->cursor_width -1 ) <<16 | + (amdgpu_crtc->cursor_height -1 )); +dce_v10_0_show_cursor (crtc);dce_v10_0_lock_cursor (crtc, false);
drivers/gpu/drm/amd/amdgpu/dce_v11_0.c +15 -7
@@ -2528,8 +2528,6 @@ static int dce_v11_0_cursor_move_locked(struct drm_crtc *crtc,WREG32 (mmCUR_POSITION + amdgpu_crtc->crtc_offset, (x <<16 ) | y);WREG32 (mmCUR_HOT_SPOT + amdgpu_crtc->crtc_offset, (xorigin <<16 ) | yorigin); -WREG32 (mmCUR_SIZE + amdgpu_crtc->crtc_offset, - ((amdgpu_crtc->cursor_width -1 ) <<16 ) | (amdgpu_crtc->cursor_height -1 ));return 0 ; }
@@ -2555,6 +2553,7 @@ static int dce_v11_0_crtc_cursor_set2(struct drm_crtc *crtc, int32_t hot_y) {struct amdgpu_crtc *amdgpu_crtc =to_amdgpu_crtc (crtc); +struct amdgpu_device *adev = crtc->dev->dev_private;struct drm_gem_object *obj;struct amdgpu_bo *aobj;int ret;
@@ -2595,9 +2594,7 @@ static int dce_v11_0_crtc_cursor_set2(struct drm_crtc *crtc,dce_v11_0_lock_cursor (crtc, true); -if (width != amdgpu_crtc->cursor_width || - height != amdgpu_crtc->cursor_height || - hot_x != amdgpu_crtc->cursor_hot_x || +if (hot_x != amdgpu_crtc->cursor_hot_x || hot_y != amdgpu_crtc->cursor_hot_y) {int x, y;
@@ -2606,12 +2603,18 @@ static int dce_v11_0_crtc_cursor_set2(struct drm_crtc *crtc,dce_v11_0_cursor_move_locked (crtc, x, y); - amdgpu_crtc->cursor_width = width; - amdgpu_crtc->cursor_height = height; amdgpu_crtc->cursor_hot_x = hot_x; amdgpu_crtc->cursor_hot_y = hot_y; } +if (width != amdgpu_crtc->cursor_width || + height != amdgpu_crtc->cursor_height) { +WREG32 (mmCUR_SIZE + amdgpu_crtc->crtc_offset, + (width -1 ) <<16 | (height -1 )); + amdgpu_crtc->cursor_width = width; + amdgpu_crtc->cursor_height = height; + } +dce_v11_0_show_cursor (crtc);dce_v11_0_lock_cursor (crtc, false);
@@ -2633,6 +2636,7 @@ unpin:static void dce_v11_0_cursor_reset (struct drm_crtc *crtc) {struct amdgpu_crtc *amdgpu_crtc =to_amdgpu_crtc (crtc); +struct amdgpu_device *adev = crtc->dev->dev_private;if (amdgpu_crtc->cursor_bo) {dce_v11_0_lock_cursor (crtc, true);
@@ -2640,6 +2644,10 @@ static void dce_v11_0_cursor_reset(struct drm_crtc *crtc)dce_v11_0_cursor_move_locked (crtc, amdgpu_crtc->cursor_x, amdgpu_crtc->cursor_y); +WREG32 (mmCUR_SIZE + amdgpu_crtc->crtc_offset, + (amdgpu_crtc->cursor_width -1 ) <<16 | + (amdgpu_crtc->cursor_height -1 )); +dce_v11_0_show_cursor (crtc);dce_v11_0_lock_cursor (crtc, false);
drivers/gpu/drm/amd/amdgpu/dce_v6_0.c +14 -4
@@ -1853,8 +1853,6 @@ static int dce_v6_0_cursor_move_locked(struct drm_crtc *crtc,struct amdgpu_device *adev = crtc->dev->dev_private;int xorigin =0 , yorigin =0 ; -int w = amdgpu_crtc->cursor_width; - amdgpu_crtc->cursor_x = x; amdgpu_crtc->cursor_y = y;
@@ -1874,8 +1872,6 @@ static int dce_v6_0_cursor_move_locked(struct drm_crtc *crtc,WREG32 (EVERGREEN_CUR_POSITION + amdgpu_crtc->crtc_offset, (x <<16 ) | y);WREG32 (EVERGREEN_CUR_HOT_SPOT + amdgpu_crtc->crtc_offset, (xorigin <<16 ) | yorigin); -WREG32 (EVERGREEN_CUR_SIZE + amdgpu_crtc->crtc_offset, - ((w -1 ) <<16 ) | (amdgpu_crtc->cursor_height -1 ));return 0 ; }
@@ -1901,6 +1897,7 @@ static int dce_v6_0_crtc_cursor_set2(struct drm_crtc *crtc, int32_t hot_y) {struct amdgpu_crtc *amdgpu_crtc =to_amdgpu_crtc (crtc); +struct amdgpu_device *adev = crtc->dev->dev_private;struct drm_gem_object *obj;struct amdgpu_bo *aobj;int ret;
@@ -1958,6 +1955,14 @@ static int dce_v6_0_crtc_cursor_set2(struct drm_crtc *crtc, amdgpu_crtc->cursor_hot_y = hot_y; } +if (width != amdgpu_crtc->cursor_width || + height != amdgpu_crtc->cursor_height) { +WREG32 (EVERGREEN_CUR_SIZE + amdgpu_crtc->crtc_offset, + (width -1 ) <<16 | (height -1 )); + amdgpu_crtc->cursor_width = width; + amdgpu_crtc->cursor_height = height; + } +dce_v6_0_show_cursor (crtc);dce_v6_0_lock_cursor (crtc, false);
@@ -1979,6 +1984,7 @@ unpin:static void dce_v6_0_cursor_reset (struct drm_crtc *crtc) {struct amdgpu_crtc *amdgpu_crtc =to_amdgpu_crtc (crtc); +struct amdgpu_device *adev = crtc->dev->dev_private;if (amdgpu_crtc->cursor_bo) {dce_v6_0_lock_cursor (crtc, true);
@@ -1986,6 +1992,10 @@ static void dce_v6_0_cursor_reset(struct drm_crtc *crtc)dce_v6_0_cursor_move_locked (crtc, amdgpu_crtc->cursor_x, amdgpu_crtc->cursor_y); +WREG32 (EVERGREEN_CUR_SIZE + amdgpu_crtc->crtc_offset, + (amdgpu_crtc->cursor_width -1 ) <<16 | + (amdgpu_crtc->cursor_height -1 )); +dce_v6_0_show_cursor (crtc);dce_v6_0_lock_cursor (crtc, false); }
drivers/gpu/drm/amd/amdgpu/dce_v8_0.c +15 -5
@@ -2363,8 +2363,6 @@ static int dce_v8_0_cursor_move_locked(struct drm_crtc *crtc,WREG32 (mmCUR_POSITION + amdgpu_crtc->crtc_offset, (x <<16 ) | y);WREG32 (mmCUR_HOT_SPOT + amdgpu_crtc->crtc_offset, (xorigin <<16 ) | yorigin); -WREG32 (mmCUR_SIZE + amdgpu_crtc->crtc_offset, - ((amdgpu_crtc->cursor_width -1 ) <<16 ) | (amdgpu_crtc->cursor_height -1 ));return 0 ; }
@@ -2390,6 +2388,7 @@ static int dce_v8_0_crtc_cursor_set2(struct drm_crtc *crtc, int32_t hot_y) {struct amdgpu_crtc *amdgpu_crtc =to_amdgpu_crtc (crtc); +struct amdgpu_device *adev = crtc->dev->dev_private;struct drm_gem_object *obj;struct amdgpu_bo *aobj;int ret;
@@ -2430,9 +2429,7 @@ static int dce_v8_0_crtc_cursor_set2(struct drm_crtc *crtc,dce_v8_0_lock_cursor (crtc, true); -if (width != amdgpu_crtc->cursor_width || - height != amdgpu_crtc->cursor_height || - hot_x != amdgpu_crtc->cursor_hot_x || +if (hot_x != amdgpu_crtc->cursor_hot_x || hot_y != amdgpu_crtc->cursor_hot_y) {int x, y;
@@ -2447,6 +2444,14 @@ static int dce_v8_0_crtc_cursor_set2(struct drm_crtc *crtc, amdgpu_crtc->cursor_hot_y = hot_y; } +if (width != amdgpu_crtc->cursor_width || + height != amdgpu_crtc->cursor_height) { +WREG32 (mmCUR_SIZE + amdgpu_crtc->crtc_offset, + (width -1 ) <<16 | (height -1 )); + amdgpu_crtc->cursor_width = width; + amdgpu_crtc->cursor_height = height; + } +dce_v8_0_show_cursor (crtc);dce_v8_0_lock_cursor (crtc, false);
@@ -2468,6 +2473,7 @@ unpin:static void dce_v8_0_cursor_reset (struct drm_crtc *crtc) {struct amdgpu_crtc *amdgpu_crtc =to_amdgpu_crtc (crtc); +struct amdgpu_device *adev = crtc->dev->dev_private;if (amdgpu_crtc->cursor_bo) {dce_v8_0_lock_cursor (crtc, true);
@@ -2475,6 +2481,10 @@ static void dce_v8_0_cursor_reset(struct drm_crtc *crtc)dce_v8_0_cursor_move_locked (crtc, amdgpu_crtc->cursor_x, amdgpu_crtc->cursor_y); +WREG32 (mmCUR_SIZE + amdgpu_crtc->crtc_offset, + (amdgpu_crtc->cursor_width -1 ) <<16 | + (amdgpu_crtc->cursor_height -1 )); +dce_v8_0_show_cursor (crtc);dce_v8_0_lock_cursor (crtc, false);
Signature · 6 lines
2.10.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 20161027085128.1598-3-michel-otUistvHUpPR7s880joybQ@public.gmane.org
Deucher, Alexander
Reviewed-by Alex DeucherRE: [PATCH 3/3] drm/amdgpu: Only update the CUR_SIZE register when necessary
Quoted 8 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Michel Dänzer
Sent: Thursday, October 27, 2016 4:51 AM
To: [email protected]
Subject: [PATCH 3/3] drm/amdgpu: Only update theCUR_SIZEregister when necessary
Quoted 5 lines
From: Michel Dänzer <[email protected]>
Normally only necessary when the cursor size changes.
Signed-off-by Michel Dänzer <[email protected]>
For the series:
Quoted 321 lines
--- drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 22 +++++++++++++++------- drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 22 +++++++++++++++------- drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 18 ++++++++++++++---- drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 20 +++++++++++++++----- 4 files changed, 59 insertions(+), 23 deletions(-)drivers/gpu/drm/amd/amdgpu/dce_v10_0.c +0
-2@@ -2512,8 +2512,6 @@ static int dce_v10_0_cursor_move_locked(struct drm_crtc *crtc,WREG32 (mmCUR_POSITION + amdgpu_crtc->crtc_offset, (x <<16 ) | y);WREG32 (mmCUR_HOT_SPOT + amdgpu_crtc->crtc_offset, (xorigin <<16 ) | yorigin); - WREG32(mmCUR_SIZE + amdgpu_crtc->crtc_offset, - ((amdgpu_crtc->cursor_width - 1) << 16) | (amdgpu_crtc-Quoted 1 line
cursor_height- 1));drivers/gpu/drm/amd/amdgpu/dce_v10_0.c +1
-0return 0 ; }@@ -2539,6 +2537,7 @@ static int dce_v10_0_crtc_cursor_set2(struct drm_crtc *crtc, int32_t hot_y) {struct amdgpu_crtc *amdgpu_crtc =to_amdgpu_crtc (crtc); +struct amdgpu_device *adev = crtc->dev->dev_private;struct drm_gem_object *obj;struct amdgpu_bo *aobj;drivers/gpu/drm/amd/amdgpu/dce_v10_0.c +14
-5int ret;@@ -2579,9 +2578,7 @@ static int dce_v10_0_crtc_cursor_set2(structdrm_crtc *crtc,dce_v10_0_lock_cursor (crtc ,true ); -if (width != amdgpu_crtc->cursor_width || - height != amdgpu_crtc->cursor_height || - hot_x != amdgpu_crtc->cursor_hot_x || +if (hot_x != amdgpu_crtc->cursor_hot_x || hot_y != amdgpu_crtc->cursor_hot_y) {int x, y;@@ -2590,12 +2587,18 @@ static int dce_v10_0_crtc_cursor_set2(structdrm_crtc *crtc,dce_v10_0_cursor_move_locked (crtc ,x ,y ); - amdgpu_crtc->cursor_width = width; - amdgpu_crtc->cursor_height = height; amdgpu_crtc->cursor_hot_x = hot_x; amdgpu_crtc->cursor_hot_y = hot_y; } +if (width != amdgpu_crtc->cursor_width || + height != amdgpu_crtc->cursor_height) { +WREG32 (mmCUR_SIZE + amdgpu_crtc->crtc_offset, + (width -1 ) <<16 | (height -1 )); + amdgpu_crtc->cursor_width = width; + amdgpu_crtc->cursor_height = height; + } +dce_v10_0_show_cursor (crtc);dce_v10_0_lock_cursor (crtc, false);@@ -2617,6 +2620,7 @@ unpin:static void dce_v10_0_cursor_reset (struct drm_crtc *crtc) {struct amdgpu_crtc *amdgpu_crtc =to_amdgpu_crtc (crtc); +struct amdgpu_device *adev = crtc->dev->dev_private;if (amdgpu_crtc->cursor_bo) {dce_v10_0_lock_cursor (crtc, true);@@ -2624,6 +2628,10 @@ static void dce_v10_0_cursor_reset(struct drm_crtc *crtc) dce_v10_0_cursor_move_locked(crtc, amdgpu_crtc- >cursor_x, amdgpu_crtc->cursor_y); +WREG32 (mmCUR_SIZE + amdgpu_crtc->crtc_offset, + (amdgpu_crtc->cursor_width -1 ) <<16 | + (amdgpu_crtc->cursor_height -1 )); +dce_v10_0_show_cursor (crtc);drivers/gpu/drm/amd/amdgpu/dce_v10_0.c +0
-0dce_v10_0_lock_cursor (crtc, false);drivers/gpu/drm/amd/amdgpu/dce_v11_0.c +0
-2@@ -2528,8 +2528,6 @@ static int dce_v11_0_cursor_move_locked(struct drm_crtc *crtc,WREG32 (mmCUR_POSITION + amdgpu_crtc->crtc_offset, (x <<16 ) | y);WREG32 (mmCUR_HOT_SPOT + amdgpu_crtc->crtc_offset, (xorigin <<16 ) | yorigin); - WREG32(mmCUR_SIZE + amdgpu_crtc->crtc_offset, - ((amdgpu_crtc->cursor_width - 1) << 16) | (amdgpu_crtc-Quoted 1 line
cursor_height- 1));drivers/gpu/drm/amd/amdgpu/dce_v11_0.c +1
-0return 0 ; }@@ -2555,6 +2553,7 @@ static int dce_v11_0_crtc_cursor_set2(struct drm_crtc *crtc, int32_t hot_y) {struct amdgpu_crtc *amdgpu_crtc =to_amdgpu_crtc (crtc); +struct amdgpu_device *adev = crtc->dev->dev_private;struct drm_gem_object *obj;struct amdgpu_bo *aobj;drivers/gpu/drm/amd/amdgpu/dce_v11_0.c +14
-5int ret;@@ -2595,9 +2594,7 @@ static int dce_v11_0_crtc_cursor_set2(structdrm_crtc *crtc,dce_v11_0_lock_cursor (crtc ,true ); -if (width != amdgpu_crtc->cursor_width || - height != amdgpu_crtc->cursor_height || - hot_x != amdgpu_crtc->cursor_hot_x || +if (hot_x != amdgpu_crtc->cursor_hot_x || hot_y != amdgpu_crtc->cursor_hot_y) {int x, y;@@ -2606,12 +2603,18 @@ static int dce_v11_0_crtc_cursor_set2(structdrm_crtc *crtc,dce_v11_0_cursor_move_locked (crtc ,x ,y ); - amdgpu_crtc->cursor_width = width; - amdgpu_crtc->cursor_height = height; amdgpu_crtc->cursor_hot_x = hot_x; amdgpu_crtc->cursor_hot_y = hot_y; } +if (width != amdgpu_crtc->cursor_width || + height != amdgpu_crtc->cursor_height) { +WREG32 (mmCUR_SIZE + amdgpu_crtc->crtc_offset, + (width -1 ) <<16 | (height -1 )); + amdgpu_crtc->cursor_width = width; + amdgpu_crtc->cursor_height = height; + } +dce_v11_0_show_cursor (crtc);dce_v11_0_lock_cursor (crtc, false);@@ -2633,6 +2636,7 @@ unpin:static void dce_v11_0_cursor_reset (struct drm_crtc *crtc) {struct amdgpu_crtc *amdgpu_crtc =to_amdgpu_crtc (crtc); +struct amdgpu_device *adev = crtc->dev->dev_private;if (amdgpu_crtc->cursor_bo) {dce_v11_0_lock_cursor (crtc, true);@@ -2640,6 +2644,10 @@ static void dce_v11_0_cursor_reset(struct drm_crtc *crtc) dce_v11_0_cursor_move_locked(crtc, amdgpu_crtc- >cursor_x, amdgpu_crtc->cursor_y); +WREG32 (mmCUR_SIZE + amdgpu_crtc->crtc_offset, + (amdgpu_crtc->cursor_width -1 ) <<16 | + (amdgpu_crtc->cursor_height -1 )); +dce_v11_0_show_cursor (crtc);drivers/gpu/drm/amd/amdgpu/dce_v11_0.c +0
-0dce_v11_0_lock_cursor (crtc, false);drivers/gpu/drm/amd/amdgpu/dce_v6_0.c +0
-4@@ -1853,8 +1853,6 @@ static int dce_v6_0_cursor_move_locked(structdrm_crtc *crtc, struct amdgpu_device *adev = crtc->dev->dev_private;int xorigin =0 , yorigin =0 ; -int w = amdgpu_crtc->cursor_width; - amdgpu_crtc->cursor_x = x; amdgpu_crtc->cursor_y = y;@@ -1874,8 +1872,6 @@ static int dce_v6_0_cursor_move_locked(struct drm_crtc *crtc,WREG32 (EVERGREEN_CUR_POSITION + amdgpu_crtc->crtc_offset, (x <<16 ) | y);WREG32 (EVERGREEN_CUR_HOT_SPOT + amdgpu_crtc->crtc_offset, (xorigin <<16 ) | yorigin); -WREG32 (EVERGREEN_CUR_SIZE + amdgpu_crtc->crtc_offset, - ((w -1 ) <<16 ) | (amdgpu_crtc->cursor_height -1 ));drivers/gpu/drm/amd/amdgpu/dce_v6_0.c +1
-0return 0 ; }@@ -1901,6 +1897,7 @@ static int dce_v6_0_crtc_cursor_set2(struct drm_crtc *crtc, int32_t hot_y) {struct amdgpu_crtc *amdgpu_crtc =to_amdgpu_crtc (crtc); +struct amdgpu_device *adev = crtc->dev->dev_private;struct drm_gem_object *obj;struct amdgpu_bo *aobj;drivers/gpu/drm/amd/amdgpu/dce_v6_0.c +8
-0int ret;@@ -1958,6 +1955,14 @@ static int dce_v6_0_crtc_cursor_set2(struct drm_crtc *crtc, amdgpu_crtc->cursor_hot_y = hot_y; } +if (width != amdgpu_crtc->cursor_width || + height != amdgpu_crtc->cursor_height) { +WREG32 (EVERGREEN_CUR_SIZE + amdgpu_crtc- >crtc_offset, + (width -1 ) <<16 | (height -1 )); + amdgpu_crtc->cursor_width = width; + amdgpu_crtc->cursor_height = height; + } +dce_v6_0_show_cursor (crtc);drivers/gpu/drm/amd/amdgpu/dce_v6_0.c +5
-0dce_v6_0_lock_cursor (crtc, false);@@ -1979,6 +1984,7 @@ unpin:static void dce_v6_0_cursor_reset (struct drm_crtc *crtc) {struct amdgpu_crtc *amdgpu_crtc =to_amdgpu_crtc (crtc); +struct amdgpu_device *adev = crtc->dev->dev_private;if (amdgpu_crtc->cursor_bo) {dce_v6_0_lock_cursor (crtc, true);@@ -1986,6 +1992,10 @@ static void dce_v6_0_cursor_reset(struct drm_crtc *crtc)dce_v6_0_cursor_move_locked (crtc, amdgpu_crtc- >cursor_x, amdgpu_crtc->cursor_y); +WREG32 (EVERGREEN_CUR_SIZE + amdgpu_crtc- >crtc_offset, + (amdgpu_crtc->cursor_width -1 ) <<16 | + (amdgpu_crtc->cursor_height -1 )); +drivers/gpu/drm/amd/amdgpu/dce_v6_0.c +0
-0dce_v6_0_show_cursor (crtc);dce_v6_0_lock_cursor (crtc, false); }drivers/gpu/drm/amd/amdgpu/dce_v8_0.c +0
-2@@ -2363,8 +2363,6 @@ static int dce_v8_0_cursor_move_locked(struct drm_crtc *crtc,WREG32 (mmCUR_POSITION + amdgpu_crtc->crtc_offset, (x <<16 ) | y);WREG32 (mmCUR_HOT_SPOT + amdgpu_crtc->crtc_offset, (xorigin <<16 ) | yorigin); - WREG32(mmCUR_SIZE + amdgpu_crtc->crtc_offset, - ((amdgpu_crtc->cursor_width - 1) << 16) | (amdgpu_crtc-Quoted 1 line
cursor_height- 1));drivers/gpu/drm/amd/amdgpu/dce_v8_0.c +1
-0return 0 ; }@@ -2390,6 +2388,7 @@ static int dce_v8_0_crtc_cursor_set2(struct drm_crtc *crtc, int32_t hot_y) {struct amdgpu_crtc *amdgpu_crtc =to_amdgpu_crtc (crtc); +struct amdgpu_device *adev = crtc->dev->dev_private;struct drm_gem_object *obj;struct amdgpu_bo *aobj;drivers/gpu/drm/amd/amdgpu/dce_v8_0.c +14
-3int ret;@@ -2430,9 +2429,7 @@ static int dce_v8_0_crtc_cursor_set2(structdrm_crtc *crtc,dce_v8_0_lock_cursor (crtc ,true ); -if (width != amdgpu_crtc->cursor_width || - height != amdgpu_crtc->cursor_height || - hot_x != amdgpu_crtc->cursor_hot_x || +if (hot_x != amdgpu_crtc->cursor_hot_x || hot_y != amdgpu_crtc->cursor_hot_y) {int x, y;@@ -2447,6 +2444,14 @@ static int dce_v8_0_crtc_cursor_set2(struct drm_crtc *crtc, amdgpu_crtc->cursor_hot_y = hot_y; } +if (width != amdgpu_crtc->cursor_width || + height != amdgpu_crtc->cursor_height) { +WREG32 (mmCUR_SIZE + amdgpu_crtc->crtc_offset, + (width -1 ) <<16 | (height -1 )); + amdgpu_crtc->cursor_width = width; + amdgpu_crtc->cursor_height = height; + } +dce_v8_0_show_cursor (crtc);dce_v8_0_lock_cursor (crtc, false);@@ -2468,6 +2473,7 @@ unpin:static void dce_v8_0_cursor_reset (struct drm_crtc *crtc) {struct amdgpu_crtc *amdgpu_crtc =to_amdgpu_crtc (crtc); +struct amdgpu_device *adev = crtc->dev->dev_private;if (amdgpu_crtc->cursor_bo) {dce_v8_0_lock_cursor (crtc, true);@@ -2475,6 +2481,10 @@ static void dce_v8_0_cursor_reset(struct drm_crtc *crtc)dce_v8_0_cursor_move_locked (crtc, amdgpu_crtc- >cursor_x, amdgpu_crtc->cursor_y); +WREG32 (mmCUR_SIZE + amdgpu_crtc->crtc_offset, + (amdgpu_crtc->cursor_width -1 ) <<16 | + (amdgpu_crtc->cursor_height -1 )); +dce_v8_0_show_cursor (crtc);
Quoted 8 lines
dce_v8_0_lock_cursor(crtc, false);
--
2.10.1_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx