diff options
| author | Dave Airlie <airlied@redhat.com> | 2019-11-26 08:40:23 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-11-26 08:40:23 +1000 |
| commit | acc61b8929365e63a3e8c8c8913177795aa45594 (patch) | |
| tree | dca764adfabd0e77f354f0d9fec453939d50616d /drivers/gpu/drm/amd/amdgpu/si_ih.c | |
| parent | e639ea0f9155d65d5be2b800955961c7fe49f1a8 (diff) | |
| parent | f920d1bb9c4e77efb08c41d70b6d442f46fd8902 (diff) | |
| download | kernel_replicant_linux-acc61b8929365e63a3e8c8c8913177795aa45594.tar.gz kernel_replicant_linux-acc61b8929365e63a3e8c8c8913177795aa45594.tar.bz2 kernel_replicant_linux-acc61b8929365e63a3e8c8c8913177795aa45594.zip | |
Merge tag 'drm-next-5.5-2019-11-22' of git://people.freedesktop.org/~agd5f/linux into drm-next
drm-next-5.5-2019-11-22:
amdgpu:
- Fix bad DMA on some PPC platforms
- MMHUB fix for powergating
- BACO fix for Navi
- Misc raven fixes
- Enable vbios fetch directly from rom on navi
- debugfs fix for DC
- SR-IOV fixes for arcturus
- Misc power fixes
radeon:
- Fix bad DMA on some PPC platforms
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191122203025.3787-1-alexander.deucher@amd.com
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/si_ih.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/si_ih.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/si_ih.c b/drivers/gpu/drm/amd/amdgpu/si_ih.c index 57bb5f9e08b2..88ae27a5a03d 100644 --- a/drivers/gpu/drm/amd/amdgpu/si_ih.c +++ b/drivers/gpu/drm/amd/amdgpu/si_ih.c @@ -64,7 +64,8 @@ static int si_ih_irq_init(struct amdgpu_device *adev) u32 interrupt_cntl, ih_cntl, ih_rb_cntl; si_ih_disable_interrupts(adev); - WREG32(INTERRUPT_CNTL2, adev->irq.ih.gpu_addr >> 8); + /* set dummy read address to dummy page address */ + WREG32(INTERRUPT_CNTL2, adev->dummy_page_addr >> 8); interrupt_cntl = RREG32(INTERRUPT_CNTL); interrupt_cntl &= ~IH_DUMMY_RD_OVERRIDE; interrupt_cntl &= ~IH_REQ_NONSNOOP_EN; |