Commit 0ca565ab authored by Oak Zeng's avatar Oak Zeng Committed by Alex Deucher
Browse files

drm/amdgpu: Calling address translation functions to simplify codes 



Use amdgpu_gmc_vram_pa and amdgpu_gmc_vram_cpu_pa
to simplify codes. No logic change.

Signed-off-by: default avatarOak Zeng <Oak.Zeng@amd.com>
Signed-off-by: default avatarHarish Kasiviswanathan <Harish.Kasiviswanathan@amd.com>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent dead5e42

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

+1 −3
Original line number Diff line number Diff line
@@ -205,7 +205,6 @@ static int amdgpufb_create(struct drm_fb_helper *helper, 
	struct drm_gem_object *gobj = NULL;

	struct amdgpu_bo *abo = NULL;

	int ret;

	unsigned long tmp;



	memset(&mode_cmd, 0, sizeof(mode_cmd));

	mode_cmd.width = sizes->surface_width;
@@ -246,8 +245,7 @@ static int amdgpufb_create(struct drm_fb_helper *helper, 


	info->fbops = &amdgpufb_ops;



	tmp = amdgpu_bo_gpu_offset(abo) - adev->gmc.vram_start;

	info->fix.smem_start = adev->gmc.aper_base + tmp;

	info->fix.smem_start = amdgpu_gmc_vram_cpu_pa(adev, abo);

	info->fix.smem_len = amdgpu_bo_size(abo);

	info->screen_base = amdgpu_bo_kptr(abo);

	info->screen_size = amdgpu_bo_size(abo);

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

+1 −2
Original line number Diff line number Diff line
@@ -661,8 +661,7 @@ void amdgpu_gmc_init_pdb0(struct amdgpu_device *adev) 
	u64 vram_addr = adev->vm_manager.vram_base_offset -

		adev->gmc.xgmi.physical_node_id * adev->gmc.xgmi.node_segment_size;

	u64 vram_end = vram_addr + vram_size;

	u64 gart_ptb_gpu_pa = amdgpu_bo_gpu_offset(adev->gart.bo) +

		adev->vm_manager.vram_base_offset - adev->gmc.vram_start;

	u64 gart_ptb_gpu_pa = amdgpu_gmc_vram_pa(adev, adev->gart.bo);



	flags |= AMDGPU_PTE_VALID | AMDGPU_PTE_READABLE;

	flags |= AMDGPU_PTE_WRITEABLE;

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

+1 −2
Original line number Diff line number Diff line
@@ -120,8 +120,7 @@ static void gfxhub_v1_0_init_system_aperture_regs(struct amdgpu_device *adev) 
				max(adev->gmc.fb_end, adev->gmc.agp_end) >> 18);



		/* Set default page address. */

		value = adev->vram_scratch.gpu_addr - adev->gmc.vram_start +

			adev->vm_manager.vram_base_offset;

		value = amdgpu_gmc_vram_mc2pa(adev, adev->vram_scratch.gpu_addr);

		WREG32_SOC15(GC, 0, mmMC_VM_SYSTEM_APERTURE_DEFAULT_ADDR_LSB,

			     (u32)(value >> 12));

		WREG32_SOC15(GC, 0, mmMC_VM_SYSTEM_APERTURE_DEFAULT_ADDR_MSB,

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

+1 −2
Original line number Diff line number Diff line
@@ -165,8 +165,7 @@ static void gfxhub_v2_0_init_system_aperture_regs(struct amdgpu_device *adev) 
			     max(adev->gmc.fb_end, adev->gmc.agp_end) >> 18);



		/* Set default page address. */

		value = adev->vram_scratch.gpu_addr - adev->gmc.vram_start

			+ adev->vm_manager.vram_base_offset;

		value = amdgpu_gmc_vram_mc2pa(adev, adev->vram_scratch.gpu_addr);

		WREG32_SOC15(GC, 0, mmGCMC_VM_SYSTEM_APERTURE_DEFAULT_ADDR_LSB,

			     (u32)(value >> 12));

		WREG32_SOC15(GC, 0, mmGCMC_VM_SYSTEM_APERTURE_DEFAULT_ADDR_MSB,

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

+1 −2
Original line number Diff line number Diff line
@@ -164,8 +164,7 @@ static void gfxhub_v2_1_init_system_aperture_regs(struct amdgpu_device *adev) 
		     max(adev->gmc.fb_end, adev->gmc.agp_end) >> 18);



	/* Set default page address. */

	value = adev->vram_scratch.gpu_addr - adev->gmc.vram_start

		+ adev->vm_manager.vram_base_offset;

	value = amdgpu_gmc_vram_mc2pa(adev, adev->vram_scratch.gpu_addr);

	WREG32_SOC15(GC, 0, mmGCMC_VM_SYSTEM_APERTURE_DEFAULT_ADDR_LSB,

		     (u32)(value >> 12));

	WREG32_SOC15(GC, 0, mmGCMC_VM_SYSTEM_APERTURE_DEFAULT_ADDR_MSB,