projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1bd8142
)
Revert "drm/amdgpu/gfx10: enlarge CP_MEC_DOORBELL_RANGE_UPPER to cover full doorbell."
author
Yifan Zhang
<yifan1.zhang@amd.com>
Sat, 19 Jun 2021 03:39:43 +0000
(11:39 +0800)
committer
Sasha Levin
<sashal@kernel.org>
Wed, 30 Jun 2021 12:47:15 +0000
(08:47 -0400)
commit
baacf52a473b24e10322b67757ddb92ab8d86717
upstream.
This reverts commit
1c0b0efd148d5b24c4932ddb3fa03c8edd6097b3
.
Reason for revert: Side effect of enlarging CP_MEC_DOORBELL_RANGE may
cause some APUs fail to enter gfxoff in certain user cases.
Signed-off-by: Yifan Zhang <yifan1.zhang@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
index
3c92dac
..
fc8da5f
100644
(file)
--- a/
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
+++ b/
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
@@
-6590,12
+6590,8
@@
static int gfx_v10_0_kiq_init_register(struct amdgpu_ring *ring)
if (ring->use_doorbell) {
WREG32_SOC15(GC, 0, mmCP_MEC_DOORBELL_RANGE_LOWER,
(adev->doorbell_index.kiq * 2) << 2);
- /* If GC has entered CGPG, ringing doorbell > first page doesn't
- * wakeup GC. Enlarge CP_MEC_DOORBELL_RANGE_UPPER to workaround
- * this issue.
- */
WREG32_SOC15(GC, 0, mmCP_MEC_DOORBELL_RANGE_UPPER,
- (adev->doorbell
.size - 4)
);
+ (adev->doorbell
_index.userqueue_end * 2) << 2
);
}
WREG32_SOC15(GC, 0, mmCP_HQD_PQ_DOORBELL_CONTROL,