From: John Keeping <john-HooS5bfzL4hWk0Htik3J/w@public.gmane.org>
To: Mark Yao <mark.yao-TNX95d0MmH7DzftRWevZcw@public.gmane.org>
Cc: Heiko Stuebner <heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org>,
linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org,
linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
John Keeping <john-HooS5bfzL4hWk0Htik3J/w@public.gmane.org>,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
Subject: [PATCH 06/26] drm/rockchip: dw-mipi-dsi: fix generic packet status check
Date: Mon, 19 Sep 2016 18:17:16 +0100 [thread overview]
Message-ID: <20160919171747.28512-7-john@metanate.com> (raw)
In-Reply-To: <20160919171747.28512-1-john-HooS5bfzL4hWk0Htik3J/w@public.gmane.org>
We want to check that both the GEN_CMD_EMPTY and GEN_PLD_W_EMPTY bits
are set so we can't just check "val & mask" because that will be true if
either bit is set.
Signed-off-by: John Keeping <john-HooS5bfzL4hWk0Htik3J/w@public.gmane.org>
---
drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c
index 03915bf9c97d..f2bed2a0f907 100644
--- a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c
+++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c
@@ -546,7 +546,7 @@ static int dw_mipi_dsi_host_detach(struct mipi_dsi_host *host,
static int dw_mipi_dsi_gen_pkt_hdr_write(struct dw_mipi_dsi *dsi, u32 hdr_val)
{
int ret;
- u32 val;
+ u32 val, mask;
ret = readx_poll_timeout(readl, dsi->base + DSI_CMD_PKT_STATUS,
val, !(val & GEN_CMD_FULL), 1000,
@@ -558,8 +558,9 @@ static int dw_mipi_dsi_gen_pkt_hdr_write(struct dw_mipi_dsi *dsi, u32 hdr_val)
dsi_write(dsi, DSI_GEN_HDR, hdr_val);
+ mask = GEN_CMD_EMPTY | GEN_PLD_W_EMPTY;
ret = readx_poll_timeout(readl, dsi->base + DSI_CMD_PKT_STATUS,
- val, val & (GEN_CMD_EMPTY | GEN_PLD_W_EMPTY),
+ val, (val & mask) == mask,
1000, CMD_PKT_STATUS_TIMEOUT_US);
if (ret < 0) {
dev_err(dsi->dev, "failed to write command FIFO\n");
--
2.10.0.278.g4f427b1.dirty
next prev parent reply other threads:[~2016-09-19 17:17 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-19 17:17 [PATCH 00/27] drm/rockchip: MIPI fixes & improvements John Keeping
2016-09-19 17:17 ` [PATCH 01/26] drm/rockchip: dw-mipi-dsi: use mode from display state John Keeping
2017-01-17 10:38 ` [01/26] " Chris Zhong
2017-01-18 2:21 ` Mark yao
[not found] ` <20160919171747.28512-1-john-HooS5bfzL4hWk0Htik3J/w@public.gmane.org>
2016-09-19 17:17 ` [PATCH 02/26] drm/rockchip: dw-mipi-dsi: pass new mode into MIPI mode set John Keeping
2016-09-19 17:17 ` John Keeping [this message]
2016-09-19 17:17 ` [PATCH 13/26] drm/rockchip: dw-mipi-dsi: allow commands in panel_disable John Keeping
2016-09-19 17:17 ` [PATCH 15/27] drm/rockchip: dw-mipi-dsi: use positive check for N{H, V}SYNC John Keeping
2016-09-19 17:17 ` [PATCH 16/27] drm/rockchip: dw-mipi-dsi: fix escape clock rate John Keeping
2016-09-19 17:17 ` [PATCH 17/26] drm/rockchip: dw-mipi-dsi: don't enable PHY PLL until it's configured John Keeping
2016-09-19 17:17 ` [PATCH 18/26] drm/rockchip: dw-mipi-dsi: properly configure PHY timing John Keeping
2016-09-19 17:17 ` [PATCH 20/26] drm/rockchip: dw-mipi-dsi: use specific poll helper John Keeping
2016-09-19 17:17 ` [PATCH 21/27] drm/rockchip: dw-mipi-dsi: improve PLL configuration John Keeping
2016-09-19 17:17 ` [PATCH 03/26] drm/rockchip: dw-mipi-dsi: don't configure hardware in mode_set for MIPI John Keeping
2016-09-19 17:17 ` [PATCH 04/26] drm/rockchip: dw-mipi-dsi: rename commit hook to enable John Keeping
2016-09-19 17:17 ` [PATCH 05/26] drm/rockchip: dw-mipi-dsi: fix command header writes John Keeping
2017-01-17 9:32 ` [05/26] " Chris Zhong
2016-09-19 17:17 ` [PATCH 07/26] drm/rockchip: dw-mipi-dsi: avoid out-of-bounds read on tx_buf John Keeping
2016-09-19 17:17 ` [PATCH 08/26] drm/rockchip: dw-mipi-dsi: include bad value in error message John Keeping
2016-09-19 17:17 ` [PATCH 09/26] drm/rockchip: dw-mipi-dsi: respect message flags John Keeping
2016-09-19 17:17 ` [PATCH 10/26] drm/rockchip: dw-mipi-dsi: only request HS clock when required John Keeping
2016-09-19 17:17 ` [PATCH 11/26] drm/rockchip: dw-mipi-dsi: don't assume buffer is aligned John Keeping
2016-09-19 17:17 ` [PATCH 12/26] drm/rockchip: dw-mipi-dsi: prepare panel after phy init John Keeping
2016-09-19 17:17 ` [PATCH 14/26] drm/rockchip: dw-mipi-dsi: fix escape clock rate John Keeping
2016-09-19 17:17 ` [PATCH 14/27] drm/rockchip: dw-mipi-dsi: use specific poll helper John Keeping
2016-09-19 17:17 ` [PATCH 15/26] drm/rockchip: dw-mipi-dsi: ensure PHY is reset John Keeping
2016-09-19 17:17 ` [PATCH 16/26] drm/rockchip: dw-mipi-dsi: configure bias and bandgap before enable John Keeping
2016-09-19 17:17 ` [PATCH 17/27] drm/rockchip: dw-mipi-dsi: ensure PHY is reset John Keeping
2016-09-19 17:17 ` [PATCH 18/27] drm/rockchip: dw-mipi-dsi: configure bias and bandgap before enable John Keeping
2016-09-19 17:17 ` [PATCH 19/27] drm/rockchip: dw-mipi-dsi: don't enable PHY PLL until it's configured John Keeping
2016-09-19 17:17 ` [PATCH 19/26] drm/rockchip: dw-mipi-dsi: improve PLL configuration John Keeping
2016-09-19 17:17 ` [PATCH 20/27] drm/rockchip: dw-mipi-dsi: properly configure PHY timing John Keeping
2016-09-19 17:17 ` [PATCH 21/26] drm/rockchip: dw-mipi-dsi: use positive check for N{H, V}SYNC John Keeping
2016-09-19 17:17 ` [PATCH 22/27] drm/rockchip: dw-mipi-dsi: defer probe if panel is not loaded John Keeping
2016-09-19 17:17 ` [PATCH 22/26] drm/rockchip: vop: test for P{H,V}SYNC John Keeping
2016-09-19 17:17 ` [PATCH 23/26] drm/rockchip: dw-mipi-dsi: defer probe if panel is not loaded John Keeping
2016-09-19 17:17 ` [PATCH 23/27] drm/rockchip: dw-mipi-dsi: support non-burst modes John Keeping
2016-09-19 17:17 ` [PATCH 24/26] " John Keeping
2016-09-19 17:17 ` [PATCH 24/27] drm/rockchip: vop: test for P{H,V}SYNC John Keeping
2016-09-19 17:17 ` [PATCH 25/26] drm/rockchip: dw-mipi-dsi: add reset control John Keeping
2016-09-19 17:17 ` [PATCH 26/26] drm/rockchip: dw-mipi-dsi: support read commands John Keeping
2016-09-19 17:24 ` [PATCH 00/27] drm/rockchip: MIPI fixes & improvements John Keeping
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=20160919171747.28512-7-john@metanate.com \
--to=john-hoos5bfzl4hwk0htik3j/w@public.gmane.org \
--cc=dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org \
--cc=heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org \
--cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
--cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
--cc=mark.yao-TNX95d0MmH7DzftRWevZcw@public.gmane.org \
/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