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

[Jani Nikula]

Lucas, Rodrigo, r-b on these two?

Thanks,
Jani.


On Fri, 12 May 2023, Jani Nikula <jani.nikula at intel.com> wrote:
> The dependency on display/intel_display_reg_defs.h is removed by
> upstream commit 6e4e9fbd5ba0 ("drm/i915/gt: drop dependency on
> VLV_DISPLAY_BASE").
>
> Signed-off-by: Jani Nikula <jani.nikula at intel.com>
> ---
>  drivers/gpu/drm/i915/gt/intel_gt_regs.h | 2 --
>  1 file changed, 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gt/intel_gt_regs.h b/drivers/gpu/drm/i915/gt/intel_gt_regs.h
> index 7ae5fa5a8ff7..af80d2fe739b 100644
> --- a/drivers/gpu/drm/i915/gt/intel_gt_regs.h
> +++ b/drivers/gpu/drm/i915/gt/intel_gt_regs.h
> @@ -7,9 +7,7 @@
>  #define __INTEL_GT_REGS__
>  
>  #include "i915_reg_defs.h"
> -#ifdef I915
>  #include "display/intel_display_reg_defs.h"	/* VLV_DISPLAY_BASE */
> -#endif
>  
>  /*
>   * The perf control registers are technically multicast registers, but the

-- 
Jani Nikula, Intel Open Source Graphics Center