Commit f6dcaf0c authored by Hawking Zhang's avatar Hawking Zhang Committed by Alex Deucher
Browse files

drm/amdgpu: rename discovery_read_binary helper 



add _from_vram in the funciton name to diffrentiate
the one used to read from file

Signed-off-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 43a80bd5

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

+2 −2
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ static int hw_id_map[MAX_HWIP] = { 
	[DCI_HWIP]	= DCI_HWID,

};



static int amdgpu_discovery_read_binary(struct amdgpu_device *adev, uint8_t *binary)

static int amdgpu_discovery_read_binary_from_vram(struct amdgpu_device *adev, uint8_t *binary)

{

	uint64_t vram_size = (uint64_t)RREG32(mmRCC_CONFIG_MEMSIZE) << 20;

	uint64_t pos = vram_size - DISCOVERY_TMR_OFFSET;
@@ -262,7 +262,7 @@ static int amdgpu_discovery_init(struct amdgpu_device *adev) 
		release_firmware(fw);

	} else {

get_from_vram:

		r = amdgpu_discovery_read_binary(adev, adev->mman.discovery_bin);

		r = amdgpu_discovery_read_binary_from_vram(adev, adev->mman.discovery_bin);

		if (r) {

			DRM_ERROR("failed to read ip discovery binary\n");

			goto out;