From: Lang Yu Date: Sat, 7 Oct 2023 02:10:50 +0000 (+0800) Subject: drm/amdgpu/vpe: align with mcbp changes X-Git-Tag: microblaze-v6.8~11^2~16^2~72 X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=84aa39ab1e6528278c8ffc2c1ff9de1e2c39ee8e;p=linux-2.6-microblaze.git drm/amdgpu/vpe: align with mcbp changes MCBP is decided by adev->gfx.mcbp now. This is missed in rebase. Signed-off-by: Lang Yu Reviewed-by: Yifan Zhang Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c index 23966221dbec..bb74478098bb 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c @@ -253,7 +253,7 @@ static uint64_t vpe_get_csa_mc_addr(struct amdgpu_ring *ring, uint32_t vmid) uint32_t index = 0; uint64_t csa_mc_addr; - if (amdgpu_sriov_vf(adev) || vmid == 0 || !amdgpu_mcbp) + if (amdgpu_sriov_vf(adev) || vmid == 0 || !adev->gfx.mcbp) return 0; csa_mc_addr = amdgpu_csa_vaddr(adev) + AMDGPU_CSA_VPE_OFFSET +