mirror of
				https://github.com/torvalds/linux.git
				synced 2025-11-04 10:40:15 +02:00 
			
		
		
		
	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 <lijo.lazar@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
		
							parent
							
								
									e7d4e14385
								
							
						
					
					
						commit
						042658d17a
					
				
					 1 changed files with 2 additions and 14 deletions
				
			
		| 
						 | 
				
			
			@ -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,11 +339,8 @@ 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);
 | 
			
		||||
	return (!adev->asic_funcs || !adev->asic_funcs->read_disabled_bios) ?
 | 
			
		||||
		false : amdgpu_asic_read_disabled_bios(adev);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#ifdef CONFIG_ACPI
 | 
			
		||||
| 
						 | 
				
			
			@ -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;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in a new issue