Commit ac772a3c authored by Lijo Lazar's avatar Lijo Lazar Committed by Alex Deucher
Browse files

drm/amdgpu: Add fallback path for discovery info 



If SOC doesn't expose dedicated vram, discovery region may be
available through system memory. Rename the existing interface to
generic read_binary_from_mem and add a fallback path to read from system
memory.

Signed-off-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 368bb1bc

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

+16 −5
Original line number Diff line number Diff line
@@ -226,13 +226,21 @@ static int amdgpu_discovery_read_binary_from_sysmem(struct amdgpu_device *adev, 
	return -ENOENT;

}



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

static int amdgpu_discovery_read_binary_from_mem(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;

	int ret = 0;



	if (vram_size) {

		uint64_t pos = vram_size - DISCOVERY_TMR_OFFSET;

		amdgpu_device_vram_access(adev, pos, (uint32_t *)binary,

					  adev->mman.discovery_tmr_size, false);

	} else {

		ret = amdgpu_discovery_read_binary_from_sysmem(adev, binary);

	}



	return ret;

}



static int amdgpu_discovery_read_binary_from_file(struct amdgpu_device *adev, uint8_t *binary)
@@ -338,7 +346,10 @@ static int amdgpu_discovery_init(struct amdgpu_device *adev) 
		}



	} else {

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

		r = amdgpu_discovery_read_binary_from_mem(

			adev, adev->mman.discovery_bin);

		if (r)

			goto out;

	}



	/* check the ip discovery binary signature */