Commit 2543e28a authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu: rename amdgpu_*_location functions 



add device to the name for consistency.

Acked-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 22cb0164

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+4 −2
Original line number Diff line number Diff line
@@ -1901,8 +1901,10 @@ void amdgpu_cs_report_moved_bytes(struct amdgpu_device *adev, u64 num_bytes, 
				  u64 num_vis_bytes);

void amdgpu_ttm_placement_from_domain(struct amdgpu_bo *abo, u32 domain);

bool amdgpu_ttm_bo_is_amdgpu_bo(struct ttm_buffer_object *bo);

void amdgpu_vram_location(struct amdgpu_device *adev, struct amdgpu_mc *mc, u64 base);

void amdgpu_gart_location(struct amdgpu_device *adev, struct amdgpu_mc *mc);

void amdgpu_device_vram_location(struct amdgpu_device *adev,

				 struct amdgpu_mc *mc, u64 base);

void amdgpu_device_gart_location(struct amdgpu_device *adev,

				 struct amdgpu_mc *mc);

int amdgpu_device_resize_fb_bar(struct amdgpu_device *adev);

void amdgpu_ttm_set_active_vram_size(struct amdgpu_device *adev, u64 size);

int amdgpu_ttm_init(struct amdgpu_device *adev);

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

+6 −4
Original line number Diff line number Diff line
@@ -535,7 +535,7 @@ void amdgpu_device_wb_free(struct amdgpu_device *adev, u32 wb) 
}



/**

 * amdgpu_vram_location - try to find VRAM location

 * amdgpu_device_vram_location - try to find VRAM location

 * @adev: amdgpu device structure holding all necessary informations

 * @mc: memory controller structure holding memory informations

 * @base: base address at which to put VRAM
@@ -543,7 +543,8 @@ void amdgpu_device_wb_free(struct amdgpu_device *adev, u32 wb) 
 * Function will try to place VRAM at base address provided

 * as parameter.

 */

void amdgpu_vram_location(struct amdgpu_device *adev, struct amdgpu_mc *mc, u64 base)

void amdgpu_device_vram_location(struct amdgpu_device *adev,

				 struct amdgpu_mc *mc, u64 base)

{

	uint64_t limit = (uint64_t)amdgpu_vram_limit << 20;
@@ -557,7 +558,7 @@ void amdgpu_vram_location(struct amdgpu_device *adev, struct amdgpu_mc *mc, u64 
}



/**

 * amdgpu_gart_location - try to find GTT location

 * amdgpu_device_gart_location - try to find GTT location

 * @adev: amdgpu device structure holding all necessary informations

 * @mc: memory controller structure holding memory informations

 *
@@ -568,7 +569,8 @@ void amdgpu_vram_location(struct amdgpu_device *adev, struct amdgpu_mc *mc, u64 
 *

 * FIXME: when reducing GTT size align new size on power of 2.

 */

void amdgpu_gart_location(struct amdgpu_device *adev, struct amdgpu_mc *mc)

void amdgpu_device_gart_location(struct amdgpu_device *adev,

				 struct amdgpu_mc *mc)

{

	u64 size_af, size_bf;

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

+2 −2
Original line number Diff line number Diff line
@@ -222,8 +222,8 @@ static void gmc_v6_0_vram_gtt_location(struct amdgpu_device *adev, 
	u64 base = RREG32(mmMC_VM_FB_LOCATION) & 0xFFFF;

	base <<= 24;



	amdgpu_vram_location(adev, &adev->mc, base);

	amdgpu_gart_location(adev, mc);

	amdgpu_device_vram_location(adev, &adev->mc, base);

	amdgpu_device_gart_location(adev, mc);

}



static void gmc_v6_0_mc_program(struct amdgpu_device *adev)

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

+2 −2
Original line number Diff line number Diff line
@@ -240,8 +240,8 @@ static void gmc_v7_0_vram_gtt_location(struct amdgpu_device *adev, 
	u64 base = RREG32(mmMC_VM_FB_LOCATION) & 0xFFFF;

	base <<= 24;



	amdgpu_vram_location(adev, &adev->mc, base);

	amdgpu_gart_location(adev, mc);

	amdgpu_device_vram_location(adev, &adev->mc, base);

	amdgpu_device_gart_location(adev, mc);

}



/**

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

+2 −2
Original line number Diff line number Diff line
@@ -405,8 +405,8 @@ static void gmc_v8_0_vram_gtt_location(struct amdgpu_device *adev, 
		base = RREG32(mmMC_VM_FB_LOCATION) & 0xFFFF;

	base <<= 24;



	amdgpu_vram_location(adev, &adev->mc, base);

	amdgpu_gart_location(adev, mc);

	amdgpu_device_vram_location(adev, &adev->mc, base);

	amdgpu_device_gart_location(adev, mc);

}



/**

CRA Git | Maintained and supported by SUSTech CRA and CCSE