Commit 77ba0b85 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/dsi: convert vlv_dsi.[ch] to struct intel_display 



Going forward, struct intel_display is the main display device data
pointer. Convert as much as possible of vlv_dsi.[ch] to struct
intel_display.

Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://lore.kernel.org/r/320449f3b58c6eca6fdbb16e4e819cd0e133887a.1742554320.git.jani.nikula@intel.com


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

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

+2 −2
Original line number Diff line number Diff line
@@ -7670,7 +7670,7 @@ void intel_setup_outputs(struct intel_display *display) 
		intel_bios_for_each_encoder(display, intel_ddi_init);



		if (display->platform.geminilake || display->platform.broxton)

			vlv_dsi_init(dev_priv);

			vlv_dsi_init(display);

	} else if (HAS_PCH_SPLIT(dev_priv)) {

		int found;
@@ -7754,7 +7754,7 @@ void intel_setup_outputs(struct intel_display *display) 
				g4x_hdmi_init(display, CHV_HDMID, PORT_D);

		}



		vlv_dsi_init(dev_priv);

		vlv_dsi_init(display);

	} else if (display->platform.pineview) {

		intel_lvds_init(dev_priv);

		intel_crt_init(display);

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

+75 −82

File changed.

Preview size limit exceeded, changes collapsed.

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

+3 −3
Original line number Diff line number Diff line
@@ -7,14 +7,14 @@ 
#define __VLV_DSI_H__



enum port;

struct drm_i915_private;

struct intel_crtc_state;

struct intel_display;

struct intel_dsi;



#ifdef I915

void vlv_dsi_wait_for_fifo_empty(struct intel_dsi *intel_dsi, enum port port);

int vlv_dsi_min_cdclk(const struct intel_crtc_state *crtc_state);

void vlv_dsi_init(struct drm_i915_private *dev_priv);

void vlv_dsi_init(struct intel_display *display);

#else

static inline void vlv_dsi_wait_for_fifo_empty(struct intel_dsi *intel_dsi, enum port port)

{
@@ -23,7 +23,7 @@ static inline int vlv_dsi_min_cdclk(const struct intel_crtc_state *crtc_state) 
{

	return 0;

}

static inline void vlv_dsi_init(struct drm_i915_private *dev_priv)

static inline void vlv_dsi_init(struct intel_display *display)

{

}

#endif