Commit b687c198 authored by Madhav Chauhan's avatar Madhav Chauhan Committed by Jani Nikula
Browse files

drm/i915/icl: Make common DSI functions available 



This patch moves couple of legacy DSI functions to header and common DSI
files so that they can be re-used by Gen11 DSI. No functional change.

v2 by Jani:
 - Move intel_dsi_msleep() to intel_dsi_vbt.c

Signed-off-by: default avatarMadhav Chauhan <madhav.chauhan@intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/bd1f5f3e96d3e1de4d359f4fd1b750ac7e3c87d4.1539613303.git.jani.nikula@intel.com
parent 9ec9a87b

drivers/gpu/drm/i915/intel_dsi.h

+11 −0
Original line number Diff line number Diff line
@@ -129,6 +129,16 @@ static inline struct intel_dsi *enc_to_intel_dsi(struct drm_encoder *encoder) 
	return container_of(encoder, struct intel_dsi, base.base);

}



static inline bool is_vid_mode(struct intel_dsi *intel_dsi)

{

	return intel_dsi->operation_mode == INTEL_DSI_VIDEO_MODE;

}



static inline bool is_cmd_mode(struct intel_dsi *intel_dsi)

{

	return intel_dsi->operation_mode == INTEL_DSI_COMMAND_MODE;

}



/* intel_dsi.c */

int intel_dsi_bitrate(const struct intel_dsi *intel_dsi);

int intel_dsi_tlpx_ns(const struct intel_dsi *intel_dsi);
@@ -162,5 +172,6 @@ bool intel_dsi_vbt_init(struct intel_dsi *intel_dsi, u16 panel_id); 
int intel_dsi_vbt_get_modes(struct intel_dsi *intel_dsi);

void intel_dsi_vbt_exec_sequence(struct intel_dsi *intel_dsi,

				 enum mipi_seq seq_id);

void intel_dsi_msleep(struct intel_dsi *intel_dsi, int msec);



#endif /* _INTEL_DSI_H */

drivers/gpu/drm/i915/intel_dsi_vbt.c

+11 −0
Original line number Diff line number Diff line
@@ -481,6 +481,17 @@ void intel_dsi_vbt_exec_sequence(struct intel_dsi *intel_dsi, 
	}

}



void intel_dsi_msleep(struct intel_dsi *intel_dsi, int msec)

{

	struct drm_i915_private *dev_priv = to_i915(intel_dsi->base.base.dev);



	/* For v3 VBTs in vid-mode the delays are part of the VBT sequences */

	if (is_vid_mode(intel_dsi) && dev_priv->vbt.dsi.seq_version >= 3)

		return;



	msleep(msec);

}



int intel_dsi_vbt_get_modes(struct intel_dsi *intel_dsi)

{

	struct intel_connector *connector = intel_dsi->attached_connector;

drivers/gpu/drm/i915/vlv_dsi.c

+0 −21
Original line number Diff line number Diff line
@@ -290,16 +290,6 @@ static void band_gap_reset(struct drm_i915_private *dev_priv) 
	mutex_unlock(&dev_priv->sb_lock);

}



static inline bool is_vid_mode(struct intel_dsi *intel_dsi)

{

	return intel_dsi->operation_mode == INTEL_DSI_VIDEO_MODE;

}



static inline bool is_cmd_mode(struct intel_dsi *intel_dsi)

{

	return intel_dsi->operation_mode == INTEL_DSI_COMMAND_MODE;

}



static bool intel_dsi_compute_config(struct intel_encoder *encoder,

				     struct intel_crtc_state *pipe_config,

				     struct drm_connector_state *conn_state)
@@ -746,17 +736,6 @@ static void intel_dsi_prepare(struct intel_encoder *intel_encoder, 
			      const struct intel_crtc_state *pipe_config);

static void intel_dsi_unprepare(struct intel_encoder *encoder);



static void intel_dsi_msleep(struct intel_dsi *intel_dsi, int msec)

{

	struct drm_i915_private *dev_priv = to_i915(intel_dsi->base.base.dev);



	/* For v3 VBTs in vid-mode the delays are part of the VBT sequences */

	if (is_vid_mode(intel_dsi) && dev_priv->vbt.dsi.seq_version >= 3)

		return;



	msleep(msec);

}



/*

 * Panel enable/disable sequences from the VBT spec.

 *

CRA Git | Maintained and supported by SUSTech CRA and CCSE