diff options
author | Dave Airlie <airlied@redhat.com> | 2019-11-26 01:40:23 +0300 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2019-11-26 01:40:23 +0300 |
commit | acc61b8929365e63a3e8c8c8913177795aa45594 (patch) | |
tree | dca764adfabd0e77f354f0d9fec453939d50616d /drivers/gpu/drm/amd/amdgpu/soc15.h | |
parent | e639ea0f9155d65d5be2b800955961c7fe49f1a8 (diff) | |
parent | f920d1bb9c4e77efb08c41d70b6d442f46fd8902 (diff) | |
download | linux-acc61b8929365e63a3e8c8c8913177795aa45594.tar.xz |
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/soc15.h')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/soc15.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.h b/drivers/gpu/drm/amd/amdgpu/soc15.h index 9af6c6ffbfa2..57af489a5de3 100644 --- a/drivers/gpu/drm/amd/amdgpu/soc15.h +++ b/drivers/gpu/drm/amd/amdgpu/soc15.h @@ -28,8 +28,8 @@ #include "nbio_v7_0.h" #include "nbio_v7_4.h" -#define SOC15_FLUSH_GPU_TLB_NUM_WREG 4 -#define SOC15_FLUSH_GPU_TLB_NUM_REG_WAIT 1 +#define SOC15_FLUSH_GPU_TLB_NUM_WREG 6 +#define SOC15_FLUSH_GPU_TLB_NUM_REG_WAIT 3 extern const struct amd_ip_funcs soc15_common_ip_funcs; |