diff options
author | James Zhu <James.Zhu@amd.com> | 2019-07-23 16:45:19 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2019-07-30 23:19:28 -0500 |
commit | 6913848087e29103f7062376d0ebf7efcaf1a26b (patch) | |
tree | a21dd8091245e75193e02e60133e10bb684a4dbe /drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | |
parent | 668a9469f11470868ad4577d75894f8812919314 (diff) | |
download | linux-6913848087e29103f7062376d0ebf7efcaf1a26b.tar.gz linux-6913848087e29103f7062376d0ebf7efcaf1a26b.tar.bz2 linux-6913848087e29103f7062376d0ebf7efcaf1a26b.zip |
drm/amdgpu: use VCN firmware offset for cache window
Since we are using the signed FW now, and also using PSP firmware loading,
but it's still potential to break driver when loading FW directly
instead of PSP, so we should add offset.
Signed-off-by: James Zhu <James.Zhu@amd.com>
Reviewed-by: Leo Liu <leo.liu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c b/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c index ef8bb67844be..0c84dbc6a62d 100644 --- a/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c @@ -396,11 +396,8 @@ static void vcn_v2_5_mc_resume(struct amdgpu_device *adev) WREG32_SOC15(UVD, i, mmUVD_LMI_VCPU_CACHE_64BIT_BAR_HIGH, upper_32_bits(adev->vcn.inst[i].gpu_addr)); offset = size; - /* No signed header for now from firmware WREG32_SOC15(UVD, i, mmUVD_VCPU_CACHE_OFFSET0, AMDGPU_UVD_FIRMWARE_OFFSET >> 3); - */ - WREG32_SOC15(UVD, i, mmUVD_VCPU_CACHE_OFFSET0, 0); } WREG32_SOC15(UVD, i, mmUVD_VCPU_CACHE_SIZE0, size); |