Commit 0c61a973 authored by Timur Kristóf's avatar Timur Kristóf Committed by Alex Deucher
Browse files

drm/amdgpu/vce3: Fix VCE 3 firmware size and offsets 



The VCPU BO contains the actual FW at an offset, but
it was not calculated into the VCPU BO size.
Subtract this from the FW size to make sure there is
no out of bounds access.

This may fix VM faults when using VCE 3.

Cc: John Olender <john.olender@gmail.com>
Fixes: e9822622 ("drm/amdgpu: recalculate VCE firmware BO size")
Signed-off-by: default avatarTimur Kristóf <timur.kristof@gmail.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
(cherry picked from commit 15c369257bd85f47a514744f960c5a51c867716f)
parent 5dc3d16c

drivers/gpu/drm/amd/amdgpu/vce_v3_0.c

+1 −1
Original line number Diff line number Diff line
@@ -574,7 +574,7 @@ static void vce_v3_0_mc_resume(struct amdgpu_device *adev, int idx) 
	} else

		WREG32(mmVCE_LMI_VCPU_CACHE_40BIT_BAR, (adev->vce.gpu_addr >> 8));

	offset = AMDGPU_VCE_FIRMWARE_OFFSET;

	size = VCE_V3_0_FW_SIZE;

	size = VCE_V3_0_FW_SIZE - AMDGPU_VCE_FIRMWARE_OFFSET;

	WREG32(mmVCE_VCPU_CACHE_OFFSET0, offset & 0x7fffffff);

	WREG32(mmVCE_VCPU_CACHE_SIZE0, size);