diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-09-30 16:25:52 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-09-30 16:25:52 -0700 |
commit | ffb4d94b4314655cea60ab7962756e6bab72fc7e (patch) | |
tree | 606711736d269010d1d9d036fd1f3b01e0b110af /drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | |
parent | e5fa173f9a472dec2f8d5fb63d5c8824c49c6e51 (diff) | |
parent | 414208e48963fdb136240d7f59c15e627832d288 (diff) |
Merge tag 'drm-fixes-2022-10-01' of git://anongit.freedesktop.org/drm/drm
Pull drm fixes from Daniel Vetter:
"Some last minute amd fixes:
- VCN 4.x and GC 11.x fixes, mostly around fw"
* tag 'drm-fixes-2022-10-01' of git://anongit.freedesktop.org/drm/drm:
drm/amdgpu/gfx11: switch to amdgpu_gfx_rlc_init_microcode
drm/amdgpu: add helper to init rlc firmware
drm/amdgpu: add helper to init rlc fw in header v2_4
drm/amdgpu: add helper to init rlc fw in header v2_3
drm/amdgpu: add helper to init rlc fw in header v2_2
drm/amdgpu: add helper to init rlc fw in header v2_1
drm/amdgpu: add helper to init rlc fw in header v2_0
drm/amdgpu: save rlcv/rlcp ucode version in amdgpu_gfx
drm/amdgpu: Enable sram on vcn_4_0_2
drm/amdgpu: Enable VCN DPG for GC11_0_1
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c index f36e4f08db6d..0b52af415b28 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c @@ -191,7 +191,7 @@ int amdgpu_vcn_sw_init(struct amdgpu_device *adev) fw_name = FIRMWARE_VCN4_0_2; if ((adev->firmware.load_type == AMDGPU_FW_LOAD_PSP) && (adev->pg_flags & AMD_PG_SUPPORT_VCN_DPG)) - adev->vcn.indirect_sram = false; + adev->vcn.indirect_sram = true; break; case IP_VERSION(4, 0, 4): fw_name = FIRMWARE_VCN4_0_4; |