Skip to content

Commit 042658d

Browse files
committed
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: Lijo Lazar <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent e7d4e14 commit 042658d

File tree

1 file changed

+2
-14
lines changed

1 file changed

+2
-14
lines changed

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

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -284,10 +284,6 @@ static bool amdgpu_atrm_get_bios(struct amdgpu_device *adev)
284284
acpi_status status;
285285
bool found = false;
286286

287-
/* ATRM is for the discrete card only */
288-
if (adev->flags & AMD_IS_APU)
289-
return false;
290-
291287
/* ATRM is for on-platform devices only */
292288
if (dev_is_removable(&adev->pdev->dev))
293289
return false;
@@ -343,11 +339,8 @@ static inline bool amdgpu_atrm_get_bios(struct amdgpu_device *adev)
343339

344340
static bool amdgpu_read_disabled_bios(struct amdgpu_device *adev)
345341
{
346-
if (adev->flags & AMD_IS_APU)
347-
return igp_read_bios_from_vram(adev);
348-
else
349-
return (!adev->asic_funcs || !adev->asic_funcs->read_disabled_bios) ?
350-
false : amdgpu_asic_read_disabled_bios(adev);
342+
return (!adev->asic_funcs || !adev->asic_funcs->read_disabled_bios) ?
343+
false : amdgpu_asic_read_disabled_bios(adev);
351344
}
352345

353346
#ifdef CONFIG_ACPI
@@ -455,11 +448,6 @@ static bool amdgpu_get_bios_dgpu(struct amdgpu_device *adev)
455448
goto success;
456449
}
457450

458-
if (igp_read_bios_from_vram(adev)) {
459-
dev_info(adev->dev, "Fetched VBIOS from VRAM BAR\n");
460-
goto success;
461-
}
462-
463451
if (amdgpu_read_platform_bios(adev)) {
464452
dev_info(adev->dev, "Fetched VBIOS from platform\n");
465453
goto success;

0 commit comments

Comments
 (0)