Commit 042658d1 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu: clean up vbios fetching code 



After splitting the logic between APU and dGPU,
clean up some of the APU and dGPU specific logic
that no longer applied.

Reviewed-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent e7d4e143

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

+2 −14
Original line number Diff line number Diff line
@@ -284,10 +284,6 @@ static bool amdgpu_atrm_get_bios(struct amdgpu_device *adev) 
	acpi_status status;

	bool found = false;



	/* ATRM is for the discrete card only */

	if (adev->flags & AMD_IS_APU)

		return false;



	/* ATRM is for on-platform devices only */

	if (dev_is_removable(&adev->pdev->dev))

		return false;
@@ -343,9 +339,6 @@ static inline bool amdgpu_atrm_get_bios(struct amdgpu_device *adev) 


static bool amdgpu_read_disabled_bios(struct amdgpu_device *adev)

{

	if (adev->flags & AMD_IS_APU)

		return igp_read_bios_from_vram(adev);

	else

	return (!adev->asic_funcs || !adev->asic_funcs->read_disabled_bios) ?

		false : amdgpu_asic_read_disabled_bios(adev);

}
@@ -455,11 +448,6 @@ static bool amdgpu_get_bios_dgpu(struct amdgpu_device *adev) 
		goto success;

	}



	if (igp_read_bios_from_vram(adev)) {

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

		goto success;

	}



	if (amdgpu_read_platform_bios(adev)) {

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

		goto success;