diff options
| author |   Dave Airlie <airlied@redhat.com> | 2019-08-15 13:29:18 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-08-15 13:29:18 +1000 |
| commit | 2f62c5d6ed0abae8e70bd83f4d41b9d63acde45a (patch) | |
| tree | 6101c03f38f09707f4d6a991cb7f2cba1b152109 /drivers/gpu/drm/amd/amdgpu | |
| parent | drm/nouveau: Only recalculate PBN/VCPI on mode/connector changes (diff) | |
| parent | drm/scheduler: use job count instead of peek (diff) | |
| download | wireguard-linux-2f62c5d6ed0abae8e70bd83f4d41b9d63acde45a.tar.xz wireguard-linux-2f62c5d6ed0abae8e70bd83f4d41b9d63acde45a.zip | |
Merge tag 'drm-fixes-5.3-2019-08-14' of git://people.freedesktop.org/~agd5f/linux into drm-fixes
drm-fixes-5.3-2019-08-14:
amdgpu:
- Use kvalloc for dc_state to avoid allocation
failures in some cases.
- Fix gfx9 soft recovery
scheduler:
- Fix a race condition when destroying entities
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190815024919.3434-1-alexander.deucher@amd.com
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu')
| -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 1cf639a51178..04b8ac4432c7 100644 --- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c @@ -4869,7 +4869,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, |