Skip to content

Commit 5e183e1

Browse files
hghimiragregkh
authored andcommitted
drm/xe: Ensure caller uses sole domain for xe_force_wake_assert_held
[ Upstream commit 3541e19 ] xe_force_wake_assert_held() is designed to confirm a particular forcewake domain's wakefulness; it doesn't verify the wakefulness of multiple domains. Make sure the caller doesn't input multiple domains(XE_FORCEWAKE_ALL) as a parameter. v2 - use domain != XE_FORCEWAKE_ALL (Michal) v3 - Add kernel-doc Cc: Michal Wajdeczko <michal.wajdeczko@intel.com> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> Cc: Lucas De Marchi <lucas.demarchi@intel.com> Cc: Badal Nilawar <badal.nilawar@intel.com> Signed-off-by: Himal Prasad Ghimiray <himal.prasad.ghimiray@intel.com> Reviewed-by: Michal Wajdeczko <michal.wajdeczko@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20240607125741.1407331-1-himal.prasad.ghimiray@intel.com Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 1fb1369 commit 5e183e1

1 file changed

Lines changed: 11 additions & 0 deletions

File tree

drivers/gpu/drm/xe/xe_force_wake.h

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,21 @@ xe_force_wake_ref(struct xe_force_wake *fw,
2828
return fw->domains[ffs(domain) - 1].ref;
2929
}
3030

31+
/**
32+
* xe_force_wake_assert_held - asserts domain is awake
33+
* @fw : xe_force_wake structure
34+
* @domain: xe_force_wake_domains apart from XE_FORCEWAKE_ALL
35+
*
36+
* xe_force_wake_assert_held() is designed to confirm a particular
37+
* forcewake domain's wakefulness; it doesn't verify the wakefulness of
38+
* multiple domains. Make sure the caller doesn't input multiple
39+
* domains(XE_FORCEWAKE_ALL) as a parameter.
40+
*/
3141
static inline void
3242
xe_force_wake_assert_held(struct xe_force_wake *fw,
3343
enum xe_force_wake_domains domain)
3444
{
45+
xe_gt_assert(fw->gt, domain != XE_FORCEWAKE_ALL);
3546
xe_gt_assert(fw->gt, fw->awake_domains & domain);
3647
}
3748

0 commit comments

Comments
 (0)