Re: [PATCH 1/2] FOR_CI: pcode-fix

[Jani Nikula <jani.nikula@linux.intel.com>]

On Thu, 26 Jun 2025, Lucas De Marchi <lucas.demarchi@intel.com> wrote:
> Just to test/validate second patch. The solution is being discussed
> at https://lore.kernel.org/intel-xe/gbisrh7ep2gn2fxv7xz4g4sy75qjpmcr5yqdx5atlab2oxevlx@j3zwx3k4o4x4/

I think this is the simplest fix.

Acked-by: Jani Nikula <jani.nikula@intel.com>


>
> Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
> ---
>  drivers/gpu/drm/xe/xe_pcode.c | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/xe/xe_pcode.c b/drivers/gpu/drm/xe/xe_pcode.c
> index 87323ad0cbbb2..08aee78ff08ed 100644
> --- a/drivers/gpu/drm/xe/xe_pcode.c
> +++ b/drivers/gpu/drm/xe/xe_pcode.c
> @@ -337,7 +337,10 @@ 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 +365,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

-- 
Jani Nikula, Intel