Commit 73486d75 authored by Lucas De Marchi's avatar Lucas De Marchi Committed by Rodrigo Vivi

drm/xe/display: Fix dummy __i915_inject_probe_error()

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: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent 80166e95
...@@ -14,9 +14,13 @@ bool i915_vtd_active(struct drm_i915_private *i915) ...@@ -14,9 +14,13 @@ bool i915_vtd_active(struct drm_i915_private *i915)
return i915_run_as_guest(); return i915_run_as_guest();
} }
#if IS_ENABLED(CONFIG_DRM_I915_DEBUG)
/* i915 specific, just put here for shutting it up */ /* i915 specific, just put here for shutting it up */
int __i915_inject_probe_error(struct drm_i915_private *i915, int err, int __i915_inject_probe_error(struct drm_i915_private *i915, int err,
const char *func, int line) const char *func, int line)
{ {
return 0; return 0;
} }
#endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment