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

drm/amdgpu: Reorder to read EFI exported ROM first 



On EFI BIOSes, PCI ROM may be exported through EFI_PCI_IO_PROTOCOL and
expansion ROM BARs may not be enabled. Choose to read from EFI exported
ROM data before reading PCI Expansion ROM BAR.

Signed-off-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Reviewed-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 e69c2dd7

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

+5 −5
Original line number Diff line number Diff line
@@ -431,6 +431,11 @@ bool amdgpu_get_bios(struct amdgpu_device *adev) 
		goto success;

	}



	if (amdgpu_read_platform_bios(adev)) {

		dev_info(adev->dev, "Fetched VBIOS from platform\n");

		goto success;

	}



	if (amdgpu_read_bios(adev)) {

		dev_info(adev->dev, "Fetched VBIOS from ROM BAR\n");

		goto success;
@@ -446,11 +451,6 @@ bool amdgpu_get_bios(struct amdgpu_device *adev) 
		goto success;

	}



	if (amdgpu_read_platform_bios(adev)) {

		dev_info(adev->dev, "Fetched VBIOS from platform\n");

		goto success;

	}



	dev_err(adev->dev, "Unable to locate a BIOS ROM\n");

	return false;