[Intel-xe] [PATCH 03/10] fixup! drm/xe/display: Implement display support

[Rodrigo Vivi]

On Tue, Oct 03, 2023 at 05:34:50PM +0300, Jani Nikula wrote:
> The display device and runtime info have been moved as part of struct
> intel_display, and the ones in struct xe_device are stale.
> 
> Cc: Rodrigo Vivi <rodrigo.vivi at intel.com>
> Signed-off-by: Jani Nikula <jani.nikula at intel.com>

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

> ---
>  drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h | 5 +++--
>  drivers/gpu/drm/xe/xe_device_types.h              | 2 --
>  2 files changed, 3 insertions(+), 4 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 f739858d17e2..e7c9b4ea2153 100644
> --- a/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h
> +++ b/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h
> @@ -206,9 +206,10 @@ static inline void intel_runtime_pm_put(struct xe_runtime_pm *pm, bool wakeref)
>  
>  #define intel_step_name xe_step_name
>  #define pdev_to_i915 pdev_to_xe_device
> -#define DISPLAY_INFO(xe)		((xe)->info.display)
>  #define RUNTIME_INFO(xe)		(&(xe)->info.i915_runtime)
> -#define DISPLAY_RUNTIME_INFO(xe)	(&(xe)->info.display_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
> diff --git a/drivers/gpu/drm/xe/xe_device_types.h b/drivers/gpu/drm/xe/xe_device_types.h
> index 0717839ae964..62e1a875980b 100644
> --- a/drivers/gpu/drm/xe/xe_device_types.h
> +++ b/drivers/gpu/drm/xe/xe_device_types.h
> @@ -240,8 +240,6 @@ struct xe_device {
>  		u8 enable_display:1;
>  
>  #if IS_ENABLED(CONFIG_DRM_XE_DISPLAY)
> -		const struct intel_display_device_info *display;
> -		struct intel_display_runtime_info display_runtime;
>  		struct {
>  			u32 rawclk_freq;
>  		} i915_runtime;
> -- 
> 2.39.2
>