intel-xe.lists.freedesktop.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] drm/xe/xe_gt_idle: Fix name conflict
@ 2024-09-10 14:28 Riana Tauro
  2024-09-10 14:52 ` Rodrigo Vivi
                   ` (8 more replies)
  0 siblings, 9 replies; 18+ messages in thread
From: Riana Tauro @ 2024-09-10 14:28 UTC (permalink / raw)
  To: intel-xe; +Cc: riana.tauro, rodrigo.vivi, jani.nikula

Remove local copy of str_up_down to fix name conflict.

Fixes: 0914c1e45d3a ("drm/xe/xe_gt_idle: add debugfs entry for powergating info")
Signed-off-by: Riana Tauro <riana.tauro@intel.com>
---
 drivers/gpu/drm/xe/xe_gt_debugfs.c | 2 +-
 drivers/gpu/drm/xe/xe_gt_idle.c    | 9 ++-------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/xe/xe_gt_debugfs.c b/drivers/gpu/drm/xe/xe_gt_debugfs.c
index cbc43973ff7e..8f850b9e1947 100644
--- a/drivers/gpu/drm/xe/xe_gt_debugfs.c
+++ b/drivers/gpu/drm/xe/xe_gt_debugfs.c
@@ -14,8 +14,8 @@
 #include "xe_force_wake.h"
 #include "xe_ggtt.h"
 #include "xe_gt.h"
-#include "xe_gt_mcr.h"
 #include "xe_gt_idle.h"
+#include "xe_gt_mcr.h"
 #include "xe_gt_sriov_pf_debugfs.h"
 #include "xe_gt_sriov_vf_debugfs.h"
 #include "xe_gt_stats.h"
diff --git a/drivers/gpu/drm/xe/xe_gt_idle.c b/drivers/gpu/drm/xe/xe_gt_idle.c
index 85a35ed153a3..a8ce8b484561 100644
--- a/drivers/gpu/drm/xe/xe_gt_idle.c
+++ b/drivers/gpu/drm/xe/xe_gt_idle.c
@@ -53,11 +53,6 @@ pc_to_xe(struct xe_guc_pc *pc)
 	return gt_to_xe(gt);
 }
 
-static inline const char *str_up_down(bool v)
-{
-	return v ? "up" : "down";
-}
-
 static const char *gt_idle_state_to_string(enum xe_gt_idle_state state)
 {
 	switch (state) {
@@ -227,7 +222,7 @@ int xe_gt_idle_pg_print(struct xe_gt *gt, struct drm_printer *p)
 			   str_yes_no(pg_enabled & RENDER_POWERGATE_ENABLE));
 
 		drm_printf(p, "Render Power Gate Status: %s\n",
-			   str_up_down(pg_status & RENDER_AWAKE_STATUS));
+			  (pg_status & RENDER_AWAKE_STATUS) ? "up" : "down");
 	}
 
 	vcs_mask = xe_hw_engine_mask_per_class(gt, XE_ENGINE_CLASS_VIDEO_DECODE);
@@ -241,7 +236,7 @@ int xe_gt_idle_pg_print(struct xe_gt *gt, struct drm_printer *p)
 		for (n = 0; n < ARRAY_SIZE(media_slices); n++)
 			if (gt->info.engine_mask & media_slices[n].engines)
 				drm_printf(p, "Media Slice%d Power Gate Status: %s\n", n,
-					   str_up_down(pg_status & media_slices[n].status_bit));
+					  (pg_status & media_slices[n].status_bit) ? "up" : "down");
 	}
 	return 0;
 }
-- 
2.40.0


^ permalink raw reply related	[flat|nested] 18+ messages in thread

end of thread, other threads:[~2024-09-11 20:54 UTC | newest]

Thread overview: 18+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-09-10 14:28 [PATCH] drm/xe/xe_gt_idle: Fix name conflict Riana Tauro
2024-09-10 14:52 ` Rodrigo Vivi
2024-09-10 14:54   ` Matthew Brost
2024-09-10 16:25     ` Riana Tauro
2024-09-10 16:39       ` Rodrigo Vivi
2024-09-10 16:48       ` Lucas De Marchi
2024-09-10 17:23         ` Rodrigo Vivi
2024-09-10 17:45           ` Rodrigo Vivi
2024-09-11  6:39             ` Riana Tauro
2024-09-11 20:53               ` Rodrigo Vivi
2024-09-10 16:26 ` ✓ CI.Patch_applied: success for " Patchwork
2024-09-10 16:26 ` ✓ CI.checkpatch: " Patchwork
2024-09-10 16:27 ` ✓ CI.KUnit: " Patchwork
2024-09-10 16:39 ` ✓ CI.Build: " Patchwork
2024-09-10 16:42 ` ✓ CI.Hooks: " Patchwork
2024-09-10 16:43 ` ✓ CI.checksparse: " Patchwork
2024-09-10 16:57 ` ✓ CI.BAT: " Patchwork
2024-09-10 20:11 ` ✗ CI.FULL: failure " Patchwork

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).