diff options
| author | Dave Airlie <airlied@redhat.com> | 2018-11-16 02:14:42 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2018-11-16 02:15:00 +1000 |
| commit | 9826b1138e497dfb48f5cc64a82c219b4d0932da (patch) | |
| tree | 778dffa61d1195fa1cad4f59153db5df5d319539 /drivers/gpu/drm/amd/amdgpu/vega10_ih.c | |
| parent | 7b74026d9c4ee0cfc5b24e51b7f8d5771bdef1f8 (diff) | |
| parent | c1a17777eb45d9f3821f35e9869c0a08cd2e664e (diff) | |
| download | blackbird-op-linux-9826b1138e497dfb48f5cc64a82c219b4d0932da.tar.gz blackbird-op-linux-9826b1138e497dfb48f5cc64a82c219b4d0932da.zip | |
Merge branch 'drm-fixes-4.20' of git://people.freedesktop.org/~agd5f/linux into drm-fixes
Fixes for 4.20:
- Fix for huge page handling that caused a GPUVM fault in some cases
- Fix IH ring setup
- Fix for xgmi aperture setup
- Fix for watermark setup for SMU
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181114171853.2866-1-alexander.deucher@amd.com
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/vega10_ih.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/vega10_ih.c b/drivers/gpu/drm/amd/amdgpu/vega10_ih.c index a99f71797aa3..a0fda6f9252a 100644 --- a/drivers/gpu/drm/amd/amdgpu/vega10_ih.c +++ b/drivers/gpu/drm/amd/amdgpu/vega10_ih.c @@ -129,7 +129,7 @@ static int vega10_ih_irq_init(struct amdgpu_device *adev) else wptr_off = adev->wb.gpu_addr + (adev->irq.ih.wptr_offs * 4); WREG32_SOC15(OSSSYS, 0, mmIH_RB_WPTR_ADDR_LO, lower_32_bits(wptr_off)); - WREG32_SOC15(OSSSYS, 0, mmIH_RB_WPTR_ADDR_HI, upper_32_bits(wptr_off) & 0xFF); + WREG32_SOC15(OSSSYS, 0, mmIH_RB_WPTR_ADDR_HI, upper_32_bits(wptr_off) & 0xFFFF); /* set rptr, wptr to 0 */ WREG32_SOC15(OSSSYS, 0, mmIH_RB_RPTR, 0); |
