Commit f5d2a0e4 authored by Jani Nikula's avatar Jani Nikula
Browse files

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



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().

Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240904125301.3813721-1-jani.nikula@intel.com


Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent c96c8348

drivers/gpu/drm/i915/display/intel_cdclk.h

+2 −2
Original line number Diff line number Diff line
@@ -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);

drivers/gpu/drm/i915/display/skl_watermark.h

+2 −2
Original line number Diff line number Diff line
@@ -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,