[PATCH v2 1/2] drm/xe: Fix conflicting intel_pcode_* symbols

[Rodrigo Vivi]

On Fri, Jun 27, 2025 at 01:30:34PM -0700, Lucas De Marchi wrote:
> If CONFIG_DRM_XE_DISPLAY is set, the xe module can only be built as
> module to avoid duplicate symbols from i915. The interface for pcode was
> added without considering that, so the build breaks if both xe and i915
> are built-in.
> 
> Since the intel_pcode_* functions should only be called from the display
> side (xe side should call the xe interface directly) and there's already
> a protection in Kconfig to avoid the problematic configuration, ifdef it
> out in case CONFIG_DRM_XE_DISPLAY is disabled.
> 
> Closes: https://lore.kernel.org/r/3667a992-a24b-4e49-aab2-5ca73f2c0a56@infradead.org
> Fixes: d9465cc8ac2d ("drm/xe/pcode: add struct drm_device based interface")
> Acked-by: Jani Nikula <jani.nikula at intel.com>
> Signed-off-by: Lucas De Marchi <lucas.demarchi at intel.com>

Reviewed-by: Rodrigo Vivi <rodrigo.vivi at intel.com>

> ---
>  drivers/gpu/drm/xe/xe_pcode.c | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_pcode.c b/drivers/gpu/drm/xe/xe_pcode.c
> index 87323ad0cbbb2..6a7ddb9005f99 100644
> --- a/drivers/gpu/drm/xe/xe_pcode.c
> +++ b/drivers/gpu/drm/xe/xe_pcode.c
> @@ -337,7 +337,9 @@ int xe_pcode_probe_early(struct xe_device *xe)
>  }
>  ALLOW_ERROR_INJECTION(xe_pcode_probe_early, ERRNO); /* See xe_pci_probe */
>  
> -/* Helpers with drm device */
> +/* Helpers with drm device. These should only be called by the display side */
> +#if IS_ENABLED(CONFIG_DRM_XE_DISPLAY)
> +
>  int intel_pcode_read(struct drm_device *drm, u32 mbox, u32 *val, u32 *val1)
>  {
>  	struct xe_device *xe = to_xe_device(drm);
> @@ -362,3 +364,5 @@ int intel_pcode_request(struct drm_device *drm, u32 mbox, u32 request,
>  
>  	return xe_pcode_request(tile, mbox, request, reply_mask, reply, timeout_base_ms);
>  }
> +
> +#endif
> 
> -- 
> 2.49.0
>