diff options
author | Dave Airlie <airlied@redhat.com> | 2022-12-09 05:08:32 +0300 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2022-12-09 05:08:33 +0300 |
commit | 66efff515a6500d4b4976fbab3bee8b92a1137fb (patch) | |
tree | 64368466dccca696a57300443e12d1f805f16c59 /drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | |
parent | 9e5737bd0457955690d871b3f4fc66dea40ea141 (diff) | |
parent | 347fafe0eb46df941965c355c77ce480e4d49f1f (diff) | |
download | linux-66efff515a6500d4b4976fbab3bee8b92a1137fb.tar.xz |
Merge tag 'amd-drm-next-6.2-2022-12-07' of https://gitlab.freedesktop.org/agd5f/linux into drm-next
amd-drm-next-6.2-2022-12-07:
amdgpu:
- DSC fixes for DCN 2.1
- HDMI PCON fixes
- PSR fixes
- DC DML fixes
- Properly throttle on BO allocation
- GFX 11.0.4 fixes
- MMHUB fix
- Make some functions static
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221207232439.5908-1-alexander.deucher@amd.com
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c index e970e3760cec..02a4c93673ce 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c @@ -549,6 +549,7 @@ void amdgpu_gmc_tmz_set(struct amdgpu_device *adev) /* YELLOW_CARP*/ case IP_VERSION(10, 3, 3): case IP_VERSION(11, 0, 1): + case IP_VERSION(11, 0, 4): /* Don't enable it by default yet. */ if (amdgpu_tmz < 1) { |