Re: [PATCH 6/6] drm/xe/compat: remove old pcode compat interface

[Rodrigo Vivi <rodrigo.vivi@intel.com>]

On Thu, Jun 05, 2025 at 01:29:38PM +0300, Jani Nikula wrote:
> With display code using the struct drm_device based pcode interface, we
> can drop the old pcode compat interface.
> 
> We can also drop the __compat_uncore_to_tile() helper from
> intel_uncore.h compat header.
> 
> Turns out a couple of headers depended on the intel_uncore.h include via
> intel_pcode.h. Fix them.

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

> 
> Cc: Lucas De Marchi <lucas.demarchi@intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
>  drivers/gpu/drm/i915/display/intel_bw.c       |  1 +
>  drivers/gpu/drm/i915/soc/intel_dram.c         |  1 +
>  .../drm/xe/compat-i915-headers/intel_pcode.h  | 29 -------------------
>  .../drm/xe/compat-i915-headers/intel_uncore.h |  7 -----
>  4 files changed, 2 insertions(+), 36 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_bw.c b/drivers/gpu/drm/i915/display/intel_bw.c
> index 82f131c3f8d3..205069257b3f 100644
> --- a/drivers/gpu/drm/i915/display/intel_bw.c
> +++ b/drivers/gpu/drm/i915/display/intel_bw.c
> @@ -16,6 +16,7 @@
>  #include "intel_display_types.h"
>  #include "intel_mchbar_regs.h"
>  #include "intel_pcode.h"
> +#include "intel_uncore.h"
>  #include "skl_watermark.h"
>  
>  /* Parameters for Qclk Geyserville (QGV) */
> diff --git a/drivers/gpu/drm/i915/soc/intel_dram.c b/drivers/gpu/drm/i915/soc/intel_dram.c
> index 5d43042b0fb5..deb159548a09 100644
> --- a/drivers/gpu/drm/i915/soc/intel_dram.c
> +++ b/drivers/gpu/drm/i915/soc/intel_dram.c
> @@ -14,6 +14,7 @@
>  #include "intel_dram.h"
>  #include "intel_mchbar_regs.h"
>  #include "intel_pcode.h"
> +#include "intel_uncore.h"
>  #include "vlv_iosf_sb.h"
>  
>  struct dram_dimm_info {
> diff --git a/drivers/gpu/drm/xe/compat-i915-headers/intel_pcode.h b/drivers/gpu/drm/xe/compat-i915-headers/intel_pcode.h
> index 32da708680c2..4fcd3bf6b76f 100644
> --- a/drivers/gpu/drm/xe/compat-i915-headers/intel_pcode.h
> +++ b/drivers/gpu/drm/xe/compat-i915-headers/intel_pcode.h
> @@ -6,35 +6,6 @@
>  #ifndef __INTEL_PCODE_H__
>  #define __INTEL_PCODE_H__
>  
> -#include "intel_uncore.h"
>  #include "xe_pcode.h"
>  
> -static inline int
> -snb_pcode_write_timeout(struct intel_uncore *uncore, u32 mbox, u32 val, int timeout_ms)
> -{
> -	return xe_pcode_write_timeout(__compat_uncore_to_tile(uncore), mbox, val, timeout_ms);
> -}
> -
> -static inline int
> -snb_pcode_write(struct intel_uncore *uncore, u32 mbox, u32 val)
> -{
> -
> -	return xe_pcode_write(__compat_uncore_to_tile(uncore), mbox, val);
> -}
> -
> -static inline int
> -snb_pcode_read(struct intel_uncore *uncore, u32 mbox, u32 *val, u32 *val1)
> -{
> -	return xe_pcode_read(__compat_uncore_to_tile(uncore), mbox, val, val1);
> -}
> -
> -static inline int
> -skl_pcode_request(struct intel_uncore *uncore, u32 mbox,
> -		  u32 request, u32 reply_mask, u32 reply,
> -		  int timeout_base_ms)
> -{
> -	return xe_pcode_request(__compat_uncore_to_tile(uncore), mbox, request, reply_mask, reply,
> -				timeout_base_ms);
> -}
> -
>  #endif /* __INTEL_PCODE_H__ */
> diff --git a/drivers/gpu/drm/xe/compat-i915-headers/intel_uncore.h b/drivers/gpu/drm/xe/compat-i915-headers/intel_uncore.h
> index 797091cf1c99..d012f02bc84f 100644
> --- a/drivers/gpu/drm/xe/compat-i915-headers/intel_uncore.h
> +++ b/drivers/gpu/drm/xe/compat-i915-headers/intel_uncore.h
> @@ -24,13 +24,6 @@ static inline struct xe_mmio *__compat_uncore_to_mmio(struct intel_uncore *uncor
>  	return xe_root_tile_mmio(xe);
>  }
>  
> -static inline struct xe_tile *__compat_uncore_to_tile(struct intel_uncore *uncore)
> -{
> -	struct xe_device *xe = container_of(uncore, struct xe_device, uncore);
> -
> -	return xe_device_get_root_tile(xe);
> -}
> -
>  static inline u32 intel_uncore_read(struct intel_uncore *uncore,
>  				    i915_reg_t i915_reg)
>  {
> -- 
> 2.39.5
>