[PATCH] drm/i915/display: use to_intel_display() global state macros

[Ville Syrjälä]

On Wed, Sep 04, 2024 at 03:53:01PM +0300, Jani Nikula wrote:
> Convert intel_atomic_get_{old,new}_cdclk_state() and
> intel_atomic_get_{old,new}_dbuf_state() to use to_intel_display()
> instead of to_i915().
> 
> Signed-off-by: Jani Nikula <jani.nikula at intel.com>

Reviewed-by: Ville Syrjälä <ville.syrjala at linux.intel.com>

> ---
>  drivers/gpu/drm/i915/display/intel_cdclk.h   | 4 ++--
>  drivers/gpu/drm/i915/display/skl_watermark.h | 4 ++--
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_cdclk.h b/drivers/gpu/drm/i915/display/intel_cdclk.h
> index cfdcdec07a4d..1fe445a3a30b 100644
> --- a/drivers/gpu/drm/i915/display/intel_cdclk.h
> +++ b/drivers/gpu/drm/i915/display/intel_cdclk.h
> @@ -88,9 +88,9 @@ intel_atomic_get_cdclk_state(struct intel_atomic_state *state);
>  	container_of_const((global_state), struct intel_cdclk_state, base)
>  
>  #define intel_atomic_get_old_cdclk_state(state) \
> -	to_intel_cdclk_state(intel_atomic_get_old_global_obj_state(state, &to_i915(state->base.dev)->display.cdclk.obj))
> +	to_intel_cdclk_state(intel_atomic_get_old_global_obj_state(state, &to_intel_display(state)->cdclk.obj))
>  #define intel_atomic_get_new_cdclk_state(state) \
> -	to_intel_cdclk_state(intel_atomic_get_new_global_obj_state(state, &to_i915(state->base.dev)->display.cdclk.obj))
> +	to_intel_cdclk_state(intel_atomic_get_new_global_obj_state(state, &to_intel_display(state)->cdclk.obj))
>  
>  int intel_cdclk_init(struct drm_i915_private *dev_priv);
>  void intel_cdclk_debugfs_register(struct drm_i915_private *i915);
> diff --git a/drivers/gpu/drm/i915/display/skl_watermark.h b/drivers/gpu/drm/i915/display/skl_watermark.h
> index 78b121941237..e73baec94873 100644
> --- a/drivers/gpu/drm/i915/display/skl_watermark.h
> +++ b/drivers/gpu/drm/i915/display/skl_watermark.h
> @@ -73,9 +73,9 @@ intel_atomic_get_dbuf_state(struct intel_atomic_state *state);
>  	container_of_const((global_state), struct intel_dbuf_state, base)
>  
>  #define intel_atomic_get_old_dbuf_state(state) \
> -	to_intel_dbuf_state(intel_atomic_get_old_global_obj_state(state, &to_i915(state->base.dev)->display.dbuf.obj))
> +	to_intel_dbuf_state(intel_atomic_get_old_global_obj_state(state, &to_intel_display(state)->dbuf.obj))
>  #define intel_atomic_get_new_dbuf_state(state) \
> -	to_intel_dbuf_state(intel_atomic_get_new_global_obj_state(state, &to_i915(state->base.dev)->display.dbuf.obj))
> +	to_intel_dbuf_state(intel_atomic_get_new_global_obj_state(state, &to_intel_display(state)->dbuf.obj))
>  
>  int intel_dbuf_init(struct drm_i915_private *i915);
>  int intel_dbuf_state_set_mdclk_cdclk_ratio(struct intel_atomic_state *state,
> -- 
> 2.39.2

-- 
Ville Syrjälä
Intel