Commit 66353ec4 authored by Zhigang Luo's avatar Zhigang Luo Committed by Alex Deucher
Browse files

drm/amdgpu: remove SRIOV VF FB location programming 



For SRIOV VF, FB location is programmed by host driver, no need to
program it in guest driver.

v2: squash in unused variable removal

Signed-off-by: default avatarZhigang Luo <Zhigang.Luo@amd.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent c7ddc0a8

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

+0 −16
Original line number Diff line number Diff line
@@ -402,22 +402,6 @@ static void gfxhub_v1_2_xcc_program_invalidation(struct amdgpu_device *adev, 
static int gfxhub_v1_2_xcc_gart_enable(struct amdgpu_device *adev,

				       uint32_t xcc_mask)

{

	int i;



	/*

	 * MC_VM_FB_LOCATION_BASE/TOP is NULL for VF, because they are

	 * VF copy registers so vbios post doesn't program them, for

	 * SRIOV driver need to program them

	 */

	if (amdgpu_sriov_vf(adev)) {

		for_each_inst(i, xcc_mask) {

			WREG32_SOC15_RLC(GC, GET_INST(GC, i), regMC_VM_FB_LOCATION_BASE,

				     adev->gmc.vram_start >> 24);

			WREG32_SOC15_RLC(GC, GET_INST(GC, i), regMC_VM_FB_LOCATION_TOP,

				     adev->gmc.vram_end >> 24);

		}

	}



	/* GART Enable. */

	gfxhub_v1_2_xcc_init_gart_aperture_regs(adev, xcc_mask);

	gfxhub_v1_2_xcc_init_system_aperture_regs(adev, xcc_mask);

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

+0 −12
Original line number Diff line number Diff line
@@ -413,18 +413,6 @@ static void mmhub_v1_8_program_invalidation(struct amdgpu_device *adev) 


static int mmhub_v1_8_gart_enable(struct amdgpu_device *adev)

{

	if (amdgpu_sriov_vf(adev)) {

		/*

		 * MC_VM_FB_LOCATION_BASE/TOP is NULL for VF, becuase they are

		 * VF copy registers so vbios post doesn't program them, for

		 * SRIOV driver need to program them

		 */

		WREG32_SOC15(MMHUB, 0, regMC_VM_FB_LOCATION_BASE,

			     adev->gmc.vram_start >> 24);

		WREG32_SOC15(MMHUB, 0, regMC_VM_FB_LOCATION_TOP,

			     adev->gmc.vram_end >> 24);

	}



	/* GART Enable. */

	mmhub_v1_8_init_gart_aperture_regs(adev);

	mmhub_v1_8_init_system_aperture_regs(adev);