Skip to contentSkip to conversation

drm/mediatek: allow commands to be sent during video mode

PATCH Applied Julien STEPHAN 3 participants 3 messages Feb 14, 2022 – Feb 17, 2022

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v4 1/1 drm/mediatek: allow commands to be sent during video mode

Mipi dsi panel drivers can use mipi_dsi_dcs_{set,get}_display_brightness() to request backlight changes.

This can be done during panel initialization (dsi is in command mode) or afterwards (dsi is in Video Mode).

When the DSI is in Video Mode, all commands are rejected.

Detect current DSI mode in mtk_dsi_host_transfer() and switch modes temporarily to allow commands to be sent.

---
Changes in v4:
- fix missing space: "ret : recv_cnt;"
Changes in v3:
- increase readability of code and use correct return variable (see comment
https://lore.kernel.org/linux-mediatek/[email protected]/)

Changes in v2:
- update commit message to be more descriptive

 drivers/gpu/drm/mediatek/mtk_dsi.c | 33 ++++++++++++++++++++++--------
 1 file changed, 24 insertions(+), 9 deletions(-)
drivers/gpu/drm/mediatek/mtk_dsi.c +24 -9
index 5d90d2eb0019..abdd9cdebd86 100644
@@ -891,24 +891,33 @@ static ssize_t mtk_dsi_host_transfer(struct mipi_dsi_host *host,
 	u8 read_data[16];
 	void *src_addr;
 	u8 irq_flag = CMD_DONE_INT_FLAG;
+	u32 dsi_mode;
+	int ret;
 
-	if (readl(dsi->regs + DSI_MODE_CTRL) & MODE) {
-		DRM_ERROR("dsi engine is not command mode\n");
-		return -EINVAL;
+	dsi_mode = readl(dsi->regs + DSI_MODE_CTRL);
+	if (dsi_mode & MODE) {
+		mtk_dsi_stop(dsi);
+		ret = mtk_dsi_switch_to_cmd_mode(dsi, VM_DONE_INT_FLAG, 500);
+		if (ret)
+			goto restore_dsi_mode;
 	}
 
 	if (MTK_DSI_HOST_IS_READ(msg->type))
 		irq_flag |= LPRX_RD_RDY_INT_FLAG;
 
-	if (mtk_dsi_host_send_cmd(dsi, msg, irq_flag) < 0)
-		return -ETIME;
+	ret = mtk_dsi_host_send_cmd(dsi, msg, irq_flag);
+	if (ret)
+		goto restore_dsi_mode;
 
-	if (!MTK_DSI_HOST_IS_READ(msg->type))
-		return 0;
+	if (!MTK_DSI_HOST_IS_READ(msg->type)) {
+		recv_cnt = 0;
+		goto restore_dsi_mode;
+	}
 
 	if (!msg->rx_buf) {
 		DRM_ERROR("dsi receive buffer size may be NULL\n");
-		return -EINVAL;
+		ret = -EINVAL;
+		goto restore_dsi_mode;
 	}
 
 	for (i = 0; i < 16; i++)
@@ -933,7 +942,13 @@ static ssize_t mtk_dsi_host_transfer(struct mipi_dsi_host *host,
 	DRM_INFO("dsi get %d byte data from the panel address(0x%x)\n",
 		 recv_cnt, *((u8 *)(msg->tx_buf)));
 
-	return recv_cnt;
+restore_dsi_mode:
+	if (dsi_mode & MODE) {
+		mtk_dsi_set_mode(dsi);
+		mtk_dsi_start(dsi);
+	}
+
+	return ret < 0 ? ret : recv_cnt;
 }
 
 static const struct mipi_dsi_host_ops mtk_dsi_ops = {

--
2.35.1

maintainer Reviewed-by on v4 1/1
#1 lore raw

Il 14/02/22 10:27, Julien STEPHAN ha scritto:

Quoted 6 lines

Mipi dsi panel drivers can use mipi_dsi_dcs_{set,get}_display_brightness() to request backlight changes.

This can be done during panel initialization (dsi is in command mode) or afterwards (dsi is in Video Mode).

Quoted 7 lines

When the DSI is in Video Mode, all commands are rejected.

Detect current DSI mode in mtk_dsi_host_transfer() and switch modes temporarily to allow commands to be sent.

Please, next time, don't drop the tags that reviewers are giving to you, unless the patch changes radically.

Quoted 78 lines

---
Changes in v4:
- fix missing space: "ret : recv_cnt;"
Changes in v3:
- increase readability of code and use correct return variable (see comment
https://lore.kernel.org/linux-mediatek/[email protected]/)

Changes in v2:
- update commit message to be more descriptive

  drivers/gpu/drm/mediatek/mtk_dsi.c | 33 ++++++++++++++++++++++--------
  1 file changed, 24 insertions(+), 9 deletions(-)
drivers/gpu/drm/mediatek/mtk_dsi.c +24 -10
index 5d90d2eb0019..abdd9cdebd86 100644
@@ -891,24 +891,33 @@ static ssize_t mtk_dsi_host_transfer(struct mipi_dsi_host *host,
  	u8 read_data[16];
  	void *src_addr;
  	u8 irq_flag = CMD_DONE_INT_FLAG;
+	u32 dsi_mode;
+	int ret;
 
-	if (readl(dsi->regs + DSI_MODE_CTRL) & MODE) {
-		DRM_ERROR("dsi engine is not command mode\n");
-		return -EINVAL;
+	dsi_mode = readl(dsi->regs + DSI_MODE_CTRL);
+	if (dsi_mode & MODE) {
+		mtk_dsi_stop(dsi);
+		ret = mtk_dsi_switch_to_cmd_mode(dsi, VM_DONE_INT_FLAG, 500);
+		if (ret)
+			goto restore_dsi_mode;
  	}
 
  	if (MTK_DSI_HOST_IS_READ(msg->type))
  		irq_flag |= LPRX_RD_RDY_INT_FLAG;
 
-	if (mtk_dsi_host_send_cmd(dsi, msg, irq_flag) < 0)
-		return -ETIME;
+	ret = mtk_dsi_host_send_cmd(dsi, msg, irq_flag);
+	if (ret)
+		goto restore_dsi_mode;
 
-	if (!MTK_DSI_HOST_IS_READ(msg->type))
-		return 0;
+	if (!MTK_DSI_HOST_IS_READ(msg->type)) {
+		recv_cnt = 0;
+		goto restore_dsi_mode;
+	}
 
  	if (!msg->rx_buf) {
  		DRM_ERROR("dsi receive buffer size may be NULL\n");
-		return -EINVAL;
+		ret = -EINVAL;
+		goto restore_dsi_mode;
  	}
 
  	for (i = 0; i < 16; i++)
@@ -933,7 +942,13 @@ static ssize_t mtk_dsi_host_transfer(struct mipi_dsi_host *host,
  	DRM_INFO("dsi get %d byte data from the panel address(0x%x)\n",
  		 recv_cnt, *((u8 *)(msg->tx_buf)));
 
-	return recv_cnt;
+restore_dsi_mode:
+	if (dsi_mode & MODE) {
+		mtk_dsi_set_mode(dsi);
+		mtk_dsi_start(dsi);
+	}
+
+	return ret < 0 ? ret : recv_cnt;
  }
 
  static const struct mipi_dsi_host_ops mtk_dsi_ops = {
--

2.35.1

maintainer Applied
#2 lore raw

[1Hi, Julien:

AngeloGioacchino Del Regno <[email protected]> 於 2022年2月14日 週一 下午5:43寫道:

Quoted 12 lines

Il 14/02/22 10:27, Julien STEPHAN ha scritto:

Quoted 10 lines

Mipi dsi panel drivers can use mipi_dsi_dcs_{set,get}_display_brightness() to request backlight changes.

This can be done during panel initialization (dsi is in command mode) or afterwards (dsi is in Video Mode).

When the DSI is in Video Mode, all commands are rejected.

Detect current DSI mode in mtk_dsi_host_transfer() and switch modes temporarily to allow commands to be sent.

Applied to mediatek-drm-next [1], thanks.

[1] https://git.kernel.org/pub/scm/linux/kernel/git/chunkuang.hu/linux.git/log/?h=mediatek-drm-next

Regards,
Chun-Kuang.

Quoted 90 lines
Quoted 3 lines

Please, next time, don't drop the tags that reviewers are giving to you, unless the patch changes radically.

Quoted 78 lines

---
Changes in v4:
- fix missing space: "ret : recv_cnt;"
Changes in v3:
- increase readability of code and use correct return variable (see comment
https://lore.kernel.org/linux-mediatek/[email protected]/)

Changes in v2:
- update commit message to be more descriptive

  drivers/gpu/drm/mediatek/mtk_dsi.c | 33 ++++++++++++++++++++++--------
  1 file changed, 24 insertions(+), 9 deletions(-)
drivers/gpu/drm/mediatek/mtk_dsi.c +24 -10
index 5d90d2eb0019..abdd9cdebd86 100644
@@ -891,24 +891,33 @@ static ssize_t mtk_dsi_host_transfer(struct mipi_dsi_host *host,
      u8 read_data[16];
      void *src_addr;
      u8 irq_flag = CMD_DONE_INT_FLAG;
+     u32 dsi_mode;
+     int ret;
 
-     if (readl(dsi->regs + DSI_MODE_CTRL) & MODE) {
-             DRM_ERROR("dsi engine is not command mode\n");
-             return -EINVAL;
+     dsi_mode = readl(dsi->regs + DSI_MODE_CTRL);
+     if (dsi_mode & MODE) {
+             mtk_dsi_stop(dsi);
+             ret = mtk_dsi_switch_to_cmd_mode(dsi, VM_DONE_INT_FLAG, 500);
+             if (ret)
+                     goto restore_dsi_mode;
      }
 
      if (MTK_DSI_HOST_IS_READ(msg->type))
              irq_flag |= LPRX_RD_RDY_INT_FLAG;
 
-     if (mtk_dsi_host_send_cmd(dsi, msg, irq_flag) < 0)
-             return -ETIME;
+     ret = mtk_dsi_host_send_cmd(dsi, msg, irq_flag);
+     if (ret)
+             goto restore_dsi_mode;
 
-     if (!MTK_DSI_HOST_IS_READ(msg->type))
-             return 0;
+     if (!MTK_DSI_HOST_IS_READ(msg->type)) {
+             recv_cnt = 0;
+             goto restore_dsi_mode;
+     }
 
      if (!msg->rx_buf) {
              DRM_ERROR("dsi receive buffer size may be NULL\n");
-             return -EINVAL;
+             ret = -EINVAL;
+             goto restore_dsi_mode;
      }
 
      for (i = 0; i < 16; i++)
@@ -933,7 +942,13 @@ static ssize_t mtk_dsi_host_transfer(struct mipi_dsi_host *host,
      DRM_INFO("dsi get %d byte data from the panel address(0x%x)\n",
               recv_cnt, *((u8 *)(msg->tx_buf)));
 
-     return recv_cnt;
+restore_dsi_mode:
+     if (dsi_mode & MODE) {
+             mtk_dsi_set_mode(dsi);
+             mtk_dsi_start(dsi);
+     }
+
+     return ret < 0 ? ret : recv_cnt;
  }
 
  static const struct mipi_dsi_host_ops mtk_dsi_ops = {
--

2.35.1