Commit da8c2760 authored by Lijo Lazar's avatar Lijo Lazar Committed by Alex Deucher
Browse files

drm/amd/pm: Add default feature number definition 



The number of default features could be different from the actual width
of the bitmap. Use a different definition for it. Also increase the max
width of bitmap to 128.

Signed-off-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Reviewed-by: default avatarAsad Kamal <asad.kamal@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 7b88453a

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

+1 −1
Original line number Diff line number Diff line
@@ -1355,7 +1355,7 @@ static int smu_sw_init(struct amdgpu_ip_block *ip_block) 
	int i, ret;



	smu->pool_size = adev->pm.smu_prv_buffer_size;

	smu_feature_init(smu, SMU_FEATURE_MAX);

	smu_feature_init(smu, SMU_FEATURE_NUM_DEFAULT);



	INIT_WORK(&smu->throttling_logging_work, smu_throttling_logging_work_fn);

	INIT_WORK(&smu->interrupt_work, smu_interrupt_work_fn);

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

+2 −1
Original line number Diff line number Diff line
@@ -471,7 +471,8 @@ struct smu_power_context { 
	struct smu_power_gate power_gate;

};



#define SMU_FEATURE_MAX	(64)

#define SMU_FEATURE_NUM_DEFAULT (64)

#define SMU_FEATURE_MAX (128)



struct smu_feature_bits {

	DECLARE_BITMAP(bits, SMU_FEATURE_MAX);

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

+1 −1
Original line number Diff line number Diff line
@@ -751,7 +751,7 @@ int smu_v11_0_set_allowed_mask(struct smu_context *smu) 
	uint32_t feature_mask[2];



	if (smu_feature_list_is_empty(smu, SMU_FEATURE_LIST_ALLOWED) ||

	    feature->feature_num < 64) {

	    feature->feature_num < SMU_FEATURE_NUM_DEFAULT) {

		ret = -EINVAL;

		goto failed;

	}

drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c

+1 −1
Original line number Diff line number Diff line
@@ -762,7 +762,7 @@ int smu_v13_0_set_allowed_mask(struct smu_context *smu) 
	uint32_t feature_mask[2];



	if (smu_feature_list_is_empty(smu, SMU_FEATURE_LIST_ALLOWED) ||

	    feature->feature_num < 64)

	    feature->feature_num < SMU_FEATURE_NUM_DEFAULT)

		return -EINVAL;



	smu_feature_list_to_arr32(smu, SMU_FEATURE_LIST_ALLOWED, feature_mask);

drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c

+1 −1
Original line number Diff line number Diff line
@@ -747,7 +747,7 @@ int smu_v14_0_set_allowed_mask(struct smu_context *smu) 
	uint32_t feature_mask[2];



	if (smu_feature_list_is_empty(smu, SMU_FEATURE_LIST_ALLOWED) ||

	    feature->feature_num < 64)

	    feature->feature_num < SMU_FEATURE_NUM_DEFAULT)

		return -EINVAL;



	smu_feature_list_to_arr32(smu, SMU_FEATURE_LIST_ALLOWED, feature_mask);