Commit 7c62235b authored by Kevin Wang's avatar Kevin Wang Committed by Alex Deucher
Browse files

drm/amd/pm: fix is_dpm_running() run error on 32bit system 



v1:
the C type "unsigned long" size is 32bit on 32bit system,
it will cause code logic error, so replace it with "uint64_t".

v2:
remove duplicate cast operation.

Signed-off-by: default avatarKevin <kevin1.wang@amd.com>
Suggest-by: default avatarJiansong Chen <Jiansong.Chen@amd.com>
Reviewed-by: default avatarJiansong Chen <Jiansong.Chen@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent f75aef39

drivers/gpu/drm/amd/powerplay/arcturus_ppt.c

+7 −3
Original line number Diff line number Diff line
@@ -1840,10 +1840,14 @@ static bool arcturus_is_dpm_running(struct smu_context *smu) 
{

	int ret = 0;

	uint32_t feature_mask[2];

	unsigned long feature_enabled;

	uint64_t feature_enabled;



	ret = smu_cmn_get_enabled_mask(smu, feature_mask, 2);

	feature_enabled = (unsigned long)((uint64_t)feature_mask[0] |

			   ((uint64_t)feature_mask[1] << 32));

	if (ret)

		return false;



	feature_enabled = (uint64_t)feature_mask[1] << 32 | feature_mask[0];



	return !!(feature_enabled & SMC_DPM_FEATURE);

}

drivers/gpu/drm/amd/powerplay/navi10_ppt.c

+7 −3
Original line number Diff line number Diff line
@@ -1331,10 +1331,14 @@ static bool navi10_is_dpm_running(struct smu_context *smu) 
{

	int ret = 0;

	uint32_t feature_mask[2];

	unsigned long feature_enabled;

	uint64_t feature_enabled;



	ret = smu_cmn_get_enabled_mask(smu, feature_mask, 2);

	feature_enabled = (unsigned long)((uint64_t)feature_mask[0] |

			   ((uint64_t)feature_mask[1] << 32));

	if (ret)

		return false;



	feature_enabled = (uint64_t)feature_mask[1] << 32 | feature_mask[0];



	return !!(feature_enabled & SMC_DPM_FEATURE);

}

drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c

+7 −3
Original line number Diff line number Diff line
@@ -1147,10 +1147,14 @@ static bool sienna_cichlid_is_dpm_running(struct smu_context *smu) 
{

	int ret = 0;

	uint32_t feature_mask[2];

	unsigned long feature_enabled;

	uint64_t feature_enabled;



	ret = smu_cmn_get_enabled_mask(smu, feature_mask, 2);

	feature_enabled = (unsigned long)((uint64_t)feature_mask[0] |

			   ((uint64_t)feature_mask[1] << 32));

	if (ret)

		return false;



	feature_enabled = (uint64_t)feature_mask[1] << 32 | feature_mask[0];



	return !!(feature_enabled & SMC_DPM_FEATURE);

}