[Intel-xe] [PATCH] fixup! drm/i915/display: Remaining changes to make xe compile

[Lucas De Marchi]

On Thu, May 11, 2023 at 03:29:01PM +0300, Jani Nikula wrote:
>I don't think the ifdef is needed anymore.
>
>Cc: Lucas De Marchi <lucas.demarchi at intel.com>
>Signed-off-by: Jani Nikula <jani.nikula at intel.com>

correct, it went away in a squash to drm/xe: Introduce a new DRM driver for Intel GPUs
that removed the define

#define i915_mcr_reg_t i915_reg_t

(and the ifdef here was to workaround a compiler break due to that since
  _Generic() would then be passed 2 identical types )

Reviewed-by: Lucas De Marchi <lucas.demarchi at intel.com>


Lucas De Marchi

>---
> drivers/gpu/drm/i915/i915_reg_defs.h | 4 ----
> 1 file changed, 4 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/i915_reg_defs.h b/drivers/gpu/drm/i915/i915_reg_defs.h
>index eac5a4141bfa..622d603080f9 100644
>--- a/drivers/gpu/drm/i915/i915_reg_defs.h
>+++ b/drivers/gpu/drm/i915/i915_reg_defs.h
>@@ -231,12 +231,8 @@ typedef struct {
>  * simply operations on the register's offset and don't care about the MCR vs
>  * non-MCR nature of the register.
>  */
>-#ifdef I915
> #define i915_mmio_reg_offset(r) \
> 	_Generic((r), i915_reg_t: (r).reg, i915_mcr_reg_t: (r).reg)
>-#else
>-#define i915_mmio_reg_offset(r) ((r).reg)
>-#endif
> #define i915_mmio_reg_equal(a, b) (i915_mmio_reg_offset(a) == i915_mmio_reg_offset(b))
> #define i915_mmio_reg_valid(r) (!i915_mmio_reg_equal(r, INVALID_MMIO_REG))
>
>-- 
>2.39.2
>