drm/i915: port dsi over to drm panel/dsi frameworks

Instead of having the for each dsi port loop within dpi_send_cmd(), add a port parameter to the function and call it for each port instead.

This is a rewrite of

commit 4510cd779e5897eeb8691aecbd639bb62ec27d55

Author: Gaurav K Singh <[email protected]>
Date:   Thu Dec 4 10:58:51 2014 +0530

drm/i915: Dual link needs Shutdown and Turn on packet for both ports

to add more flexibility in using dpi_send_cmd() for just one port as necessary. No functional changes.

Signed-off-by Jani Nikula <[email protected]>

---
  drivers/gpu/drm/i915/intel_dsi.c     |  7 +++++--
  drivers/gpu/drm/i915/intel_dsi_cmd.c | 26 ++++++++++----------------
  drivers/gpu/drm/i915/intel_dsi_cmd.h |  2 +-
  3 files changed, 16 insertions(+), 19 deletions(-)

drivers/gpu/drm/i915/intel_dsi.c +5 -2

index 42b6d6f5cecc..36b19c7e87b9 100644
@@ -207,7 +207,8 @@ static void intel_dsi_enable(struct intel_encoder *encoder)
  		I915_WRITE(MIPI_MAX_RETURN_PKT_SIZE(port), 8 * 4);
  	else {
  		msleep(20); /* XXX */
-		dpi_send_cmd(intel_dsi, TURN_ON, DPI_LP_MODE_EN);
+		for_each_dsi_port(port, intel_dsi->ports)
+			dpi_send_cmd(intel_dsi, TURN_ON, DPI_LP_MODE_EN, port);
  		msleep(100);
 
  		if (intel_dsi->dev.dev_ops->enable)

@@ -275,12 +276,14 @@ static void intel_dsi_enable_nop(struct intel_encoder *encoder)
  static void intel_dsi_pre_disable(struct intel_encoder *encoder)
  {
  	struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);
+	enum port port;
 
  	DRM_DEBUG_KMS("\n");
 
  	if (is_vid_mode(intel_dsi)) {
  		/* Send Shutdown command to the panel in LP mode */
-		dpi_send_cmd(intel_dsi, SHUTDOWN, DPI_LP_MODE_EN);
+		for_each_dsi_port(port, intel_dsi->ports)
+			dpi_send_cmd(intel_dsi, SHUTDOWN, DPI_LP_MODE_EN, port);
  		msleep(10);
  	}
  }

drivers/gpu/drm/i915/intel_dsi_cmd.c +10 -16

index 562811c1a9d2..5f63c807acea 100644
@@ -380,12 +380,11 @@ int dsi_vc_generic_read(struct intel_dsi *intel_dsi, int channel,
   *
   * XXX: commands with data in MIPI_DPI_DATA?
   */
-int dpi_send_cmd(struct intel_dsi *intel_dsi, u32 cmd, bool hs)
+int dpi_send_cmd(struct intel_dsi *intel_dsi, u32 cmd, bool hs, enum port port)
  {
  	struct drm_encoder *encoder = &intel_dsi->base.base;
  	struct drm_device *dev = encoder->dev;
  	struct drm_i915_private *dev_priv = dev->dev_private;
-	enum port port;
  	u32 mask;
 
  	/* XXX: pipe, hs */

@@ -394,23 +393,18 @@ int dpi_send_cmd(struct intel_dsi *intel_dsi, u32 cmd, bool hs)
  	else
  		cmd |= DPI_LP_MODE;
 
-	for_each_dsi_port(port, intel_dsi->ports) {
-		/* clear bit */
-		I915_WRITE(MIPI_INTR_STAT(port), SPL_PKT_SENT_INTERRUPT);
+	/* clear bit */
+	I915_WRITE(MIPI_INTR_STAT(port), SPL_PKT_SENT_INTERRUPT);
 
-		/* XXX: old code skips write if control unchanged */
-		if (cmd == I915_READ(MIPI_DPI_CONTROL(port)))
-			DRM_ERROR("Same special packet %02x twice in a row.\n",
-									cmd);
+	/* XXX: old code skips write if control unchanged */
+	if (cmd == I915_READ(MIPI_DPI_CONTROL(port)))
+		DRM_ERROR("Same special packet %02x twice in a row.\n", cmd);
 
-		I915_WRITE(MIPI_DPI_CONTROL(port), cmd);
+	I915_WRITE(MIPI_DPI_CONTROL(port), cmd);
 
-		mask = SPL_PKT_SENT_INTERRUPT;
-		if (wait_for((I915_READ(MIPI_INTR_STAT(port)) & mask) == mask,
-									100))
-			DRM_ERROR("Video mode command 0x%08x send failed.\n",
-									cmd);
-	}
+	mask = SPL_PKT_SENT_INTERRUPT;
+	if (wait_for((I915_READ(MIPI_INTR_STAT(port)) & mask) == mask, 100))
+		DRM_ERROR("Video mode command 0x%08x send failed.\n", cmd);
 
  	return 0;
  }

drivers/gpu/drm/i915/intel_dsi_cmd.h +0 -0

index 326a5ac55561..1d1a716e473a 100644

wait_for_dsi_fifo_empty can be static in intel_dsi.c. No functional changes.

Signed-off-by Jani Nikula <[email protected]>

---
  drivers/gpu/drm/i915/intel_dsi.c     | 16 ++++++++++++++++
  drivers/gpu/drm/i915/intel_dsi_cmd.c | 16 ----------------
  drivers/gpu/drm/i915/intel_dsi_cmd.h |  1 -
  3 files changed, 16 insertions(+), 17 deletions(-)

drivers/gpu/drm/i915/intel_dsi.c +16 -0

index 49e186bc080f..e82cf5f65c9a 100644
@@ -42,6 +42,22 @@ static const struct intel_dsi_device intel_dsi_devices[] = {
  	},
  };
 
+static void wait_for_dsi_fifo_empty(struct intel_dsi *intel_dsi)
+{
+	struct drm_encoder *encoder = &intel_dsi->base.base;
+	struct drm_device *dev = encoder->dev;
+	struct drm_i915_private *dev_priv = dev->dev_private;
+	struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc);
+	enum port port = intel_dsi_pipe_to_port(intel_crtc->pipe);
+	u32 mask;
+
+	mask = LP_CTRL_FIFO_EMPTY | HS_CTRL_FIFO_EMPTY |
+		LP_DATA_FIFO_EMPTY | HS_DATA_FIFO_EMPTY;
+
+	if (wait_for((I915_READ(MIPI_GEN_FIFO_STAT(port)) & mask) == mask, 100))
+		DRM_ERROR("DPI FIFOs are not empty\n");
+}
+
  static void band_gap_reset(struct drm_i915_private *dev_priv)
  {
  	mutex_lock(&dev_priv->dpio_lock);

drivers/gpu/drm/i915/intel_dsi_cmd.c +0 -16

index 5f63c807acea..17b892a365ee 100644
@@ -408,19 +408,3 @@ int dpi_send_cmd(struct intel_dsi *intel_dsi, u32 cmd, bool hs, enum port port)
 
  	return 0;
  }
-
-void wait_for_dsi_fifo_empty(struct intel_dsi *intel_dsi)
-{
-	struct drm_encoder *encoder = &intel_dsi->base.base;
-	struct drm_device *dev = encoder->dev;
-	struct drm_i915_private *dev_priv = dev->dev_private;
-	struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc);
-	enum port port = intel_dsi_pipe_to_port(intel_crtc->pipe);
-	u32 mask;
-
-	mask = LP_CTRL_FIFO_EMPTY | HS_CTRL_FIFO_EMPTY |
-		LP_DATA_FIFO_EMPTY | HS_DATA_FIFO_EMPTY;
-
-	if (wait_for((I915_READ(MIPI_GEN_FIFO_STAT(port)) & mask) == mask, 100))
-		DRM_ERROR("DPI FIFOs are not empty\n");
-}

drivers/gpu/drm/i915/intel_dsi_cmd.h +0 -0

index 1d1a716e473a..70f24666a1f9 100644

This seems like the right thing to do. This also gets rid of a call to intel_dsi_pipe_to_port() which we want to remove eventually.

Signed-off-by Jani Nikula <[email protected]>

---
  drivers/gpu/drm/i915/intel_dsi.c | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)

drivers/gpu/drm/i915/intel_dsi.c +0 -1

index 36b19c7e87b9..49e186bc080f 100644
@@ -197,14 +197,14 @@ static void intel_dsi_enable(struct intel_encoder *encoder)
  {
  	struct drm_device *dev = encoder->base.dev;
  	struct drm_i915_private *dev_priv = dev->dev_private;
-	struct intel_crtc *intel_crtc = to_intel_crtc(encoder->base.crtc);

Add port parameter to wait_for_dsi_fifo_empty, and call it for each dsi port.

We can now remove the transitional intel_dsi_pipe_to_port() function.

Signed-off-by Jani Nikula <[email protected]>

---
  drivers/gpu/drm/i915/intel_dsi.c | 17 ++++++++++-------
  drivers/gpu/drm/i915/intel_dsi.h | 12 ------------
  2 files changed, 10 insertions(+), 19 deletions(-)

drivers/gpu/drm/i915/intel_dsi.c +10 -7

index e82cf5f65c9a..9b0eaa9db845 100644
@@ -42,13 +42,11 @@ static const struct intel_dsi_device intel_dsi_devices[] = {
  	},
  };
 
-static void wait_for_dsi_fifo_empty(struct intel_dsi *intel_dsi)
+static void wait_for_dsi_fifo_empty(struct intel_dsi *intel_dsi, enum port port)
  {
  	struct drm_encoder *encoder = &intel_dsi->base.base;
  	struct drm_device *dev = encoder->dev;
  	struct drm_i915_private *dev_priv = dev->dev_private;
-	struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc);
-	enum port port = intel_dsi_pipe_to_port(intel_crtc->pipe);
  	u32 mask;
 
  	mask = LP_CTRL_FIFO_EMPTY | HS_CTRL_FIFO_EMPTY |

@@ -230,7 +228,8 @@ static void intel_dsi_enable(struct intel_encoder *encoder)
  		if (intel_dsi->dev.dev_ops->enable)
  			intel_dsi->dev.dev_ops->enable(&intel_dsi->dev);
 
-		wait_for_dsi_fifo_empty(intel_dsi);
+		for_each_dsi_port(port, intel_dsi->ports)
+			wait_for_dsi_fifo_empty(intel_dsi, port);
 
  		intel_dsi_port_enable(encoder);
  	}

@@ -243,6 +242,7 @@ static void intel_dsi_pre_enable(struct intel_encoder *encoder)
  	struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);
  	struct intel_crtc *intel_crtc = to_intel_crtc(encoder->base.crtc);
  	enum pipe pipe = intel_crtc->pipe;
+	enum port port;
  	u32 tmp;
 
  	DRM_DEBUG_KMS("\n");

@@ -272,7 +272,8 @@ static void intel_dsi_pre_enable(struct intel_encoder *encoder)
  	if (intel_dsi->dev.dev_ops->send_otp_cmds)
  		intel_dsi->dev.dev_ops->send_otp_cmds(&intel_dsi->dev);
 
-	wait_for_dsi_fifo_empty(intel_dsi);
+	for_each_dsi_port(port, intel_dsi->ports)
+		wait_for_dsi_fifo_empty(intel_dsi, port);
 
  	/* Enable port in pre-enable phase itself because as per hw team
  	 * recommendation, port should be enabled befor plane & pipe */

@@ -315,7 +316,8 @@ static void intel_dsi_disable(struct intel_encoder *encoder)
  	DRM_DEBUG_KMS("\n");
 
  	if (is_vid_mode(intel_dsi)) {
-		wait_for_dsi_fifo_empty(intel_dsi);
+		for_each_dsi_port(port, intel_dsi->ports)
+			wait_for_dsi_fifo_empty(intel_dsi, port);
 
  		intel_dsi_port_disable(encoder);
  		msleep(2);

@@ -344,7 +346,8 @@ static void intel_dsi_disable(struct intel_encoder *encoder)
  	if (intel_dsi->dev.dev_ops->disable)
  		intel_dsi->dev.dev_ops->disable(&intel_dsi->dev);
 
-	wait_for_dsi_fifo_empty(intel_dsi);
+	for_each_dsi_port(port, intel_dsi->ports)
+		wait_for_dsi_fifo_empty(intel_dsi, port);
  }
 
  static void intel_dsi_clear_device_ready(struct intel_encoder *encoder)

drivers/gpu/drm/i915/intel_dsi.h +0 -5

index 8fe2064dd804..2bb8c46c7889 100644
@@ -137,18 +137,6 @@ struct intel_dsi {
  	u16 panel_pwr_cycle_delay;
  };
 
-/* XXX: Transitional before dual port configuration */
-static inline enum port intel_dsi_pipe_to_port(enum pipe pipe)
-{
-	if (pipe == PIPE_A)
-		return PORT_A;

Remove all the trivial and/or dummy callbacks from intel dsi device ops. Merge send_otp_cmds into panel_reset as they're called back to back.

This will be helpful for switching to use drm_panel for the callbacks. If we ever need the additional callbacks, we should add them to drm_panel funcs.

Signed-off-by Jani Nikula <[email protected]>

---
  drivers/gpu/drm/i915/intel_dsi.c           | 32 ++-------------------
  drivers/gpu/drm/i915/intel_dsi.h           | 20 -------------
  drivers/gpu/drm/i915/intel_dsi_panel_vbt.c | 45 ++----------------------------
  3 files changed, 5 insertions(+), 92 deletions(-)

drivers/gpu/drm/i915/intel_dsi.c +0 -7

index 9b0eaa9db845..fc218b7754b3 100644
@@ -70,12 +70,6 @@ static void band_gap_reset(struct drm_i915_private *dev_priv)
  	mutex_unlock(&dev_priv->dpio_lock);
  }
 
-static struct intel_dsi *intel_attached_dsi(struct drm_connector *connector)
-{
-	return container_of(intel_attached_encoder(connector),
-			    struct intel_dsi, base);
-}
-
  static inline bool is_vid_mode(struct intel_dsi *intel_dsi)
  {
  	return intel_dsi->operation_mode == INTEL_DSI_VIDEO_MODE;

@@ -99,7 +93,6 @@ static bool intel_dsi_compute_config(struct intel_encoder *encoder,
  	struct intel_connector *intel_connector = intel_dsi->attached_connector;
  	struct drm_display_mode *fixed_mode = intel_connector->panel.fixed_mode;
  	struct drm_display_mode *adjusted_mode = &config->adjusted_mode;
-	struct drm_display_mode *mode = &config->requested_mode;
 
  	DRM_DEBUG_KMS("\n");
 

drivers/gpu/drm/i915/intel_dsi.c +2 -19

  	return true;
  }
 

@@ -269,9 +258,6 @@ static void intel_dsi_pre_enable(struct intel_encoder *encoder)
  	if (intel_dsi->dev.dev_ops->panel_reset)
  		intel_dsi->dev.dev_ops->panel_reset(&intel_dsi->dev);
 
-	if (intel_dsi->dev.dev_ops->send_otp_cmds)
-		intel_dsi->dev.dev_ops->send_otp_cmds(&intel_dsi->dev);
-
  	for_each_dsi_port(port, intel_dsi->ports)
  		wait_for_dsi_fifo_empty(intel_dsi, port);
 

@@ -484,7 +470,6 @@ intel_dsi_mode_valid(struct drm_connector *connector,
  {
  	struct intel_connector *intel_connector = to_intel_connector(connector);
  	struct drm_display_mode *fixed_mode = intel_connector->panel.fixed_mode;
-	struct intel_dsi *intel_dsi = intel_attached_dsi(connector);
 
  	DRM_DEBUG_KMS("\n");
 

@@ -500,7 +485,7 @@ intel_dsi_mode_valid(struct drm_connector *connector,
  			return MODE_PANEL;
  	}
 
-	return intel_dsi->dev.dev_ops->mode_valid(&intel_dsi->dev, mode);
+	return MODE_OK;
  }
 
  /* return txclkesc cycles in terms of divider and duration in us */

@@ -749,20 +734,7 @@ static void intel_dsi_pre_pll_enable(struct intel_encoder *encoder)
  static enum drm_connector_status
  intel_dsi_detect(struct drm_connector *connector, bool force)
  {
-	struct intel_dsi *intel_dsi = intel_attached_dsi(connector);
-	struct intel_encoder *intel_encoder = &intel_dsi->base;
-	enum intel_display_power_domain power_domain;
-	enum drm_connector_status connector_status;
-	struct drm_i915_private *dev_priv = intel_encoder->base.dev->dev_private;
-
-	DRM_DEBUG_KMS("\n");
-	power_domain = intel_display_port_power_domain(intel_encoder);
-
-	intel_display_power_get(dev_priv, power_domain);
-	connector_status = intel_dsi->dev.dev_ops->detect(&intel_dsi->dev);
-	intel_display_power_put(dev_priv, power_domain);
-
-	return connector_status;
+	return connector_status_connected;
  }
 
  static int intel_dsi_get_modes(struct drm_connector *connector)

drivers/gpu/drm/i915/intel_dsi.h +0 -20

index 2bb8c46c7889..22f87036a256 100644
@@ -47,33 +47,13 @@ struct intel_dsi_dev_ops {
 
  	void (*disable_panel_power)(struct intel_dsi_device *dsi);
 
-	/* one time programmable commands if needed */
-	void (*send_otp_cmds)(struct intel_dsi_device *dsi);
-
  	/* This callback must be able to assume DSI commands can be sent */
  	void (*enable)(struct intel_dsi_device *dsi);
 
  	/* This callback must be able to assume DSI commands can be sent */
  	void (*disable)(struct intel_dsi_device *dsi);
 
-	int (*mode_valid)(struct intel_dsi_device *dsi,
-			  struct drm_display_mode *mode);
-
-	bool (*mode_fixup)(struct intel_dsi_device *dsi,
-			   const struct drm_display_mode *mode,
-			   struct drm_display_mode *adjusted_mode);
-
-	void (*mode_set)(struct intel_dsi_device *dsi,
-			 struct drm_display_mode *mode,
-			 struct drm_display_mode *adjusted_mode);
-
-	enum drm_connector_status (*detect)(struct intel_dsi_device *dsi);
-
-	bool (*get_hw_state)(struct intel_dsi_device *dev);
-
  	struct drm_display_mode *(*get_modes)(struct intel_dsi_device *dsi);
-
-	void (*destroy) (struct intel_dsi_device *dsi);
  };
 
  struct intel_dsi {

drivers/gpu/drm/i915/intel_dsi_panel_vbt.c +3 -38

index 5493aef5a6a3..b0e7327a485f 100644
@@ -559,18 +559,6 @@ static bool generic_init(struct intel_dsi_device *dsi)
  	return true;
  }
 
-static int generic_mode_valid(struct intel_dsi_device *dsi,
-		   struct drm_display_mode *mode)
-{
-	return MODE_OK;
-}
-
-static bool generic_mode_fixup(struct intel_dsi_device *dsi,
-		    const struct drm_display_mode *mode,
-		    struct drm_display_mode *adjusted_mode) {
-	return true;
-}
-
  static void generic_panel_reset(struct intel_dsi_device *dsi)
  {
  	struct intel_dsi *intel_dsi = container_of(dsi, struct intel_dsi, dev);

@@ -580,26 +568,18 @@ static void generic_panel_reset(struct intel_dsi_device *dsi)
  	char *sequence = dev_priv->vbt.dsi.sequence[MIPI_SEQ_ASSERT_RESET];
 
  	generic_exec_sequence(intel_dsi, sequence);
-}
-
-static void generic_disable_panel_power(struct intel_dsi_device *dsi)
-{
-	struct intel_dsi *intel_dsi = container_of(dsi, struct intel_dsi, dev);
-	struct drm_device *dev = intel_dsi->base.base.dev;
-	struct drm_i915_private *dev_priv = dev->dev_private;
-
-	char *sequence = dev_priv->vbt.dsi.sequence[MIPI_SEQ_DEASSERT_RESET];
 
+	sequence = dev_priv->vbt.dsi.sequence[MIPI_SEQ_INIT_OTP];
  	generic_exec_sequence(intel_dsi, sequence);
  }
 
-static void generic_send_otp_cmds(struct intel_dsi_device *dsi)
+static void generic_disable_panel_power(struct intel_dsi_device *dsi)
  {
  	struct intel_dsi *intel_dsi = container_of(dsi, struct intel_dsi, dev);
  	struct drm_device *dev = intel_dsi->base.base.dev;
  	struct drm_i915_private *dev_priv = dev->dev_private;
 
-	char *sequence = dev_priv->vbt.dsi.sequence[MIPI_SEQ_INIT_OTP];
+	char *sequence = dev_priv->vbt.dsi.sequence[MIPI_SEQ_DEASSERT_RESET];
 
  	generic_exec_sequence(intel_dsi, sequence);
  }

@@ -626,16 +606,6 @@ static void generic_disable(struct intel_dsi_device *dsi)
  	generic_exec_sequence(intel_dsi, sequence);
  }
 
-static enum drm_connector_status generic_detect(struct intel_dsi_device *dsi)
-{
-	return connector_status_connected;
-}
-
-static bool generic_get_hw_state(struct intel_dsi_device *dev)
-{
-	return true;
-}
-
  static struct drm_display_mode *generic_get_modes(struct intel_dsi_device *dsi)
  {
  	struct intel_dsi *intel_dsi = container_of(dsi, struct intel_dsi, dev);

@@ -646,20 +616,11 @@ static struct drm_display_mode *generic_get_modes(struct intel_dsi_device *dsi)
  	return dev_priv->vbt.lfp_lvds_vbt_mode;
  }
 
-static void generic_destroy(struct intel_dsi_device *dsi) { }
-
-/* Callbacks. We might not need them all. */
  struct intel_dsi_dev_ops vbt_generic_dsi_display_ops = {
  	.init = generic_init,
-	.mode_valid = generic_mode_valid,
-	.mode_fixup = generic_mode_fixup,

Const is good for you. No functional changes.

Signed-off-by Jani Nikula <[email protected]>

---
  drivers/gpu/drm/i915/intel_dsi_panel_vbt.c | 17 +++++++++--------
  1 file changed, 9 insertions(+), 8 deletions(-)

drivers/gpu/drm/i915/intel_dsi_panel_vbt.c +8 -6

index b0e7327a485f..561ec2981dfd 100644
@@ -99,7 +99,8 @@ static inline enum port intel_dsi_seq_port_to_port(u8 port)
  	return port ? PORT_C : PORT_A;
  }
 
-static u8 *mipi_exec_send_packet(struct intel_dsi *intel_dsi, u8 *data)
+static const u8 *mipi_exec_send_packet(struct intel_dsi *intel_dsi,
+				       const u8 *data)
  {
  	u8 type, byte, mode, vc, seq_port;
  	u16 len;

@@ -165,9 +166,9 @@ static u8 *mipi_exec_send_packet(struct intel_dsi *intel_dsi, u8 *data)
  	return data;
  }
 
-static u8 *mipi_exec_delay(struct intel_dsi *intel_dsi, u8 *data)
+static const u8 *mipi_exec_delay(struct intel_dsi *intel_dsi, const u8 *data)
  {
-	u32 delay = *((u32 *) data);
+	u32 delay = *((const u32 *) data);
 
  	usleep_range(delay, delay + 10);
  	data += 4;

@@ -175,7 +176,7 @@ static u8 *mipi_exec_delay(struct intel_dsi *intel_dsi, u8 *data)
  	return data;
  }
 
-static u8 *mipi_exec_gpio(struct intel_dsi *intel_dsi, u8 *data)
+static const u8 *mipi_exec_gpio(struct intel_dsi *intel_dsi, const u8 *data)
  {
  	u8 gpio, action;
  	u16 function, pad;

@@ -208,7 +209,8 @@ static u8 *mipi_exec_gpio(struct intel_dsi *intel_dsi, u8 *data)
  	return data;
  }
 
-typedef u8 * (*fn_mipi_elem_exec)(struct intel_dsi *intel_dsi, u8 *data);
+typedef const u8 * (*fn_mipi_elem_exec)(struct intel_dsi *intel_dsi,
+					const u8 *data);
  static const fn_mipi_elem_exec exec_elem[] = {
  	NULL, /* reserved */
  	mipi_exec_send_packet,

@@ -232,13 +234,12 @@ static const char * const seq_name[] = {
  	"MIPI_SEQ_DEASSERT_RESET"
  };
 
-static void generic_exec_sequence(struct intel_dsi *intel_dsi, char *sequence)
+static void generic_exec_sequence(struct intel_dsi *intel_dsi, const u8 *data)

This series ports our DSI code over to the drm_panel and mipi_dsi_host/mipi_dsi_device. There are some rough edges towards the end of the series, see commit message for patch 8 for details.

Patches 1-6 are prep work, fairly independent

Patch 7 ports the driver over to drm_panel

Patches 8-10 port the driver over to mipi_dsi_host/device

Patches 11-12 do some additional cleanup

BR,
Jani.

Jani Nikula (12):
drm/i915/dsi: call dpi_send_cmd() for each dsi port at a higher level drm/i915/dsi: set max return packet size for each dsi port drm/i915/dsi: move wait_for_dsi_fifo_empty to intel_dsi.c drm/i915/dsi: call wait_for_dsi_fifo_empty() for each dsi port drm/i915/dsi: remove unnecessary dsi device callbacks drm/i915/dsi: add some constness to vbt panel driver drm/i915/dsi: switch to drm_panel interface
drm/i915/dsi: add drm mipi dsi host support
drm/i915/dsi: make the vbt panel driver use mipi_dsi_device for
transfers
drm/i915/dsi: remove old read/write functions in favor of new stuff drm/i915/dsi: move dpi_send_cmd() to intel_dsi.c and make it static drm/i915/dsi: remove intel_dsi_cmd.c and the unused functions therein

  drivers/gpu/drm/i915/Kconfig               |   2 +
  drivers/gpu/drm/i915/Makefile              |   1 -
  drivers/gpu/drm/i915/intel_dsi.c           | 336 +++++++++++++++++-----
  drivers/gpu/drm/i915/intel_dsi.h           |  69 ++---
  drivers/gpu/drm/i915/intel_dsi_cmd.c       | 432 -----------------------------
  drivers/gpu/drm/i915/intel_dsi_cmd.h       |  78 ------
  drivers/gpu/drm/i915/intel_dsi_panel_vbt.c | 289 ++++++++++---------
  7 files changed, 441 insertions(+), 766 deletions(-)

delete mode 100644 drivers/gpu/drm/i915/intel_dsi_cmd.c

Quoted 23 lines · Jani Nikula

This seems like the right thing to do. This also gets rid of a call to intel_dsi_pipe_to_port() which we want to remove eventually.

Signed-off-by Jani Nikula <[email protected]>

---
  drivers/gpu/drm/i915/intel_dsi.c | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)

drivers/gpu/drm/i915/intel_dsi.c +1 -2

index 36b19c7e87b9..49e186bc080f 100644
@@ -197,14 +197,14 @@ static void intel_dsi_enable(struct intel_encoder *encoder)
  {
  	struct drm_device *dev = encoder->base.dev;
  	struct drm_i915_private *dev_priv = dev->dev_private;
-	struct intel_crtc *intel_crtc = to_intel_crtc(encoder->base.crtc);
  	struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);
-	enum port port = intel_dsi_pipe_to_port(intel_crtc->pipe);
+	enum port port;
 
  	DRM_DEBUG_KMS("\n");
 

drivers/gpu/drm/i915/intel_dsi.c static void intel_dsi_enable(struct intel_encoder *encoder) · line 207

Quoted 4 lines

drivers/gpu/drm/i915/intel_dsi.c +2 -1

  	if (is_cmd_mode(intel_dsi))
-		I915_WRITE(MIPI_MAX_RETURN_PKT_SIZE(port), 8 * 4);
+		for_each_dsi_port(port, intel_dsi->ports)
+			I915_WRITE(MIPI_MAX_RETURN_PKT_SIZE(port), 8 * 4);

Using for_each_dsi_port() macro in this way will make the following else below as "else" part for that "if" inside the macro, breaking the whole logic. We should enclose the true part of is_cmd_mode check in braces

drivers/gpu/drm/i915/intel_dsi.c static void intel_dsi_enable(struct intel_encoder *encoder) · line 210

Quoted 5 lines

drivers/gpu/drm/i915/intel_dsi.c +0 -0

  	else {
  		msleep(20); /* XXX */
  		for_each_dsi_port(port, intel_dsi->ports)

Regards
Shobhit

Quoted 44 lines · Jani Nikula

Remove all the trivial and/or dummy callbacks from intel dsi device ops. Merge send_otp_cmds into panel_reset as they're called back to back.

This will be helpful for switching to use drm_panel for the callbacks. If we ever need the additional callbacks, we should add them to drm_panel funcs.

Signed-off-by Jani Nikula <[email protected]>

---
  drivers/gpu/drm/i915/intel_dsi.c           | 32 ++-------------------
  drivers/gpu/drm/i915/intel_dsi.h           | 20 -------------
  drivers/gpu/drm/i915/intel_dsi_panel_vbt.c | 45 ++----------------------------
  3 files changed, 5 insertions(+), 92 deletions(-)

drivers/gpu/drm/i915/intel_dsi.c +0 -7

index 9b0eaa9db845..fc218b7754b3 100644
@@ -70,12 +70,6 @@ static void band_gap_reset(struct drm_i915_private *dev_priv)
  	mutex_unlock(&dev_priv->dpio_lock);
  }
 
-static struct intel_dsi *intel_attached_dsi(struct drm_connector *connector)
-{
-	return container_of(intel_attached_encoder(connector),
-			    struct intel_dsi, base);
-}
-
  static inline bool is_vid_mode(struct intel_dsi *intel_dsi)
  {
  	return intel_dsi->operation_mode == INTEL_DSI_VIDEO_MODE;

@@ -99,7 +93,6 @@ static bool intel_dsi_compute_config(struct intel_encoder *encoder,
  	struct intel_connector *intel_connector = intel_dsi->attached_connector;
  	struct drm_display_mode *fixed_mode = intel_connector->panel.fixed_mode;
  	struct drm_display_mode *adjusted_mode = &config->adjusted_mode;
-	struct drm_display_mode *mode = &config->requested_mode;
 
  	DRM_DEBUG_KMS("\n");
 

@@ -109,10 +102,6 @@ static bool intel_dsi_compute_config(struct intel_encoder *encoder,
  	/* DSI uses short packets for sync events, so clear mode flags for DSI */
  	adjusted_mode->flags = 0;
 

drivers/gpu/drm/i915/intel_dsi.c static bool intel_dsi_compute_config(struct intel_encoder *encoder, · line 115

Quoted 4 lines

drivers/gpu/drm/i915/intel_dsi.c +0 -4

-	if (intel_dsi->dev.dev_ops->mode_fixup)
-		return intel_dsi->dev.dev_ops->mode_fixup(&intel_dsi->dev,
-							  mode, adjusted_mode);
-

There had been a instance where we had to drive different resolution (lower) than the native one. Also in VBT there is a field to make this generic at least from driver perspective to give the needed target resolution. In case target resolution is same as native, nothing gets changed, else mode_fixup function adjusts the mode accordingly keeping timing as same and enabling scalar. Might not be useful in general, but did find a use internally.

Either way

Reviewed-by Shobhit Kumar <[email protected]>

Quoted 172 lines

drivers/gpu/drm/i915/intel_dsi.c +2 -19

  	return true;
  }
 

@@ -269,9 +258,6 @@ static void intel_dsi_pre_enable(struct intel_encoder *encoder)
  	if (intel_dsi->dev.dev_ops->panel_reset)
  		intel_dsi->dev.dev_ops->panel_reset(&intel_dsi->dev);
 
-	if (intel_dsi->dev.dev_ops->send_otp_cmds)
-		intel_dsi->dev.dev_ops->send_otp_cmds(&intel_dsi->dev);
-
  	for_each_dsi_port(port, intel_dsi->ports)
  		wait_for_dsi_fifo_empty(intel_dsi, port);
 

@@ -484,7 +470,6 @@ intel_dsi_mode_valid(struct drm_connector *connector,
  {
  	struct intel_connector *intel_connector = to_intel_connector(connector);
  	struct drm_display_mode *fixed_mode = intel_connector->panel.fixed_mode;
-	struct intel_dsi *intel_dsi = intel_attached_dsi(connector);
 
  	DRM_DEBUG_KMS("\n");
 

@@ -500,7 +485,7 @@ intel_dsi_mode_valid(struct drm_connector *connector,
  			return MODE_PANEL;
  	}
 
-	return intel_dsi->dev.dev_ops->mode_valid(&intel_dsi->dev, mode);
+	return MODE_OK;
  }
 
  /* return txclkesc cycles in terms of divider and duration in us */

@@ -749,20 +734,7 @@ static void intel_dsi_pre_pll_enable(struct intel_encoder *encoder)
  static enum drm_connector_status
  intel_dsi_detect(struct drm_connector *connector, bool force)
  {
-	struct intel_dsi *intel_dsi = intel_attached_dsi(connector);
-	struct intel_encoder *intel_encoder = &intel_dsi->base;
-	enum intel_display_power_domain power_domain;
-	enum drm_connector_status connector_status;
-	struct drm_i915_private *dev_priv = intel_encoder->base.dev->dev_private;
-
-	DRM_DEBUG_KMS("\n");
-	power_domain = intel_display_port_power_domain(intel_encoder);
-
-	intel_display_power_get(dev_priv, power_domain);
-	connector_status = intel_dsi->dev.dev_ops->detect(&intel_dsi->dev);
-	intel_display_power_put(dev_priv, power_domain);
-
-	return connector_status;
+	return connector_status_connected;
  }
 
  static int intel_dsi_get_modes(struct drm_connector *connector)

drivers/gpu/drm/i915/intel_dsi.h +0 -20

index 2bb8c46c7889..22f87036a256 100644
@@ -47,33 +47,13 @@ struct intel_dsi_dev_ops {
 
  	void (*disable_panel_power)(struct intel_dsi_device *dsi);
 
-	/* one time programmable commands if needed */
-	void (*send_otp_cmds)(struct intel_dsi_device *dsi);
-
  	/* This callback must be able to assume DSI commands can be sent */
  	void (*enable)(struct intel_dsi_device *dsi);
 
  	/* This callback must be able to assume DSI commands can be sent */
  	void (*disable)(struct intel_dsi_device *dsi);
 
-	int (*mode_valid)(struct intel_dsi_device *dsi,
-			  struct drm_display_mode *mode);
-
-	bool (*mode_fixup)(struct intel_dsi_device *dsi,
-			   const struct drm_display_mode *mode,
-			   struct drm_display_mode *adjusted_mode);
-
-	void (*mode_set)(struct intel_dsi_device *dsi,
-			 struct drm_display_mode *mode,
-			 struct drm_display_mode *adjusted_mode);
-
-	enum drm_connector_status (*detect)(struct intel_dsi_device *dsi);
-
-	bool (*get_hw_state)(struct intel_dsi_device *dev);
-
  	struct drm_display_mode *(*get_modes)(struct intel_dsi_device *dsi);
-
-	void (*destroy) (struct intel_dsi_device *dsi);
  };
 
  struct intel_dsi {

drivers/gpu/drm/i915/intel_dsi_panel_vbt.c +3 -38

index 5493aef5a6a3..b0e7327a485f 100644
@@ -559,18 +559,6 @@ static bool generic_init(struct intel_dsi_device *dsi)
  	return true;
  }
 
-static int generic_mode_valid(struct intel_dsi_device *dsi,
-		   struct drm_display_mode *mode)
-{
-	return MODE_OK;
-}
-
-static bool generic_mode_fixup(struct intel_dsi_device *dsi,
-		    const struct drm_display_mode *mode,
-		    struct drm_display_mode *adjusted_mode) {
-	return true;
-}
-
  static void generic_panel_reset(struct intel_dsi_device *dsi)
  {
  	struct intel_dsi *intel_dsi = container_of(dsi, struct intel_dsi, dev);

@@ -580,26 +568,18 @@ static void generic_panel_reset(struct intel_dsi_device *dsi)
  	char *sequence = dev_priv->vbt.dsi.sequence[MIPI_SEQ_ASSERT_RESET];
 
  	generic_exec_sequence(intel_dsi, sequence);
-}
-
-static void generic_disable_panel_power(struct intel_dsi_device *dsi)
-{
-	struct intel_dsi *intel_dsi = container_of(dsi, struct intel_dsi, dev);
-	struct drm_device *dev = intel_dsi->base.base.dev;
-	struct drm_i915_private *dev_priv = dev->dev_private;
-
-	char *sequence = dev_priv->vbt.dsi.sequence[MIPI_SEQ_DEASSERT_RESET];
 
+	sequence = dev_priv->vbt.dsi.sequence[MIPI_SEQ_INIT_OTP];
  	generic_exec_sequence(intel_dsi, sequence);
  }
 
-static void generic_send_otp_cmds(struct intel_dsi_device *dsi)
+static void generic_disable_panel_power(struct intel_dsi_device *dsi)
  {
  	struct intel_dsi *intel_dsi = container_of(dsi, struct intel_dsi, dev);
  	struct drm_device *dev = intel_dsi->base.base.dev;
  	struct drm_i915_private *dev_priv = dev->dev_private;
 
-	char *sequence = dev_priv->vbt.dsi.sequence[MIPI_SEQ_INIT_OTP];
+	char *sequence = dev_priv->vbt.dsi.sequence[MIPI_SEQ_DEASSERT_RESET];
 
  	generic_exec_sequence(intel_dsi, sequence);
  }

@@ -626,16 +606,6 @@ static void generic_disable(struct intel_dsi_device *dsi)
  	generic_exec_sequence(intel_dsi, sequence);
  }
 
-static enum drm_connector_status generic_detect(struct intel_dsi_device *dsi)
-{
-	return connector_status_connected;
-}
-
-static bool generic_get_hw_state(struct intel_dsi_device *dev)
-{
-	return true;
-}
-
  static struct drm_display_mode *generic_get_modes(struct intel_dsi_device *dsi)
  {
  	struct intel_dsi *intel_dsi = container_of(dsi, struct intel_dsi, dev);

@@ -646,20 +616,11 @@ static struct drm_display_mode *generic_get_modes(struct intel_dsi_device *dsi)
  	return dev_priv->vbt.lfp_lvds_vbt_mode;
  }
 
-static void generic_destroy(struct intel_dsi_device *dsi) { }
-
-/* Callbacks. We might not need them all. */
  struct intel_dsi_dev_ops vbt_generic_dsi_display_ops = {
  	.init = generic_init,
-	.mode_valid = generic_mode_valid,
-	.mode_fixup = generic_mode_fixup,

drivers/gpu/drm/i915/intel_dsi_panel_vbt.c static struct drm_display_mode *generic_get_modes(struct intel_dsi_device *dsi) · line 626

Quoted 10 lines

drivers/gpu/drm/i915/intel_dsi_panel_vbt.c +0 -4

  	.panel_reset = generic_panel_reset,
  	.disable_panel_power = generic_disable_panel_power,
-	.send_otp_cmds = generic_send_otp_cmds,
  	.enable = generic_enable,
  	.disable = generic_disable,
-	.detect = generic_detect,
-	.get_hw_state = generic_get_hw_state,
  	.get_modes = generic_get_modes,
-	.destroy = generic_destroy,
  };

Regards
Shobhit
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Quoted 5 lines · Jani Nikula

This series ports our DSI code over to the drm_panel and mipi_dsi_host/mipi_dsi_device. There are some rough edges towards the end of the series, see commit message for patch 8 for details.

Patches 1-6 are prep work, fairly independent

While I continue to review, quick test of patches show that till here it is fine(with minor fix for Patch 2), but from Patch 7 on wards things really don't work.

Quoted 35 lines

Patch 7 ports the driver over to drm_panel

Patches 8-10 port the driver over to mipi_dsi_host/device

Patches 11-12 do some additional cleanup

BR,
Jani.

Jani Nikula (12):
drm/i915/dsi: call dpi_send_cmd() for each dsi port at a higher level drm/i915/dsi: set max return packet size for each dsi port drm/i915/dsi: move wait_for_dsi_fifo_empty to intel_dsi.c drm/i915/dsi: call wait_for_dsi_fifo_empty() for each dsi port drm/i915/dsi: remove unnecessary dsi device callbacks drm/i915/dsi: add some constness to vbt panel driver drm/i915/dsi: switch to drm_panel interface
drm/i915/dsi: add drm mipi dsi host support
drm/i915/dsi: make the vbt panel driver use mipi_dsi_device for
transfers
drm/i915/dsi: remove old read/write functions in favor of new stuff drm/i915/dsi: move dpi_send_cmd() to intel_dsi.c and make it static drm/i915/dsi: remove intel_dsi_cmd.c and the unused functions therein

  drivers/gpu/drm/i915/Kconfig               |   2 +
  drivers/gpu/drm/i915/Makefile              |   1 -
  drivers/gpu/drm/i915/intel_dsi.c           | 336 +++++++++++++++++-----
  drivers/gpu/drm/i915/intel_dsi.h           |  69 ++---
  drivers/gpu/drm/i915/intel_dsi_cmd.c       | 432 -----------------------------
  drivers/gpu/drm/i915/intel_dsi_cmd.h       |  78 ------
  drivers/gpu/drm/i915/intel_dsi_panel_vbt.c | 289 ++++++++++---------
  7 files changed, 441 insertions(+), 766 deletions(-)

Quoted 2 lines

delete mode 100644 drivers/gpu/drm/i915/intel_dsi_cmd.c

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

This seems like the right thing to do. This also gets rid of a call to intel_dsi_pipe_to_port() which we want to remove eventually.

v2: add braces to fix else logic (Shobhit)

Signed-off-by Jani Nikula <[email protected]>

---
  drivers/gpu/drm/i915/intel_dsi.c | 10 +++++-----
  1 file changed, 5 insertions(+), 5 deletions(-)

drivers/gpu/drm/i915/intel_dsi.c +1 -2

index 4bb9886fa2cf..dac41046a0cc 100644
@@ -197,15 +197,15 @@ static void intel_dsi_enable(struct intel_encoder *encoder)
  {
  	struct drm_device *dev = encoder->base.dev;
  	struct drm_i915_private *dev_priv = dev->dev_private;
-	struct intel_crtc *intel_crtc = to_intel_crtc(encoder->base.crtc);
  	struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);
-	enum port port = intel_dsi_pipe_to_port(intel_crtc->pipe);
+	enum port port;
 
  	DRM_DEBUG_KMS("\n");
 

Quoted 7 lines · Shobhit Kumar

Quoted 5 lines · Jani Nikula

This series ports our DSI code over to the drm_panel and mipi_dsi_host/mipi_dsi_device. There are some rough edges towards the end of the series, see commit message for patch 8 for details.

Patches 1-6 are prep work, fairly independent

Quoted 3 lines

While I continue to review, quick test of patches show that till here it is fine(with minor fix for Patch 2), but from Patch 7 on wards things really don't work.

Okay, thanks for the review so far and trying it out.

What breaks down with patch 7? Which device are you trying this on?

BR,
Jani.

Quoted 41 lines

Quoted 35 lines

Patch 7 ports the driver over to drm_panel

Patches 8-10 port the driver over to mipi_dsi_host/device

Patches 11-12 do some additional cleanup

BR,
Jani.

Jani Nikula (12):
drm/i915/dsi: call dpi_send_cmd() for each dsi port at a higher level drm/i915/dsi: set max return packet size for each dsi port drm/i915/dsi: move wait_for_dsi_fifo_empty to intel_dsi.c drm/i915/dsi: call wait_for_dsi_fifo_empty() for each dsi port drm/i915/dsi: remove unnecessary dsi device callbacks drm/i915/dsi: add some constness to vbt panel driver drm/i915/dsi: switch to drm_panel interface
drm/i915/dsi: add drm mipi dsi host support
drm/i915/dsi: make the vbt panel driver use mipi_dsi_device for
transfers
drm/i915/dsi: remove old read/write functions in favor of new stuff drm/i915/dsi: move dpi_send_cmd() to intel_dsi.c and make it static drm/i915/dsi: remove intel_dsi_cmd.c and the unused functions therein

   drivers/gpu/drm/i915/Kconfig               |   2 +
   drivers/gpu/drm/i915/Makefile              |   1 -
   drivers/gpu/drm/i915/intel_dsi.c           | 336 +++++++++++++++++-----
   drivers/gpu/drm/i915/intel_dsi.h           |  69 ++---
   drivers/gpu/drm/i915/intel_dsi_cmd.c       | 432 -----------------------------
   drivers/gpu/drm/i915/intel_dsi_cmd.h       |  78 ------
   drivers/gpu/drm/i915/intel_dsi_panel_vbt.c | 289 ++++++++++---------
   7 files changed, 441 insertions(+), 766 deletions(-)

Quoted 2 lines

delete mode 100644 drivers/gpu/drm/i915/intel_dsi_cmd.c

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Quoted 45 lines · Shobhit Kumar

Quoted 44 lines · Jani Nikula

Remove all the trivial and/or dummy callbacks from intel dsi device ops. Merge send_otp_cmds into panel_reset as they're called back to back.

This will be helpful for switching to use drm_panel for the callbacks. If we ever need the additional callbacks, we should add them to drm_panel funcs.

Signed-off-by Jani Nikula <[email protected]>

---
   drivers/gpu/drm/i915/intel_dsi.c           | 32 ++-------------------
   drivers/gpu/drm/i915/intel_dsi.h           | 20 -------------
   drivers/gpu/drm/i915/intel_dsi_panel_vbt.c | 45 ++----------------------------
   3 files changed, 5 insertions(+), 92 deletions(-)

drivers/gpu/drm/i915/intel_dsi.c +0 -7

index 9b0eaa9db845..fc218b7754b3 100644
@@ -70,12 +70,6 @@ static void band_gap_reset(struct drm_i915_private *dev_priv)
   	mutex_unlock(&dev_priv->dpio_lock);
   }
 
-static struct intel_dsi *intel_attached_dsi(struct drm_connector *connector)
-{
-	return container_of(intel_attached_encoder(connector),
-			    struct intel_dsi, base);
-}
-
   static inline bool is_vid_mode(struct intel_dsi *intel_dsi)
   {
   	return intel_dsi->operation_mode == INTEL_DSI_VIDEO_MODE;

@@ -99,7 +93,6 @@ static bool intel_dsi_compute_config(struct intel_encoder *encoder,
   	struct intel_connector *intel_connector = intel_dsi->attached_connector;
   	struct drm_display_mode *fixed_mode = intel_connector->panel.fixed_mode;
   	struct drm_display_mode *adjusted_mode = &config->adjusted_mode;
-	struct drm_display_mode *mode = &config->requested_mode;
 
   	DRM_DEBUG_KMS("\n");
 

@@ -109,10 +102,6 @@ static bool intel_dsi_compute_config(struct intel_encoder *encoder,
   	/* DSI uses short packets for sync events, so clear mode flags for DSI */
   	adjusted_mode->flags = 0;
 

Quoted 12 lines

drivers/gpu/drm/i915/intel_dsi.c static bool intel_dsi_compute_config(struct intel_encoder *encoder, · line 115

Quoted 4 lines

drivers/gpu/drm/i915/intel_dsi.c +0 -4

-	if (intel_dsi->dev.dev_ops->mode_fixup)
-		return intel_dsi->dev.dev_ops->mode_fixup(&intel_dsi->dev,
-							  mode, adjusted_mode);
-

There had been a instance where we had to drive different resolution (lower) than the native one. Also in VBT there is a field to make this generic at least from driver perspective to give the needed target resolution. In case target resolution is same as native, nothing gets changed, else mode_fixup function adjusts the mode accordingly keeping timing as same and enabling scalar. Might not be useful in general, but did find a use internally.

Can we just have the driver return the desired mode from .get_modes in that case?

BR,
Jani.

Quoted 194 lines

Either way

Reviewed-by Shobhit Kumar <[email protected]>

Quoted 172 lines

drivers/gpu/drm/i915/intel_dsi.c +2 -19

   	return true;
   }
 

@@ -269,9 +258,6 @@ static void intel_dsi_pre_enable(struct intel_encoder *encoder)
   	if (intel_dsi->dev.dev_ops->panel_reset)
   		intel_dsi->dev.dev_ops->panel_reset(&intel_dsi->dev);
 
-	if (intel_dsi->dev.dev_ops->send_otp_cmds)
-		intel_dsi->dev.dev_ops->send_otp_cmds(&intel_dsi->dev);
-
   	for_each_dsi_port(port, intel_dsi->ports)
   		wait_for_dsi_fifo_empty(intel_dsi, port);
 

@@ -484,7 +470,6 @@ intel_dsi_mode_valid(struct drm_connector *connector,
   {
   	struct intel_connector *intel_connector = to_intel_connector(connector);
   	struct drm_display_mode *fixed_mode = intel_connector->panel.fixed_mode;
-	struct intel_dsi *intel_dsi = intel_attached_dsi(connector);
 
   	DRM_DEBUG_KMS("\n");
 

@@ -500,7 +485,7 @@ intel_dsi_mode_valid(struct drm_connector *connector,
   			return MODE_PANEL;
   	}
 
-	return intel_dsi->dev.dev_ops->mode_valid(&intel_dsi->dev, mode);
+	return MODE_OK;
   }
 
   /* return txclkesc cycles in terms of divider and duration in us */

@@ -749,20 +734,7 @@ static void intel_dsi_pre_pll_enable(struct intel_encoder *encoder)
   static enum drm_connector_status
   intel_dsi_detect(struct drm_connector *connector, bool force)
   {
-	struct intel_dsi *intel_dsi = intel_attached_dsi(connector);
-	struct intel_encoder *intel_encoder = &intel_dsi->base;
-	enum intel_display_power_domain power_domain;
-	enum drm_connector_status connector_status;
-	struct drm_i915_private *dev_priv = intel_encoder->base.dev->dev_private;
-
-	DRM_DEBUG_KMS("\n");
-	power_domain = intel_display_port_power_domain(intel_encoder);
-
-	intel_display_power_get(dev_priv, power_domain);
-	connector_status = intel_dsi->dev.dev_ops->detect(&intel_dsi->dev);
-	intel_display_power_put(dev_priv, power_domain);
-
-	return connector_status;
+	return connector_status_connected;
   }
 
   static int intel_dsi_get_modes(struct drm_connector *connector)

drivers/gpu/drm/i915/intel_dsi.h +0 -20

index 2bb8c46c7889..22f87036a256 100644
@@ -47,33 +47,13 @@ struct intel_dsi_dev_ops {
 
   	void (*disable_panel_power)(struct intel_dsi_device *dsi);
 
-	/* one time programmable commands if needed */
-	void (*send_otp_cmds)(struct intel_dsi_device *dsi);
-
   	/* This callback must be able to assume DSI commands can be sent */
   	void (*enable)(struct intel_dsi_device *dsi);
 
   	/* This callback must be able to assume DSI commands can be sent */
   	void (*disable)(struct intel_dsi_device *dsi);
 
-	int (*mode_valid)(struct intel_dsi_device *dsi,
-			  struct drm_display_mode *mode);
-
-	bool (*mode_fixup)(struct intel_dsi_device *dsi,
-			   const struct drm_display_mode *mode,
-			   struct drm_display_mode *adjusted_mode);
-
-	void (*mode_set)(struct intel_dsi_device *dsi,
-			 struct drm_display_mode *mode,
-			 struct drm_display_mode *adjusted_mode);
-
-	enum drm_connector_status (*detect)(struct intel_dsi_device *dsi);
-
-	bool (*get_hw_state)(struct intel_dsi_device *dev);
-
   	struct drm_display_mode *(*get_modes)(struct intel_dsi_device *dsi);
-
-	void (*destroy) (struct intel_dsi_device *dsi);
   };
 
   struct intel_dsi {

drivers/gpu/drm/i915/intel_dsi_panel_vbt.c +3 -38

index 5493aef5a6a3..b0e7327a485f 100644
@@ -559,18 +559,6 @@ static bool generic_init(struct intel_dsi_device *dsi)
   	return true;
   }
 
-static int generic_mode_valid(struct intel_dsi_device *dsi,
-		   struct drm_display_mode *mode)
-{
-	return MODE_OK;
-}
-
-static bool generic_mode_fixup(struct intel_dsi_device *dsi,
-		    const struct drm_display_mode *mode,
-		    struct drm_display_mode *adjusted_mode) {
-	return true;
-}
-
   static void generic_panel_reset(struct intel_dsi_device *dsi)
   {
   	struct intel_dsi *intel_dsi = container_of(dsi, struct intel_dsi, dev);

@@ -580,26 +568,18 @@ static void generic_panel_reset(struct intel_dsi_device *dsi)
   	char *sequence = dev_priv->vbt.dsi.sequence[MIPI_SEQ_ASSERT_RESET];
 
   	generic_exec_sequence(intel_dsi, sequence);
-}
-
-static void generic_disable_panel_power(struct intel_dsi_device *dsi)
-{
-	struct intel_dsi *intel_dsi = container_of(dsi, struct intel_dsi, dev);
-	struct drm_device *dev = intel_dsi->base.base.dev;
-	struct drm_i915_private *dev_priv = dev->dev_private;
-
-	char *sequence = dev_priv->vbt.dsi.sequence[MIPI_SEQ_DEASSERT_RESET];
 
+	sequence = dev_priv->vbt.dsi.sequence[MIPI_SEQ_INIT_OTP];
   	generic_exec_sequence(intel_dsi, sequence);
   }
 
-static void generic_send_otp_cmds(struct intel_dsi_device *dsi)
+static void generic_disable_panel_power(struct intel_dsi_device *dsi)
   {
   	struct intel_dsi *intel_dsi = container_of(dsi, struct intel_dsi, dev);
   	struct drm_device *dev = intel_dsi->base.base.dev;
   	struct drm_i915_private *dev_priv = dev->dev_private;
 
-	char *sequence = dev_priv->vbt.dsi.sequence[MIPI_SEQ_INIT_OTP];
+	char *sequence = dev_priv->vbt.dsi.sequence[MIPI_SEQ_DEASSERT_RESET];
 
   	generic_exec_sequence(intel_dsi, sequence);
   }

@@ -626,16 +606,6 @@ static void generic_disable(struct intel_dsi_device *dsi)
   	generic_exec_sequence(intel_dsi, sequence);
   }
 
-static enum drm_connector_status generic_detect(struct intel_dsi_device *dsi)
-{
-	return connector_status_connected;
-}
-
-static bool generic_get_hw_state(struct intel_dsi_device *dev)
-{
-	return true;
-}
-
   static struct drm_display_mode *generic_get_modes(struct intel_dsi_device *dsi)
   {
   	struct intel_dsi *intel_dsi = container_of(dsi, struct intel_dsi, dev);

@@ -646,20 +616,11 @@ static struct drm_display_mode *generic_get_modes(struct intel_dsi_device *dsi)
   	return dev_priv->vbt.lfp_lvds_vbt_mode;
   }
 
-static void generic_destroy(struct intel_dsi_device *dsi) { }
-
-/* Callbacks. We might not need them all. */
   struct intel_dsi_dev_ops vbt_generic_dsi_display_ops = {
   	.init = generic_init,
-	.mode_valid = generic_mode_valid,
-	.mode_fixup = generic_mode_fixup,

drivers/gpu/drm/i915/intel_dsi_panel_vbt.c static struct drm_display_mode *generic_get_modes(struct intel_dsi_device *dsi) · line 626

Quoted 10 lines

drivers/gpu/drm/i915/intel_dsi_panel_vbt.c +0 -4

   	.panel_reset = generic_panel_reset,
   	.disable_panel_power = generic_disable_panel_power,
-	.send_otp_cmds = generic_send_otp_cmds,
   	.enable = generic_enable,
   	.disable = generic_disable,
-	.detect = generic_detect,
-	.get_hw_state = generic_get_hw_state,
   	.get_modes = generic_get_modes,
-	.destroy = generic_destroy,
   };

Regards
Shobhit
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Replace intel_dsi_device and intel_dsi_dev_ops with drm_panel and drm_panel_funcs. They are adequate for what we have now, and if we end up needing more than this we should improve drm_panel. This will keep us better aligned with the drm core infrastructure.

The panel driver initialization changes a bit. It still remains hideous, but fixing that is beyond the scope here.

Signed-off-by Jani Nikula <[email protected]>

---
  drivers/gpu/drm/i915/Kconfig               |   1 +
  drivers/gpu/drm/i915/intel_dsi.c           |  68 +++++++----
  drivers/gpu/drm/i915/intel_dsi.h           |  27 +----
  drivers/gpu/drm/i915/intel_dsi_panel_vbt.c | 179 ++++++++++++++++++-----------
  4 files changed, 156 insertions(+), 119 deletions(-)

drivers/gpu/drm/i915/Kconfig +1 -0

index 4e39ab34eb1c..da196cd07263 100644
@@ -11,6 +11,7 @@ config DRM_I915
  	select SHMEM
  	select TMPFS
  	select DRM_KMS_HELPER
+	select DRM_PANEL
  	# i915 depends on ACPI_VIDEO when ACPI is enabled
  	# but for select to work, need to select ACPI_VIDEO's dependencies, ick
  	select BACKLIGHT_LCD_SUPPORT if ACPI

drivers/gpu/drm/i915/intel_dsi.c +31 -23

index fc218b7754b3..19a9955eab0e 100644
@@ -27,18 +27,20 @@
  #include <drm/drm_crtc.h>
  #include <drm/drm_edid.h>
  #include <drm/i915_drm.h>
+#include <drm/drm_panel.h>
  #include <linux/slab.h>
  #include "i915_drv.h"
  #include "intel_drv.h"
  #include "intel_dsi.h"
  #include "intel_dsi_cmd.h"
 
-/* the sub-encoders aka panel drivers */
-static const struct intel_dsi_device intel_dsi_devices[] = {
+static const struct {
+	u16 panel_id;
+	struct drm_panel * (*init)(struct intel_dsi *intel_dsi, u16 panel_id);
+} intel_dsi_drivers[] = {
  	{
  		.panel_id = MIPI_DSI_GENERIC_PANEL_ID,
-		.name = "vbt-generic-dsi-vid-mode-display",
-		.dev_ops = &vbt_generic_dsi_display_ops,
+		.init = vbt_panel_init,
  	},
  };
 

@@ -214,8 +216,7 @@ static void intel_dsi_enable(struct intel_encoder *encoder)
  			dpi_send_cmd(intel_dsi, TURN_ON, DPI_LP_MODE_EN, port);
  		msleep(100);
 
-		if (intel_dsi->dev.dev_ops->enable)
-			intel_dsi->dev.dev_ops->enable(&intel_dsi->dev);
+		drm_panel_enable(intel_dsi->panel);
 
  		for_each_dsi_port(port, intel_dsi->ports)
  			wait_for_dsi_fifo_empty(intel_dsi, port);

@@ -255,8 +256,7 @@ static void intel_dsi_pre_enable(struct intel_encoder *encoder)
 
  	msleep(intel_dsi->panel_on_delay);
 
-	if (intel_dsi->dev.dev_ops->panel_reset)
-		intel_dsi->dev.dev_ops->panel_reset(&intel_dsi->dev);
+	drm_panel_prepare(intel_dsi->panel);
 
  	for_each_dsi_port(port, intel_dsi->ports)
  		wait_for_dsi_fifo_empty(intel_dsi, port);

@@ -329,8 +329,7 @@ static void intel_dsi_disable(struct intel_encoder *encoder)
  	}
  	/* if disable packets are sent before sending shutdown packet then in
  	 * some next enable sequence send turn on packet error is observed */
-	if (intel_dsi->dev.dev_ops->disable)
-		intel_dsi->dev.dev_ops->disable(&intel_dsi->dev);
+	drm_panel_disable(intel_dsi->panel);
 
  	for_each_dsi_port(port, intel_dsi->ports)
  		wait_for_dsi_fifo_empty(intel_dsi, port);

@@ -395,8 +394,7 @@ static void intel_dsi_post_disable(struct intel_encoder *encoder)
  	val &= ~DPOUNIT_CLOCK_GATE_DISABLE;
  	I915_WRITE(DSPCLK_GATE_D, val);
 
-	if (intel_dsi->dev.dev_ops->disable_panel_power)
-		intel_dsi->dev.dev_ops->disable_panel_power(&intel_dsi->dev);
+	drm_panel_unprepare(intel_dsi->panel);
 
  	msleep(intel_dsi->panel_off_delay);
  	msleep(intel_dsi->panel_pwr_cycle_delay);

@@ -760,7 +758,7 @@ static int intel_dsi_get_modes(struct drm_connector *connector)
  	return 1;
  }
 
-static void intel_dsi_destroy(struct drm_connector *connector)
+static void intel_dsi_connector_destroy(struct drm_connector *connector)
  {
  	struct intel_connector *intel_connector = to_intel_connector(connector);
 

@@ -770,8 +768,20 @@ static void intel_dsi_destroy(struct drm_connector *connector)
  	kfree(connector);
  }
 
+static void intel_dsi_encoder_destroy(struct drm_encoder *encoder)
+{
+	struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder);
+
+	if (intel_dsi->panel) {
+		drm_panel_detach(intel_dsi->panel);
+		/* XXX: Logically this call belongs in the panel driver. */
+		drm_panel_remove(intel_dsi->panel);
+	}
+	intel_encoder_destroy(encoder);
+}
+
  static const struct drm_encoder_funcs intel_dsi_funcs = {
-	.destroy = intel_encoder_destroy,
+	.destroy = intel_dsi_encoder_destroy,
  };
 
  static const struct drm_connector_helper_funcs intel_dsi_connector_helper_funcs = {

@@ -783,7 +793,7 @@ static const struct drm_connector_helper_funcs intel_dsi_connector_helper_funcs
  static const struct drm_connector_funcs intel_dsi_connector_funcs = {
  	.dpms = intel_connector_dpms,
  	.detect = intel_dsi_detect,
-	.destroy = intel_dsi_destroy,
+	.destroy = intel_dsi_connector_destroy,
  	.fill_modes = drm_helper_probe_single_connector_modes,
  };
 

@@ -794,9 +804,8 @@ void intel_dsi_init(struct drm_device *dev)
  	struct drm_encoder *encoder;
  	struct intel_connector *intel_connector;
  	struct drm_connector *connector;
-	struct drm_display_mode *fixed_mode = NULL;
+	struct drm_display_mode *scan, *fixed_mode = NULL;
  	struct drm_i915_private *dev_priv = dev->dev_private;
-	const struct intel_dsi_device *dsi;
  	unsigned int i;
 
  	DRM_DEBUG_KMS("\n");

@@ -853,15 +862,14 @@ void intel_dsi_init(struct drm_device *dev)
  		intel_dsi->ports = (1 << PORT_C);
  	}
 
-	for (i = 0; i < ARRAY_SIZE(intel_dsi_devices); i++) {
-		dsi = &intel_dsi_devices[i];
-		intel_dsi->dev = *dsi;
-
-		if (dsi->dev_ops->init(&intel_dsi->dev))
+	for (i = 0; i < ARRAY_SIZE(intel_dsi_drivers); i++) {
+		intel_dsi->panel = intel_dsi_drivers[i].init(intel_dsi,
+							     intel_dsi_drivers[i].panel_id);
+		if (intel_dsi->panel)
  			break;
  	}
 
-	if (i == ARRAY_SIZE(intel_dsi_devices)) {
+	if (!intel_dsi->panel) {
  		DRM_DEBUG_KMS("no device found\n");
  		goto err;
  	}

drivers/gpu/drm/i915/intel_dsi.c +10 -1

+
+	mutex_lock(&dev->mode_config.mutex);
+	list_for_each_entry(scan, &connector->probed_modes, head) {
+		if ((scan->type & DRM_MODE_TYPE_PREFERRED)) {
+			fixed_mode = drm_mode_duplicate(dev, scan);
+			break;
+		}
+	}
+	mutex_unlock(&dev->mode_config.mutex);
+
  	if (!fixed_mode) {
  		DRM_DEBUG_KMS("no fixed mode\n");
  		goto err;
  	}
 
-	fixed_mode->type |= DRM_MODE_TYPE_PREFERRED;
  	intel_panel_init(&intel_connector->panel, fixed_mode, NULL);
 
  	return;

drivers/gpu/drm/i915/intel_dsi.h +2 -25

index 22f87036a256..fc0b2b8d90f1 100644
@@ -33,33 +33,10 @@
  #define DSI_DUAL_LINK_FRONT_BACK	1
  #define DSI_DUAL_LINK_PIXEL_ALT		2
 
-struct intel_dsi_device {
-	unsigned int panel_id;
-	const char *name;
-	const struct intel_dsi_dev_ops *dev_ops;
-	void *dev_priv;
-};
-
-struct intel_dsi_dev_ops {
-	bool (*init)(struct intel_dsi_device *dsi);
-
-	void (*panel_reset)(struct intel_dsi_device *dsi);
-
-	void (*disable_panel_power)(struct intel_dsi_device *dsi);
-
-	/* This callback must be able to assume DSI commands can be sent */
-	void (*enable)(struct intel_dsi_device *dsi);
-
-	/* This callback must be able to assume DSI commands can be sent */
-	void (*disable)(struct intel_dsi_device *dsi);
-
-	struct drm_display_mode *(*get_modes)(struct intel_dsi_device *dsi);
-};
-
  struct intel_dsi {
  	struct intel_encoder base;
 
-	struct intel_dsi_device dev;
+	struct drm_panel *panel;
 
  	struct intel_connector *attached_connector;
 

@@ -130,6 +107,6 @@ extern void vlv_enable_dsi_pll(struct intel_encoder *encoder);
  extern void vlv_disable_dsi_pll(struct intel_encoder *encoder);
  extern u32 vlv_get_dsi_pclk(struct intel_encoder *encoder, int pipe_bpp);
 
-extern struct intel_dsi_dev_ops vbt_generic_dsi_display_ops;
+struct drm_panel *vbt_panel_init(struct intel_dsi *intel_dsi, u16 panel_id);
 
  #endif /* _INTEL_DSI_H */

drivers/gpu/drm/i915/intel_dsi_panel_vbt.c +104 -37

index 561ec2981dfd..204f54df8fe1 100644
@@ -28,6 +28,7 @@
  #include <drm/drm_crtc.h>
  #include <drm/drm_edid.h>
  #include <drm/i915_drm.h>
+#include <drm/drm_panel.h>
  #include <linux/slab.h>
  #include <video/mipi_display.h>
  #include <asm/intel-mid.h>

@@ -37,6 +38,16 @@
  #include "intel_dsi.h"
  #include "intel_dsi_cmd.h"
 
+struct vbt_panel {
+	struct drm_panel panel;
+	struct intel_dsi *intel_dsi;
+};
+
+static inline struct vbt_panel *to_vbt_panel(struct drm_panel *panel)
+{
+	return container_of(panel, struct vbt_panel, panel);
+}
+
  #define MIPI_TRANSFER_MODE_SHIFT	0
  #define MIPI_VIRTUAL_CHANNEL_SHIFT	1
  #define MIPI_PORT_SHIFT			3

@@ -272,14 +283,103 @@ static void generic_exec_sequence(struct intel_dsi *intel_dsi, const u8 *data)
  	}
  }
 
-static bool generic_init(struct intel_dsi_device *dsi)
+static int vbt_panel_prepare(struct drm_panel *panel)
+{
+	struct vbt_panel *vbt_panel = to_vbt_panel(panel);
+	struct intel_dsi *intel_dsi = vbt_panel->intel_dsi;
+	struct drm_device *dev = intel_dsi->base.base.dev;
+	struct drm_i915_private *dev_priv = dev->dev_private;
+	const u8 *sequence;
+
+	sequence = dev_priv->vbt.dsi.sequence[MIPI_SEQ_ASSERT_RESET];
+	generic_exec_sequence(intel_dsi, sequence);
+
+	sequence = dev_priv->vbt.dsi.sequence[MIPI_SEQ_INIT_OTP];
+	generic_exec_sequence(intel_dsi, sequence);
+
+	return 0;
+}
+
+static int vbt_panel_unprepare(struct drm_panel *panel)
+{
+	struct vbt_panel *vbt_panel = to_vbt_panel(panel);
+	struct intel_dsi *intel_dsi = vbt_panel->intel_dsi;
+	struct drm_device *dev = intel_dsi->base.base.dev;
+	struct drm_i915_private *dev_priv = dev->dev_private;
+	const u8 *sequence;
+
+	sequence = dev_priv->vbt.dsi.sequence[MIPI_SEQ_DEASSERT_RESET];
+	generic_exec_sequence(intel_dsi, sequence);
+
+	return 0;
+}
+
+static int vbt_panel_enable(struct drm_panel *panel)
+{
+	struct vbt_panel *vbt_panel = to_vbt_panel(panel);
+	struct intel_dsi *intel_dsi = vbt_panel->intel_dsi;
+	struct drm_device *dev = intel_dsi->base.base.dev;
+	struct drm_i915_private *dev_priv = dev->dev_private;
+	const u8 *sequence;
+
+	sequence = dev_priv->vbt.dsi.sequence[MIPI_SEQ_DISPLAY_ON];
+	generic_exec_sequence(intel_dsi, sequence);
+
+	return 0;
+}
+
+static int vbt_panel_disable(struct drm_panel *panel)
+{
+	struct vbt_panel *vbt_panel = to_vbt_panel(panel);
+	struct intel_dsi *intel_dsi = vbt_panel->intel_dsi;
+	struct drm_device *dev = intel_dsi->base.base.dev;
+	struct drm_i915_private *dev_priv = dev->dev_private;
+	const u8 *sequence;
+
+	sequence = dev_priv->vbt.dsi.sequence[MIPI_SEQ_DISPLAY_OFF];
+	generic_exec_sequence(intel_dsi, sequence);
+
+	return 0;
+}
+
+static int vbt_panel_get_modes(struct drm_panel *panel)
+{
+	struct vbt_panel *vbt_panel = to_vbt_panel(panel);
+	struct intel_dsi *intel_dsi = vbt_panel->intel_dsi;
+	struct drm_device *dev = intel_dsi->base.base.dev;
+	struct drm_i915_private *dev_priv = dev->dev_private;
+	struct drm_display_mode *mode;
+
+	if (!panel->connector)
+		return 0;
+
+	mode = drm_mode_duplicate(dev, dev_priv->vbt.lfp_lvds_vbt_mode);
+	if (!mode)
+		return 0;
+
+	mode->type |= DRM_MODE_TYPE_PREFERRED;
+
+	drm_mode_probed_add(panel->connector, mode);
+
+	return 1;
+}
+
+static const struct drm_panel_funcs vbt_panel_funcs = {
+	.disable = vbt_panel_disable,
+	.unprepare = vbt_panel_unprepare,
+	.prepare = vbt_panel_prepare,
+	.enable = vbt_panel_enable,
+	.get_modes = vbt_panel_get_modes,
+};
+
+struct drm_panel *vbt_panel_init(struct intel_dsi *intel_dsi, u16 panel_id)
  {
-	struct intel_dsi *intel_dsi = container_of(dsi, struct intel_dsi, dev);
  	struct drm_device *dev = intel_dsi->base.base.dev;
  	struct drm_i915_private *dev_priv = dev->dev_private;
  	struct mipi_config *mipi_config = dev_priv->vbt.dsi.config;
  	struct mipi_pps_data *pps = dev_priv->vbt.dsi.pps;
  	struct drm_display_mode *mode = dev_priv->vbt.lfp_lvds_vbt_mode;
+	struct vbt_panel *vbt_panel;
  	u32 bits_per_pixel = 24;
  	u32 tlpx_ns, extra_byte_count, bitrate, tlpx_ui;
  	u32 ui_num, ui_den;

@@ -346,7 +446,7 @@ static bool generic_init(struct intel_dsi_device *dsi)
  			if (mipi_config->target_burst_mode_freq <
  								computed_ddr) {
  				DRM_ERROR("Burst mode freq is less than computed\n");
-				return false;
+				return NULL;
  			}
 
  			burst_mode_ratio = DIV_ROUND_UP(

@@ -356,7 +456,7 @@ static bool generic_init(struct intel_dsi_device *dsi)
  			pclk = DIV_ROUND_UP(pclk * burst_mode_ratio, 100);
  		} else {
  			DRM_ERROR("Burst mode target is not set\n");
-			return false;
+			return NULL;
  		}
  	} else
  		burst_mode_ratio = 100;

@@ -557,71 +657,12 @@ static bool generic_init(struct intel_dsi_device *dsi)
  	intel_dsi->panel_off_delay = pps->panel_off_delay / 10;
  	intel_dsi->panel_pwr_cycle_delay = pps->panel_power_cycle_delay / 10;
 
-	return true;
-}
-
-static void generic_panel_reset(struct intel_dsi_device *dsi)
-{
-	struct intel_dsi *intel_dsi = container_of(dsi, struct intel_dsi, dev);
-	struct drm_device *dev = intel_dsi->base.base.dev;
-	struct drm_i915_private *dev_priv = dev->dev_private;
-
-	char *sequence = dev_priv->vbt.dsi.sequence[MIPI_SEQ_ASSERT_RESET];
-
-	generic_exec_sequence(intel_dsi, sequence);
-
-	sequence = dev_priv->vbt.dsi.sequence[MIPI_SEQ_INIT_OTP];
-	generic_exec_sequence(intel_dsi, sequence);
-}
-
-static void generic_disable_panel_power(struct intel_dsi_device *dsi)
-{
-	struct intel_dsi *intel_dsi = container_of(dsi, struct intel_dsi, dev);
-	struct drm_device *dev = intel_dsi->base.base.dev;
-	struct drm_i915_private *dev_priv = dev->dev_private;
-
-	char *sequence = dev_priv->vbt.dsi.sequence[MIPI_SEQ_DEASSERT_RESET];
-
-	generic_exec_sequence(intel_dsi, sequence);
-}
-
-static void generic_enable(struct intel_dsi_device *dsi)
-{
-	struct intel_dsi *intel_dsi = container_of(dsi, struct intel_dsi, dev);
-	struct drm_device *dev = intel_dsi->base.base.dev;
-	struct drm_i915_private *dev_priv = dev->dev_private;

drivers/gpu/drm/i915/intel_dsi_panel_vbt.c +0 -20

  }
-
-static void generic_disable(struct intel_dsi_device *dsi)
-{
-	struct intel_dsi *intel_dsi = container_of(dsi, struct intel_dsi, dev);
-	struct drm_device *dev = intel_dsi->base.base.dev;
-	struct drm_i915_private *dev_priv = dev->dev_private;
-
-	char *sequence = dev_priv->vbt.dsi.sequence[MIPI_SEQ_DISPLAY_OFF];
-
-	generic_exec_sequence(intel_dsi, sequence);
-}
-
-static struct drm_display_mode *generic_get_modes(struct intel_dsi_device *dsi)
-{
-	struct intel_dsi *intel_dsi = container_of(dsi, struct intel_dsi, dev);
-	struct drm_device *dev = intel_dsi->base.base.dev;
-	struct drm_i915_private *dev_priv = dev->dev_private;
-
-	dev_priv->vbt.lfp_lvds_vbt_mode->type |= DRM_MODE_TYPE_PREFERRED;
-	return dev_priv->vbt.lfp_lvds_vbt_mode;

Add basic support for using the drm mipi dsi framework for DSI. We don't use device tree which is pretty much required by mipi_dsi_host_register and friends, and we don't have the kind of device model the functions expect either. So we cheat and use it as a library to abstract what we
need: a nice, clean interface for DSI transfers. This means we will have to be careful with what functions we call, as the driver model devices in mipi_dsi_host and mipi_dsi_device will *not* be initialized.

Signed-off-by Jani Nikula <[email protected]>

---
  drivers/gpu/drm/i915/Kconfig               |   1 +
  drivers/gpu/drm/i915/intel_dsi.c           | 162 ++++++++++++++++++++++++++++-
  drivers/gpu/drm/i915/intel_dsi.h           |  18 ++++
  drivers/gpu/drm/i915/intel_dsi_panel_vbt.c |   3 -
  4 files changed, 180 insertions(+), 4 deletions(-)

drivers/gpu/drm/i915/Kconfig +1 -0

index da196cd07263..74acca9bcd9d 100644
@@ -12,6 +12,7 @@ config DRM_I915
  	select TMPFS
  	select DRM_KMS_HELPER
  	select DRM_PANEL
+	select DRM_MIPI_DSI
  	# i915 depends on ACPI_VIDEO when ACPI is enabled
  	# but for select to work, need to select ACPI_VIDEO's dependencies, ick
  	select BACKLIGHT_LCD_SUPPORT if ACPI

drivers/gpu/drm/i915/intel_dsi.c +161 -1

index 19a9955eab0e..5cfa3431785a 100644
@@ -28,6 +28,7 @@
  #include <drm/drm_edid.h>
  #include <drm/i915_drm.h>
  #include <drm/drm_panel.h>
+#include <drm/drm_mipi_dsi.h>
  #include <linux/slab.h>
  #include "i915_drv.h"
  #include "intel_drv.h"

@@ -58,6 +59,149 @@ static void wait_for_dsi_fifo_empty(struct intel_dsi *intel_dsi, enum port port)
  		DRM_ERROR("DPI FIFOs are not empty\n");
  }
 
+static void write_data(struct drm_i915_private *dev_priv, u32 reg,
+		       const u8 *data, u32 len)
+{
+	u32 i, j;
+
+	for (i = 0; i < len; i += 4) {
+		u32 val = 0;
+
+		for (j = 0; j < min_t(u32, len - i, 4); j++)
+			val |= *data++ << 8 * j;
+
+		I915_WRITE(reg, val);
+	}
+}
+
+static void read_data(struct drm_i915_private *dev_priv, u32 reg,
+		      u8 *data, u32 len)
+{
+	u32 i, j;
+
+	for (i = 0; i < len; i += 4) {
+		u32 val = I915_READ(reg);
+
+		for (j = 0; j < min_t(u32, len - i, 4); j++)
+			*data++ = val >> 8 * j;
+	}
+}
+
+static ssize_t intel_dsi_host_transfer(struct mipi_dsi_host *host,
+				       const struct mipi_dsi_msg *msg)
+{
+	struct intel_dsi_host *intel_dsi_host = to_intel_dsi_host(host);
+	struct drm_device *dev = intel_dsi_host->intel_dsi->base.base.dev;
+	struct drm_i915_private *dev_priv = dev->dev_private;
+	enum port port = intel_dsi_host->port;
+	struct mipi_dsi_packet packet;
+	ssize_t ret;
+	const u8 *header, *data;
+	u32 data_reg, data_mask, ctrl_reg, ctrl_mask;
+
+	ret = mipi_dsi_create_packet(&packet, msg);
+	if (ret < 0)
+		return ret;
+
+	header = packet.header;
+	data = packet.payload;
+
+	if (msg->flags & MIPI_DSI_MSG_USE_LPM) {
+		data_reg = MIPI_LP_GEN_DATA(port);
+		data_mask = LP_DATA_FIFO_FULL;
+		ctrl_reg = MIPI_LP_GEN_CTRL(port);
+		ctrl_mask = LP_CTRL_FIFO_FULL;
+	} else {
+		data_reg = MIPI_HS_GEN_DATA(port);
+		data_mask = HS_DATA_FIFO_FULL;
+		ctrl_reg = MIPI_HS_GEN_CTRL(port);
+		ctrl_mask = HS_CTRL_FIFO_FULL;
+	}
+
+	/* note: this is never true for reads */
+	if (packet.payload_length) {
+
+		if (wait_for((I915_READ(MIPI_GEN_FIFO_STAT(port)) & data_mask) == 0, 50))
+			DRM_ERROR("Timeout waiting for HS/LP DATA FIFO !full\n");
+
+		write_data(dev_priv, data_reg, packet.payload,
+			   packet.payload_length);
+	}
+
+	if (msg->rx_len) {
+		I915_WRITE(MIPI_INTR_STAT(port), GEN_READ_DATA_AVAIL);
+	}
+
+	if (wait_for((I915_READ(MIPI_GEN_FIFO_STAT(port)) & ctrl_mask) == 0, 50)) {
+		DRM_ERROR("Timeout waiting for HS/LP CTRL FIFO !full\n");
+	}
+
+	I915_WRITE(ctrl_reg, header[2] << 16 | header[1] << 8 | header[0]);
+
+	/* ->rx_len is set only for reads */
+	if (msg->rx_len) {
+		data_mask = GEN_READ_DATA_AVAIL;
+		if (wait_for((I915_READ(MIPI_INTR_STAT(port)) & data_mask) == data_mask, 50))
+			DRM_ERROR("Timeout waiting for read data.\n");
+
+		read_data(dev_priv, data_reg, msg->rx_buf, msg->rx_len);
+	}
+
+	/* XXX: fix for reads and writes */
+	return 4 + packet.payload_length;
+}
+
+static int intel_dsi_host_attach(struct mipi_dsi_host *host,
+				 struct mipi_dsi_device *dsi)
+{
+	return 0;
+}
+
+static int intel_dsi_host_detach(struct mipi_dsi_host *host,
+				 struct mipi_dsi_device *dsi)
+{
+	return 0;
+}
+
+static const struct mipi_dsi_host_ops intel_dsi_host_ops = {
+	.attach = intel_dsi_host_attach,
+	.detach = intel_dsi_host_detach,
+	.transfer = intel_dsi_host_transfer,
+};
+
+static struct intel_dsi_host *intel_dsi_host_init(struct intel_dsi *intel_dsi,
+						  enum port port)
+{
+	struct intel_dsi_host *host;
+	struct mipi_dsi_device *device;
+
+	host = kzalloc(sizeof(*host), GFP_KERNEL);
+	if (!host)
+		return NULL;
+
+	host->base.ops = &intel_dsi_host_ops;
+	host->intel_dsi = intel_dsi;
+	host->port = port;
+
+	/*
+	 * We should call mipi_dsi_host_register(&host->base) here, but we don't
+	 * have a host->dev, and we don't have OF stuff either. So just use the
+	 * dsi framework as a library and hope for the best. Create the dsi
+	 * devices by ourselves here too. Need to be careful though, because we
+	 * don't initialize any of the driver model devices here.
+	 */
+	device = kzalloc(sizeof(*device), GFP_KERNEL);
+	if (!device) {
+		kfree(host);
+		return NULL;
+	}
+
+	device->host = &host->base;
+	host->device = device;
+
+	return host;
+}
+
  static void band_gap_reset(struct drm_i915_private *dev_priv)
  {
  	mutex_lock(&dev_priv->dpio_lock);

@@ -806,6 +950,7 @@ void intel_dsi_init(struct drm_device *dev)
  	struct drm_connector *connector;
  	struct drm_display_mode *scan, *fixed_mode = NULL;
  	struct drm_i915_private *dev_priv = dev->dev_private;
+	enum port port;
  	unsigned int i;
 
  	DRM_DEBUG_KMS("\n");

@@ -854,7 +999,11 @@ void intel_dsi_init(struct drm_device *dev)
  	intel_connector->unregister = intel_connector_unregister;
 
  	/* Pipe A maps to MIPI DSI port A, pipe B maps to MIPI DSI port C */
-	if (dev_priv->vbt.dsi.port == DVO_PORT_MIPIA) {
+	if (dev_priv->vbt.dsi.config->dual_link) {
+		/* XXX: does dual link work on either pipe? */
+		intel_encoder->crtc_mask = (1 << PIPE_A);
+		intel_dsi->ports = ((1 << PORT_A) | (1 << PORT_C));
+	} else if (dev_priv->vbt.dsi.port == DVO_PORT_MIPIA) {
  		intel_encoder->crtc_mask = (1 << PIPE_A);
  		intel_dsi->ports = (1 << PORT_A);
  	} else if (dev_priv->vbt.dsi.port == DVO_PORT_MIPIC) {

@@ -862,6 +1011,17 @@ void intel_dsi_init(struct drm_device *dev)
  		intel_dsi->ports = (1 << PORT_C);
  	}
 
+	/* Create a DSI host (and a device) for each port. */
+	for_each_dsi_port(port, intel_dsi->ports) {
+		struct intel_dsi_host *host;
+
+		host = intel_dsi_host_init(intel_dsi, port);
+		if (!host)
+			goto err;
+
+		intel_dsi->dsi_hosts[port] = host;
+	}
+
  	for (i = 0; i < ARRAY_SIZE(intel_dsi_drivers); i++) {
  		intel_dsi->panel = intel_dsi_drivers[i].init(intel_dsi,
  							     intel_dsi_drivers[i].panel_id);

drivers/gpu/drm/i915/intel_dsi.h +18 -0

index fc0b2b8d90f1..2784ac442368 100644
@@ -26,6 +26,7 @@
 
  #include <drm/drmP.h>
  #include <drm/drm_crtc.h>
+#include <drm/drm_mipi_dsi.h>
  #include "intel_drv.h"
 
  /* Dual Link support */

@@ -33,10 +34,13 @@
  #define DSI_DUAL_LINK_FRONT_BACK	1
  #define DSI_DUAL_LINK_PIXEL_ALT		2
 
+struct intel_dsi_host;
+
  struct intel_dsi {
  	struct intel_encoder base;
 
  	struct drm_panel *panel;
+	struct intel_dsi_host *dsi_hosts[I915_MAX_PORTS];
 
  	struct intel_connector *attached_connector;
 

@@ -94,6 +98,20 @@ struct intel_dsi {
  	u16 panel_pwr_cycle_delay;
  };
 
+struct intel_dsi_host {
+	struct mipi_dsi_host base;
+	struct intel_dsi *intel_dsi;
+	enum port port;
+
+	/* our little hack */
+	struct mipi_dsi_device *device;
+};
+
+static inline struct intel_dsi_host *to_intel_dsi_host(struct mipi_dsi_host *h)
+{
+	return container_of(h, struct intel_dsi_host, base);
+}
+
  #define for_each_dsi_port(__port, __ports_mask) \
  	for ((__port) = PORT_A; (__port) < I915_MAX_PORTS; (__port)++)	\
  		if ((__ports_mask) & (1 << (__port)))

drivers/gpu/drm/i915/intel_dsi_panel_vbt.c +0 -0

index 204f54df8fe1..e363c26a2b05 100644