Intel-XE Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] drm/xe/display: Fix dummy __i915_inject_probe_error()
@ 2023-12-15 20:33 Lucas De Marchi
  2023-12-15 20:38 ` Rodrigo Vivi
                   ` (7 more replies)
  0 siblings, 8 replies; 9+ messages in thread
From: Lucas De Marchi @ 2023-12-15 20:33 UTC (permalink / raw)
  To: intel-xe; +Cc: francois.dugast, Lucas De Marchi, Rodrigo Vivi

When CONFIG_DRM_I915_DEBUG is not set, a dummy
__i915_inject_probe_error() is provided on the xe side. Use the same
logic as in drivers/gpu/drm/i915/i915_utils.c to ifdef it out. This
fixes the build with W=1 and without that config:

	  CC [M]  drivers/gpu/drm/xe/display/ext/i915_utils.o
	../drivers/gpu/drm/xe/display/ext/i915_utils.c:19:5: error: no previous prototype for ‘__i915_inject_probe_error’ [-Werror=missing-prototypes]
	   19 | int __i915_inject_probe_error(struct drm_i915_private *i915, int err,
	      |     ^~~~~~~~~~~~~~~~~~~~~~~~~

Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
---
 drivers/gpu/drm/xe/display/ext/i915_utils.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/gpu/drm/xe/display/ext/i915_utils.c b/drivers/gpu/drm/xe/display/ext/i915_utils.c
index 981edc2788bc..43b10a2cc508 100644
--- a/drivers/gpu/drm/xe/display/ext/i915_utils.c
+++ b/drivers/gpu/drm/xe/display/ext/i915_utils.c
@@ -14,9 +14,13 @@ bool i915_vtd_active(struct drm_i915_private *i915)
 	return i915_run_as_guest();
 }
 
+#if IS_ENABLED(CONFIG_DRM_I915_DEBUG)
+
 /* i915 specific, just put here for shutting it up */
 int __i915_inject_probe_error(struct drm_i915_private *i915, int err,
 			      const char *func, int line)
 {
 	return 0;
 }
+
+#endif
-- 
2.40.1


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

end of thread, other threads:[~2023-12-15 21:38 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-12-15 20:33 [PATCH] drm/xe/display: Fix dummy __i915_inject_probe_error() Lucas De Marchi
2023-12-15 20:38 ` Rodrigo Vivi
2023-12-15 20:57 ` ✓ CI.Patch_applied: success for " Patchwork
2023-12-15 20:57 ` ✗ CI.checkpatch: warning " Patchwork
2023-12-15 20:58 ` ✓ CI.KUnit: success " Patchwork
2023-12-15 21:06 ` ✓ CI.Build: " Patchwork
2023-12-15 21:06 ` ✓ CI.Hooks: " Patchwork
2023-12-15 21:08 ` ✓ CI.checksparse: " Patchwork
2023-12-15 21:38 ` ✓ CI.BAT: " Patchwork

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox