Commit 2d64d23e authored by Evan Quan's avatar Evan Quan Committed by Alex Deucher
Browse files

drm/amd/pm: unify the interface for gfx state setting 



No need to have special handling for swSMU supported ASICs.

Signed-off-by: default avatarEvan Quan <evan.quan@amd.com>
Reviewed-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent d2b0b483

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

+6 −10
Original line number Diff line number Diff line
@@ -842,9 +842,6 @@ int amdgpu_gfx_get_num_kcq(struct amdgpu_device *adev) 


void amdgpu_gfx_state_change_set(struct amdgpu_device *adev, enum gfx_change_state state)

{

	if (is_support_sw_smu(adev)) {

		smu_gfx_state_change_set(&adev->smu, state);

	} else {

	mutex_lock(&adev->pm.mutex);

	if (adev->powerplay.pp_funcs &&

	    adev->powerplay.pp_funcs->gfx_state_change_set)
@@ -852,4 +849,3 @@ void amdgpu_gfx_state_change_set(struct amdgpu_device *adev, enum gfx_change_sta 
			(adev)->powerplay.pp_handle, state));

	mutex_unlock(&adev->pm.mutex);

}
 
}

drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h

+0 −2
Original line number Diff line number Diff line
@@ -1282,8 +1282,6 @@ int smu_allow_xgmi_power_down(struct smu_context *smu, bool en); 


int smu_get_status_gfxoff(struct amdgpu_device *adev, uint32_t *value);



int smu_gfx_state_change_set(struct smu_context *smu, uint32_t state);



int smu_set_light_sbr(struct smu_context *smu, bool enable);



int smu_wait_for_event(struct amdgpu_device *adev, enum smu_event_type event,

drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c

+4 −1
Original line number Diff line number Diff line
@@ -2906,8 +2906,10 @@ static int smu_enable_mgpu_fan_boost(void *handle) 
	return ret;

}



int smu_gfx_state_change_set(struct smu_context *smu, uint32_t state)

static int smu_gfx_state_change_set(void *handle,

				    uint32_t state)

{

	struct smu_context *smu = handle;

	int ret = 0;



	mutex_lock(&smu->mutex);
@@ -2980,6 +2982,7 @@ static const struct amd_pm_funcs swsmu_pm_funcs = { 
	.display_disable_memory_clock_switch = smu_display_disable_memory_clock_switch,

	.get_max_sustainable_clocks_by_dc    = smu_get_max_sustainable_clocks_by_dc,

	.load_firmware           = smu_load_microcode,

	.gfx_state_change_set    = smu_gfx_state_change_set,

};



int smu_wait_for_event(struct amdgpu_device *adev, enum smu_event_type event,