Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

drm/amd/powerplay: fix the confusing ppfeature mask calculations 



Simplify the ppfeature mask calculations.

Signed-off-by: default avatarEvan Quan <evan.quan@amd.com>
Reviewed-by: default avatarKenneth Feng <kenneth.feng@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 6a7a20ed

drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c

+2 −2
Original line number Diff line number Diff line
@@ -4407,9 +4407,9 @@ static int vega10_set_ppfeature_status(struct pp_hwmgr *hwmgr, uint64_t new_ppfe 
		return ret;



	features_to_disable =

		(features_enabled ^ new_ppfeature_masks) & features_enabled;

		features_enabled & ~new_ppfeature_masks;

	features_to_enable =

		(features_enabled ^ new_ppfeature_masks) ^ features_to_disable;

		~features_enabled & new_ppfeature_masks;



	pr_debug("features_to_disable 0x%llx\n", features_to_disable);

	pr_debug("features_to_enable 0x%llx\n", features_to_enable);

drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c

+2 −2
Original line number Diff line number Diff line
@@ -2009,9 +2009,9 @@ static int vega12_set_ppfeature_status(struct pp_hwmgr *hwmgr, uint64_t new_ppfe 
		return ret;



	features_to_disable =

		(features_enabled ^ new_ppfeature_masks) & features_enabled;

		features_enabled & ~new_ppfeature_masks;

	features_to_enable =

		(features_enabled ^ new_ppfeature_masks) ^ features_to_disable;

		~features_enabled & new_ppfeature_masks;



	pr_debug("features_to_disable 0x%llx\n", features_to_disable);

	pr_debug("features_to_enable 0x%llx\n", features_to_enable);

drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c

+2 −2
Original line number Diff line number Diff line
@@ -3084,9 +3084,9 @@ static int vega20_set_ppfeature_status(struct pp_hwmgr *hwmgr, uint64_t new_ppfe 
		return ret;



	features_to_disable =

		(features_enabled ^ new_ppfeature_masks) & features_enabled;

		features_enabled & ~new_ppfeature_masks;

	features_to_enable =

		(features_enabled ^ new_ppfeature_masks) ^ features_to_disable;

		~features_enabled & new_ppfeature_masks;



	pr_debug("features_to_disable 0x%llx\n", features_to_disable);

	pr_debug("features_to_enable 0x%llx\n", features_to_enable);