Commit 1a408c71 authored by Evan Quan's avatar Evan Quan Committed by Alex Deucher
Browse files

drm/amdgpu: wrap those atombios APIs used by SI under CONFIG_DRM_AMDGPU_SI 



No need to compile them on CONFIG_DRM_AMDGPU_SI disabled.

Signed-off-by: default avatarEvan Quan <evan.quan@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 3712e7a4

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

+2 −0
Original line number Diff line number Diff line
@@ -1083,6 +1083,7 @@ int amdgpu_atombios_get_clock_dividers(struct amdgpu_device *adev, 
	return 0;

}



#ifdef CONFIG_DRM_AMDGPU_SI

int amdgpu_atombios_get_memory_pll_dividers(struct amdgpu_device *adev,

					    u32 clock,

					    bool strobe_mode,
@@ -1503,6 +1504,7 @@ int amdgpu_atombios_init_mc_reg_table(struct amdgpu_device *adev, 
	}

	return -EINVAL;

}

#endif



bool amdgpu_atombios_has_gpu_virtualization_table(struct amdgpu_device *adev)

{

drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.h

+12 −10
Original line number Diff line number Diff line
@@ -160,6 +160,7 @@ int amdgpu_atombios_get_clock_dividers(struct amdgpu_device *adev, 
				       bool strobe_mode,

				       struct atom_clock_dividers *dividers);



#ifdef CONFIG_DRM_AMDGPU_SI

int amdgpu_atombios_get_memory_pll_dividers(struct amdgpu_device *adev,

					    u32 clock,

					    bool strobe_mode,
@@ -179,6 +180,17 @@ int amdgpu_atombios_get_voltage_table(struct amdgpu_device *adev, 
int amdgpu_atombios_init_mc_reg_table(struct amdgpu_device *adev,

				      u8 module_index,

				      struct atom_mc_reg_table *reg_table);

int amdgpu_atombios_get_max_vddc(struct amdgpu_device *adev, u8 voltage_type,

			     u16 voltage_id, u16 *voltage);

int amdgpu_atombios_get_leakage_vddc_based_on_leakage_idx(struct amdgpu_device *adev,

						      u16 *voltage,

						      u16 leakage_idx);

void amdgpu_atombios_get_default_voltages(struct amdgpu_device *adev,

					  u16 *vddc, u16 *vddci, u16 *mvdd);

int amdgpu_atombios_get_svi2_info(struct amdgpu_device *adev,

			      u8 voltage_type,

			      u8 *svd_gpio_id, u8 *svc_gpio_id);

#endif



bool amdgpu_atombios_has_gpu_virtualization_table(struct amdgpu_device *adev);
@@ -190,21 +202,11 @@ void amdgpu_atombios_scratch_regs_set_backlight_level(struct amdgpu_device *adev 
bool amdgpu_atombios_scratch_need_asic_init(struct amdgpu_device *adev);



void amdgpu_atombios_copy_swap(u8 *dst, u8 *src, u8 num_bytes, bool to_le);

int amdgpu_atombios_get_max_vddc(struct amdgpu_device *adev, u8 voltage_type,

			     u16 voltage_id, u16 *voltage);

int amdgpu_atombios_get_leakage_vddc_based_on_leakage_idx(struct amdgpu_device *adev,

						      u16 *voltage,

						      u16 leakage_idx);

void amdgpu_atombios_get_default_voltages(struct amdgpu_device *adev,

					  u16 *vddc, u16 *vddci, u16 *mvdd);

int amdgpu_atombios_get_clock_dividers(struct amdgpu_device *adev,

				       u8 clock_type,

				       u32 clock,

				       bool strobe_mode,

				       struct atom_clock_dividers *dividers);

int amdgpu_atombios_get_svi2_info(struct amdgpu_device *adev,

			      u8 voltage_type,

			      u8 *svd_gpio_id, u8 *svc_gpio_id);



int amdgpu_atombios_get_data_table(struct amdgpu_device *adev,

				   uint32_t table,