mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: John Keeping <john@metanate.com>
To: Mark Yao <mark.yao@rock-chips.com>
Cc: Chris Zhong <zyw@rock-chips.com>,
	dri-devel@lists.freedesktop.org,
	linux-arm-kernel@lists.infradead.org,
	linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org,
	Sean Paul <seanpaul@chromium.org>,
	John Keeping <john@metanate.com>
Subject: [PATCH v4 22/23] drm/rockchip: dw-mipi-dsi: support non-burst modes
Date: Fri, 24 Feb 2017 12:55:05 +0000	[thread overview]
Message-ID: <20170224125506.21533-23-john@metanate.com> (raw)
In-Reply-To: <20170224125506.21533-1-john@metanate.com>

Signed-off-by: John Keeping <john@metanate.com>
Reviewed-by: Chris Zhong <zyw@rock-chips.com>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
---
v4:
- Add Sean's Reviewed-by
v3:
- Add Chris' Reviewed-by
Unchanged in v2
---
 drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c
index 9edb868f8dc1..0c4bae711e84 100644
--- a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c
+++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c
@@ -82,7 +82,9 @@
 #define FRAME_BTA_ACK			BIT(14)
 #define ENABLE_LOW_POWER		(0x3f << 8)
 #define ENABLE_LOW_POWER_MASK		(0x3f << 8)
-#define VID_MODE_TYPE_BURST_SYNC_PULSES		0x2
+#define VID_MODE_TYPE_NON_BURST_SYNC_PULSES	0x0
+#define VID_MODE_TYPE_NON_BURST_SYNC_EVENTS	0x1
+#define VID_MODE_TYPE_BURST			0x2
 #define VID_MODE_TYPE_MASK			0x3
 
 #define DSI_VID_PKT_SIZE		0x3c
@@ -286,6 +288,7 @@ struct dw_mipi_dsi {
 	u32 format;
 	u16 input_div;
 	u16 feedback_div;
+	unsigned long mode_flags;
 
 	const struct dw_mipi_dsi_plat_data *pdata;
 };
@@ -558,15 +561,10 @@ static int dw_mipi_dsi_host_attach(struct mipi_dsi_host *host,
 		return -EINVAL;
 	}
 
-	if (!(device->mode_flags & MIPI_DSI_MODE_VIDEO_BURST) ||
-	    !(device->mode_flags & MIPI_DSI_MODE_VIDEO_SYNC_PULSE)) {
-		dev_err(dsi->dev, "device mode is unsupported\n");
-		return -EINVAL;
-	}
-
 	dsi->lanes = device->lanes;
 	dsi->channel = device->channel;
 	dsi->format = device->format;
+	dsi->mode_flags = device->mode_flags;
 	dsi->panel = of_drm_find_panel(device->dev.of_node);
 	if (dsi->panel)
 		return drm_panel_attach(dsi->panel, &dsi->connector);
@@ -725,7 +723,14 @@ static void dw_mipi_dsi_video_mode_config(struct dw_mipi_dsi *dsi)
 {
 	u32 val;
 
-	val = VID_MODE_TYPE_BURST_SYNC_PULSES | ENABLE_LOW_POWER;
+	val = ENABLE_LOW_POWER;
+
+	if (dsi->mode_flags & MIPI_DSI_MODE_VIDEO_BURST)
+		val |= VID_MODE_TYPE_BURST;
+	else if (dsi->mode_flags & MIPI_DSI_MODE_VIDEO_SYNC_PULSE)
+		val |= VID_MODE_TYPE_NON_BURST_SYNC_PULSES;
+	else
+		val |= VID_MODE_TYPE_NON_BURST_SYNC_EVENTS;
 
 	dsi_write(dsi, DSI_VID_MODE_CFG, val);
 }
-- 
2.12.0.rc0.230.gf625d4cdb9.dirty

  parent reply	other threads:[~2017-02-24 12:59 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-02-24 12:54 [PATCH v4 00/23] drm/rockchip: MIPI fixes & improvements John Keeping
2017-02-24 12:54 ` [PATCH v4 01/23] drm/rockchip: dw-mipi-dsi: don't configure hardware in mode_set for MIPI John Keeping
2017-02-24 12:54 ` [PATCH v4 02/23] drm/rockchip: dw-mipi-dsi: pass mode in where needed John Keeping
2017-02-24 12:54 ` [PATCH v4 03/23] drm/rockchip: dw-mipi-dsi: remove mode_set hook John Keeping
2017-02-24 12:54 ` [PATCH v4 04/23] drm/rockchip: dw-mipi-dsi: fix command header writes John Keeping
2017-02-24 12:54 ` [PATCH v4 05/23] drm/rockchip: dw-mipi-dsi: fix generic packet status check John Keeping
2017-02-24 12:54 ` [PATCH v4 06/23] drm/rockchip: dw-mipi-dsi: avoid out-of-bounds read on tx_buf John Keeping
2017-02-24 12:54 ` [PATCH v4 07/23] drm/rockchip: dw-mipi-dsi: include bad value in error message John Keeping
2017-02-24 12:54 ` [PATCH v4 08/23] drm/rockchip: dw-mipi-dsi: respect message flags John Keeping
2017-02-24 12:54 ` [PATCH v4 09/23] drm/rockchip: dw-mipi-dsi: only request HS clock when required John Keeping
2017-02-24 12:54 ` [PATCH v4 10/23] drm/rockchip: dw-mipi-dsi: don't assume buffer is aligned John Keeping
2017-02-24 12:54 ` [PATCH v4 11/23] drm/rockchip: dw-mipi-dsi: prepare panel after phy init John Keeping
2017-02-24 12:54 ` [PATCH v4 12/23] drm/rockchip: dw-mipi-dsi: allow commands in panel_disable John Keeping
2017-02-24 12:54 ` [PATCH v4 13/23] drm/rockchip: dw-mipi-dsi: fix escape clock rate John Keeping
2017-02-24 12:54 ` [PATCH v4 14/23] drm/rockchip: dw-mipi-dsi: ensure PHY is reset John Keeping
2017-02-24 12:54 ` [PATCH v4 15/23] drm/rockchip: dw-mipi-dsi: configure PHY before enabling John Keeping
2017-02-24 12:54 ` [PATCH v4 16/23] drm/rockchip: dw-mipi-dsi: properly configure PHY timing John Keeping
2017-02-24 12:55 ` [PATCH v4 17/23] drm/rockchip: dw-mipi-dsi: improve PLL configuration John Keeping
2017-02-24 12:55 ` [PATCH v4 18/23] drm/rockchip: dw-mipi-dsi: use specific poll helper John Keeping
2017-02-24 12:55 ` [PATCH v4 19/23] drm/rockchip: dw-mipi-dsi: use positive check for N{H,V}SYNC John Keeping
2017-02-24 12:55 ` [PATCH v4 20/23] drm/rockchip: vop: test for P{H,V}SYNC John Keeping
2017-02-24 12:55 ` [PATCH v4 21/23] drm/rockchip: dw-mipi-dsi: defer probe if panel is not loaded John Keeping
2017-02-24 12:55 ` John Keeping [this message]
2017-02-24 12:55 ` [PATCH v4 23/23] drm/rockchip: dw-mipi-dsi: add reset control John Keeping
2017-03-02 21:56   ` Brian Norris
2017-03-03 11:39     ` [PATCH] dt-bindings: display: rk3288-mipi-dsi: add reset property John Keeping
2017-03-03 20:41       ` Brian Norris
2017-03-06 16:52       ` Sean Paul
2017-03-12 12:06       ` Rob Herring
2017-04-04 13:15         ` John Keeping
2017-04-04 18:30           ` Sean Paul
2017-03-02 21:59   ` [PATCH v4 23/23] drm/rockchip: dw-mipi-dsi: add reset control Brian Norris
2017-02-27  1:41 ` [PATCH v4 00/23] drm/rockchip: MIPI fixes & improvements Mark yao
2017-02-27  3:34 ` Chris Zhong
2017-03-01 20:03 ` Sean Paul

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170224125506.21533-23-john@metanate.com \
    --to=john@metanate.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-rockchip@lists.infradead.org \
    --cc=mark.yao@rock-chips.com \
    --cc=seanpaul@chromium.org \
    --cc=zyw@rock-chips.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®