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

drm/amd/pm: drop unneeded smu_baco->mutex 



As those APIs related are already well protected by adev->pm.mutex.

Signed-off-by: default avatarEvan Quan <evan.quan@amd.com>
Reviewed-by: default avatarGuchun Chen <guchun.chen@amd.com>
Reviewed-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 56383e8f

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

+0 −1
Original line number Diff line number Diff line
@@ -567,7 +567,6 @@ static int smu_early_init(void *handle) 
	smu->adev = adev;

	smu->pm_enabled = !!amdgpu_dpm;

	smu->is_apu = false;

	mutex_init(&smu->smu_baco.mutex);

	smu->smu_baco.state = SMU_BACO_STATE_EXIT;

	smu->smu_baco.platform_support = false;

	smu->user_dpm_profile.fan_mode = -1;

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

+0 −1
Original line number Diff line number Diff line
@@ -428,7 +428,6 @@ enum smu_baco_state 


struct smu_baco_context

{

	struct mutex mutex;

	uint32_t state;

	bool platform_support;

};

drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c

+5 −14
Original line number Diff line number Diff line
@@ -1617,13 +1617,8 @@ bool smu_v11_0_baco_is_support(struct smu_context *smu) 
enum smu_baco_state smu_v11_0_baco_get_state(struct smu_context *smu)

{

	struct smu_baco_context *smu_baco = &smu->smu_baco;

	enum smu_baco_state baco_state;



	mutex_lock(&smu_baco->mutex);

	baco_state = smu_baco->state;

	mutex_unlock(&smu_baco->mutex);



	return baco_state;

	return smu_baco->state;

}



#define D3HOT_BACO_SEQUENCE 0
@@ -1640,8 +1635,6 @@ int smu_v11_0_baco_set_state(struct smu_context *smu, enum smu_baco_state state) 
	if (smu_v11_0_baco_get_state(smu) == state)

		return 0;



	mutex_lock(&smu_baco->mutex);



	if (state == SMU_BACO_STATE_ENTER) {

		switch (adev->ip_versions[MP1_HWIP][0]) {

		case IP_VERSION(11, 0, 7):
@@ -1682,18 +1675,16 @@ int smu_v11_0_baco_set_state(struct smu_context *smu, enum smu_baco_state state) 
	} else {

		ret = smu_cmn_send_smc_msg(smu, SMU_MSG_ExitBaco, NULL);

		if (ret)

			goto out;

			return ret;



		/* clear vbios scratch 6 and 7 for coming asic reinit */

		WREG32(adev->bios_scratch_reg_offset + 6, 0);

		WREG32(adev->bios_scratch_reg_offset + 7, 0);

	}

	if (ret)

		goto out;



	if (!ret)

		smu_baco->state = state;

out:

	mutex_unlock(&smu_baco->mutex);



	return ret;

}