[PATCH] drm/xe/display: Fix dummy __i915_inject_probe_error()

Rodrigo Vivi rodrigo.vivi at intel.com
Fri Dec 15 20:38:26 UTC 2023


On Fri, Dec 15, 2023 at 12:33:31PM -0800, Lucas De Marchi wrote:
> 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 at intel.com>

Reviewed-by: Rodrigo Vivi <rodrigo.vivi at 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
> 


More information about the Intel-xe mailing list