From: Leo Liu Date: Tue, 28 Jan 2020 16:50:00 +0000 (-0500) Subject: drm/amdgpu: fix the PSP front door loading VCN firmware X-Git-Tag: v5.9-rc1~134^2~19^2~303 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=07d8e891ffcd71cbea4a6436eac975aa572f3de9;p=thirdparty%2Fkernel%2Flinux.git drm/amdgpu: fix the PSP front door loading VCN firmware for the second instance with correct index Signed-off-by: Leo Liu Reviewed-by: Alex Deucher Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c index 371c70a1e6111..dddae2b8f0f93 100644 --- a/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c @@ -345,9 +345,9 @@ static void vcn_v3_0_mc_resume(struct amdgpu_device *adev, int inst) /* cache window 0: fw */ if (adev->firmware.load_type == AMDGPU_FW_LOAD_PSP) { WREG32_SOC15(VCN, inst, mmUVD_LMI_VCPU_CACHE_64BIT_BAR_LOW, - (adev->firmware.ucode[AMDGPU_UCODE_ID_VCN].tmr_mc_addr_lo)); + (adev->firmware.ucode[AMDGPU_UCODE_ID_VCN + inst].tmr_mc_addr_lo)); WREG32_SOC15(VCN, inst, mmUVD_LMI_VCPU_CACHE_64BIT_BAR_HIGH, - (adev->firmware.ucode[AMDGPU_UCODE_ID_VCN].tmr_mc_addr_hi)); + (adev->firmware.ucode[AMDGPU_UCODE_ID_VCN + inst].tmr_mc_addr_hi)); WREG32_SOC15(VCN, inst, mmUVD_VCPU_CACHE_OFFSET0, 0); offset = 0; } else {