diff options
| author | Dave Airlie <[email protected]> | 2020-05-28 06:10:16 +0000 |
|---|---|---|
| committer | Dave Airlie <[email protected]> | 2020-05-28 06:10:17 +0000 |
| commit | 9ca1f474cea0edc14a1d7ec933e5472c0ff115d3 (patch) | |
| tree | 736083d96ff42b313c46d24d5896f88e48b354a9 /drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | |
| parent | Merge tag 'drm-misc-next-fixes-2020-05-27' of git://anongit.freedesktop.org/d... (diff) | |
| parent | drm/amd/display: Fix potential integer wraparound resulting in a hang (diff) | |
| download | kernel-9ca1f474cea0edc14a1d7ec933e5472c0ff115d3.tar.gz kernel-9ca1f474cea0edc14a1d7ec933e5472c0ff115d3.zip | |
Merge tag 'amd-drm-next-5.8-2020-05-27' of git://people.freedesktop.org/~agd5f/linux into drm-next
amd-drm-next-5.8-2020-05-27:
amdgpu:
- SRIOV fixes
- RAS fixes
- VCN 2.5 DPG (Dynamic PowerGating) fixes
- FP16 updates for display
- CTF cleanups
- Display fixes
- Fix pcie bw sysfs handling
- Enable resizeable BAR support for gmc 10.x
- GFXOFF fixes for Raven
- PM sysfs handling fixes
amdkfd:
- Fix a race condition
- Warning fixes
Signed-off-by: Dave Airlie <[email protected]>
From: Alex Deucher <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c index 2de99b441601..2badbc0355f2 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c @@ -70,9 +70,9 @@ int amdgpu_vcn_sw_init(struct amdgpu_device *adev) switch (adev->asic_type) { case CHIP_RAVEN: - if (adev->rev_id >= 8) + if (adev->apu_flags & AMD_APU_IS_RAVEN2) fw_name = FIRMWARE_RAVEN2; - else if (adev->pdev->device == 0x15d8) + else if (adev->apu_flags & AMD_APU_IS_PICASSO) fw_name = FIRMWARE_PICASSO; else fw_name = FIRMWARE_RAVEN; |