[PATCH 2/2] fixup! drm/xe/display: Implement display support

[Jani Nikula]

On Fri, 08 Dec 2023, Rodrigo Vivi <rodrigo.vivi at intel.com> wrote:
> Adjust to display changes that already landed on drm-next for a smooth
> rebase.
>
> Cc: Jani Nikula <jani.nikula at intel.com>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi at intel.com>

Reviewed-by: Jani Nikula <jani.nikula at intel.com>

and ack for merging both

> ---
>  drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h | 7 -------
>  1 file changed, 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h b/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h
> index 8e67f38e98fd..5d2a77b52db4 100644
> --- a/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h
> +++ b/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h
> @@ -98,11 +98,7 @@ static inline struct drm_i915_private *kdev_to_i915(struct device *kdev)
>  #define IP_VER(ver, rel)                ((ver) << 8 | (rel))
>  
>  #define INTEL_DISPLAY_ENABLED(xe) (HAS_DISPLAY((xe)) && !intel_opregion_headless_sku((xe)))
> -#define DISPLAY_VER(i915)	(DISPLAY_RUNTIME_INFO(i915)->ip.ver)
> -#define DISPLAY_VER_FULL(i915)	IP_VER(DISPLAY_RUNTIME_INFO(i915)->ip.ver, \
> -				       DISPLAY_RUNTIME_INFO(i915)->ip.rel)
>  
> -#define IS_DISPLAY_VER(xe, first, last) ((DISPLAY_VER(xe) >= first && DISPLAY_VER(xe) <= last))
>  #define IS_GRAPHICS_VER(xe, first, last) \
>  	((xe)->info.graphics_verx100 >= first * 100 && \
>  	 (xe)->info.graphics_verx100 <= (last*100 + 99))
> @@ -220,9 +216,6 @@ struct i915_sched_attr {
>  #define pdev_to_i915 pdev_to_xe_device
>  #define RUNTIME_INFO(xe)		(&(xe)->info.i915_runtime)
>  
> -#define DISPLAY_INFO(xe)		((xe)->display.info.__device_info)
> -#define DISPLAY_RUNTIME_INFO(xe)	(&(xe)->display.info.__runtime_info)
> -
>  #define FORCEWAKE_ALL XE_FORCEWAKE_ALL
>  #define HPD_STORM_DEFAULT_THRESHOLD 50

-- 
Jani Nikula, Intel