Commit 5a12173d authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/cx0: convert to struct intel_display 



struct intel_display will replace struct drm_i915_private as the main
device pointer for display code. Switch Cx0 PHY code over to it.

v2: Rebase, split out the include cleanups (Rodrigo)

v3: Rebase

Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241029160822.800097-1-jani.nikula@intel.com
parent 685333aa

drivers/gpu/drm/i915/display/intel_cx0_phy.c

+181 −156

File changed.

Preview size limit exceeded, changes collapsed.

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

+3 −3
Original line number Diff line number Diff line
@@ -9,13 +9,13 @@ 
#include <linux/types.h>



enum icl_port_dpll_id;

struct drm_i915_private;

struct intel_atomic_state;

struct intel_c10pll_state;

struct intel_c20pll_state;

struct intel_cx0pll_state;

struct intel_crtc;

struct intel_crtc_state;

struct intel_cx0pll_state;

struct intel_display;

struct intel_encoder;

struct intel_hdmi;
@@ -33,7 +33,7 @@ void intel_cx0pll_readout_hw_state(struct intel_encoder *encoder, 
int intel_cx0pll_calc_port_clock(struct intel_encoder *encoder,

				 const struct intel_cx0pll_state *pll_state);



void intel_cx0pll_dump_hw_state(struct drm_i915_private *dev_priv,

void intel_cx0pll_dump_hw_state(struct intel_display *display,

				const struct intel_cx0pll_state *hw_state);

void intel_cx0pll_state_verify(struct intel_atomic_state *state,

			       struct intel_crtc *crtc);

drivers/gpu/drm/i915/display/intel_display.c

+3 −3
Original line number Diff line number Diff line
@@ -5306,15 +5306,15 @@ pipe_config_cx0pll_mismatch(struct drm_printer *p, bool fastset, 
			    const struct intel_cx0pll_state *a,

			    const struct intel_cx0pll_state *b)

{

	struct drm_i915_private *i915 = to_i915(crtc->base.dev);

	struct intel_display *display = to_intel_display(crtc);

	char *chipname = a->use_c10 ? "C10" : "C20";



	pipe_config_mismatch(p, fastset, crtc, name, chipname);



	drm_printf(p, "expected:\n");

	intel_cx0pll_dump_hw_state(i915, a);

	intel_cx0pll_dump_hw_state(display, a);

	drm_printf(p, "found:\n");

	intel_cx0pll_dump_hw_state(i915, b);

	intel_cx0pll_dump_hw_state(display, b);

}



bool