diff options
| author | Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com> | 2019-08-06 18:27:26 +0200 |
|---|---|---|
| committer | Sasha Levin <sashal@kernel.org> | 2019-08-25 10:10:21 -0400 |
| commit | 5938e7b577901e6dace373951e9b2da0e3ba44c5 (patch) | |
| tree | 4fdd7a53f6e5e3cd5bbc5ac902f80f197fc057b6 | |
| parent | 4b837b792353f721493ef6468d1b88805d90c717 (diff) | |
| download | linux-stable-5938e7b577901e6dace373951e9b2da0e3ba44c5.tar.gz linux-stable-5938e7b577901e6dace373951e9b2da0e3ba44c5.tar.bz2 linux-stable-5938e7b577901e6dace373951e9b2da0e3ba44c5.zip | |
drm/amdgpu: fix gfx9 soft recovery
commit 17b6d2d528542bc60ad400add35728b2259b3cc1 upstream.
The SOC15_REG_OFFSET() macro wasn't used, making the soft recovery fail.
v2: use WREG32_SOC15 instead of WREG32 + SOC15_REG_OFFSET
Signed-off-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Christian König <christian.koenig@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>
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c index 2f18c64d531f..2f7f0a2e4a6c 100644 --- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c @@ -4553,7 +4553,7 @@ static void gfx_v9_0_ring_soft_recovery(struct amdgpu_ring *ring, unsigned vmid) value = REG_SET_FIELD(value, SQ_CMD, MODE, 0x01); value = REG_SET_FIELD(value, SQ_CMD, CHECK_VMID, 1); value = REG_SET_FIELD(value, SQ_CMD, VM_ID, vmid); - WREG32(mmSQ_CMD, value); + WREG32_SOC15(GC, 0, mmSQ_CMD, value); } static void gfx_v9_0_set_gfx_eop_interrupt_state(struct amdgpu_device *adev, |