[PATCH] Revert "drm/amdgpu: Only update the CUR_SIZE register when necessary"
Deucher, Alexander
Alexander.Deucher at amd.com
Wed Jan 11 17:35:40 UTC 2017
> -----Original Message-----
> From: amd-gfx [mailto:amd-gfx-bounces at lists.freedesktop.org] On Behalf
> Of Michel Dänzer
> Sent: Wednesday, January 11, 2017 4:36 AM
> To: amd-gfx at lists.freedesktop.org
> Cc: Harald Judt; Johannes Hirte
> Subject: [PATCH] Revert "drm/amdgpu: Only update the CUR_SIZE register
> when necessary"
>
> From: Michel Dänzer <michel.daenzer at amd.com>
>
> This reverts commits 7c83d7abc9997cf1efac2c0ce384b5e8453ee870 and
> a1f49cc179ce6b7b7758ae3ff5cdb138d0ee0f56.
>
> They caused the HW cursor to disappear under various circumstances in
> the wild. I wasn't able to reproduce any of them, and I'm not sure
> what's going on. But those changes aren't a big deal anyway, so let's
> just revert for now.
>
> Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=191291
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=99143
> Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>
Acked-by: Alex Deucher <alexander.deucher at amd.com>
> ---
> 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 | 24 +++++++++---------------
> drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 22 +++++++---------------
> 4 files changed, 30 insertions(+), 60 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
> b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
> index 4fa12933e1fe..db6e2992b49c 100644
> --- a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
> @@ -2513,6 +2513,8 @@ 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;
> }
> @@ -2538,7 +2540,6 @@ 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,7 +2580,9 @@ static int dce_v10_0_crtc_cursor_set2(struct
> drm_crtc *crtc,
>
> 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;
>
> @@ -2588,16 +2591,10 @@ static int dce_v10_0_crtc_cursor_set2(struct
> drm_crtc *crtc,
>
> dce_v10_0_cursor_move_locked(crtc, x, y);
>
> - 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;
> + amdgpu_crtc->cursor_hot_x = hot_x;
> + amdgpu_crtc->cursor_hot_y = hot_y;
> }
>
> dce_v10_0_show_cursor(crtc);
> @@ -2621,7 +2618,6 @@ static int dce_v10_0_crtc_cursor_set2(struct
> drm_crtc *crtc,
> 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);
> @@ -2629,10 +2625,6 @@ 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);
> diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
> b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
> index 297b1f241ec9..8a116b733f25 100644
> --- a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
> @@ -2533,6 +2533,8 @@ 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;
> }
> @@ -2558,7 +2560,6 @@ 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;
> @@ -2599,7 +2600,9 @@ static int dce_v11_0_crtc_cursor_set2(struct
> drm_crtc *crtc,
>
> 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;
>
> @@ -2608,16 +2611,10 @@ static int dce_v11_0_crtc_cursor_set2(struct
> drm_crtc *crtc,
>
> dce_v11_0_cursor_move_locked(crtc, x, y);
>
> - 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;
> + amdgpu_crtc->cursor_hot_x = hot_x;
> + amdgpu_crtc->cursor_hot_y = hot_y;
> }
>
> dce_v11_0_show_cursor(crtc);
> @@ -2641,7 +2638,6 @@ static int dce_v11_0_crtc_cursor_set2(struct
> drm_crtc *crtc,
> 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);
> @@ -2649,10 +2645,6 @@ 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);
> diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
> b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
> index 2e7eb72b47ad..d45731243d0f 100644
> --- a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
> @@ -1859,6 +1859,8 @@ 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;
>
> @@ -1878,6 +1880,8 @@ static int dce_v6_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,
> + ((w - 1) << 16) | (amdgpu_crtc->cursor_height - 1));
>
> return 0;
> }
> @@ -1903,7 +1907,6 @@ 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;
> @@ -1944,7 +1947,9 @@ static int dce_v6_0_crtc_cursor_set2(struct
> drm_crtc *crtc,
>
> 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,16 +1958,10 @@ static int dce_v6_0_crtc_cursor_set2(struct
> drm_crtc *crtc,
>
> dce_v6_0_cursor_move_locked(crtc, x, y);
>
> - 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;
> + amdgpu_crtc->cursor_hot_x = hot_x;
> + amdgpu_crtc->cursor_hot_y = hot_y;
> }
>
> dce_v6_0_show_cursor(crtc);
> @@ -1986,7 +1985,6 @@ static int dce_v6_0_crtc_cursor_set2(struct
> drm_crtc *crtc,
> 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);
> @@ -1994,10 +1992,6 @@ 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(mmCUR_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);
> }
> diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
> b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
> index 26db7cb17ba2..f6d16edcb7d9 100644
> --- a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
> @@ -2364,6 +2364,8 @@ 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;
> }
> @@ -2389,7 +2391,6 @@ 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,7 +2431,9 @@ static int dce_v8_0_crtc_cursor_set2(struct
> drm_crtc *crtc,
>
> 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;
>
> @@ -2439,16 +2442,10 @@ static int dce_v8_0_crtc_cursor_set2(struct
> drm_crtc *crtc,
>
> dce_v8_0_cursor_move_locked(crtc, x, y);
>
> - 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;
> + amdgpu_crtc->cursor_hot_x = hot_x;
> + amdgpu_crtc->cursor_hot_y = hot_y;
> }
>
> dce_v8_0_show_cursor(crtc);
> @@ -2472,7 +2469,6 @@ static int dce_v8_0_crtc_cursor_set2(struct
> drm_crtc *crtc,
> 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);
> @@ -2480,10 +2476,6 @@ 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);
> --
> 2.11.0
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
More information about the amd-gfx
mailing list