dri-devel.lists.freedesktop.org archive mirror
 help / color / mirror / Atom feed
From: Sean Paul <seanpaul-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>
To: linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
	dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org
Cc: "Archit Taneja" <architt-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>,
	"征增 王" <wzz-TNX95d0MmH7DzftRWevZcw@public.gmane.org>,
	"Lin Huang" <hl-TNX95d0MmH7DzftRWevZcw@public.gmane.org>,
	"Tomeu Vizoso"
	<tomeu.vizoso-ZGY8ohtN/8qB+jHODAdFcQ@public.gmane.org>,
	"David Airlie" <airlied-cv59FeDIM0c@public.gmane.org>,
	"Douglas Anderson"
	<dianders-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>,
	"Krzysztof Kozlowski"
	<krzk-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>,
	"Sean Paul" <seanpaul-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>,
	"Yakir Yang" <ykk-TNX95d0MmH7DzftRWevZcw@public.gmane.org>,
	"Stéphane Marchesin"
	<marcheu-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>
Subject: [PATCH 41/41] drm/bridge: analogix_dp: Properly disable aux chan retries on rockchip
Date: Thu,  9 Mar 2017 23:32:56 -0500	[thread overview]
Message-ID: <20170310043305.17216-42-seanpaul@chromium.org> (raw)
In-Reply-To: <20170310043305.17216-1-seanpaul-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>

From: Douglas Anderson <dianders@chromium.org>

The comments in analogix_dp_init_aux() claim that we're disabling aux
channel retries, but then right below it for Rockchip it sets them to
3.  If we actually need 3 retries for Rockchip then we could adjust
the comment, but it seems more likely that we want the same retry
behavior across all platforms.

Cc: Stéphane Marchesin <marcheu@chromium.org>
Cc: 征增 王 <wzz@rock-chips.com>
Signed-off-by: Douglas Anderson <dianders@chromium.org>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
---
 drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c
index 29d130222636..57dd1991d7de 100644
--- a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c
+++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c
@@ -480,15 +480,16 @@ void analogix_dp_init_aux(struct analogix_dp_device *dp)
 
 	analogix_dp_reset_aux(dp);
 
-	/* Disable AUX transaction H/W retry */
+	/* AUX_BIT_PERIOD_EXPECTED_DELAY doesn't apply to Rockchip IP */
 	if (dp->plat_data && is_rockchip(dp->plat_data->dev_type))
-		reg = AUX_BIT_PERIOD_EXPECTED_DELAY(0) |
-		      AUX_HW_RETRY_COUNT_SEL(3) |
-		      AUX_HW_RETRY_INTERVAL_600_MICROSECONDS;
+		reg = 0;
 	else
-		reg = AUX_BIT_PERIOD_EXPECTED_DELAY(3) |
-		      AUX_HW_RETRY_COUNT_SEL(0) |
-		      AUX_HW_RETRY_INTERVAL_600_MICROSECONDS;
+		reg = AUX_BIT_PERIOD_EXPECTED_DELAY(3);
+
+	/* Disable AUX transaction H/W retry */
+	reg |= AUX_HW_RETRY_COUNT_SEL(0) |
+	       AUX_HW_RETRY_INTERVAL_600_MICROSECONDS;
+
 	writel(reg, dp->reg_base + ANALOGIX_DP_AUX_HW_RETRY_CTL);
 
 	/* Receive AUX Channel DEFER commands equal to DEFFER_COUNT*64 */
-- 
2.12.0.246.ga2ecc84866-goog


_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip

  parent reply	other threads:[~2017-03-10  4:32 UTC|newest]

Thread overview: 85+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-03-10  4:32 [PATCH 00/41] Chromebook Plus (aka kevin) kernel patches Sean Paul
2017-03-10  4:32 ` [PATCH 01/41] drm/panel: simple: Change mode for Sharp lq123p1jx31 Sean Paul
2017-03-20 13:59   ` Thierry Reding
2017-03-20 16:37     ` Doug Anderson
2017-03-20 20:01       ` Stéphane Marchesin
2017-03-20 20:05         ` Doug Anderson
2017-03-10  4:32 ` [PATCH 03/41] drm/rockchip: support prime import sg table Sean Paul
2017-12-12 12:32   ` Heiko Stuebner
2017-03-10  4:32 ` [PATCH 04/41] drm/rockchip: Respect page offset for PRIME mmap calls Sean Paul
2017-12-12 16:58   ` Heiko Stuebner
2017-03-10  4:32 ` [PATCH 05/41] drm/bridge: analogix_dp: set psr activate/deactivate when enable/disable bridge Sean Paul
2017-03-10  4:32 ` [PATCH 07/41] drm/rockchip: Don't use atomic constructs for psr Sean Paul
2017-03-10  4:32 ` [PATCH 09/41] drm/rockchip: Remove analogix psr worker Sean Paul
2017-03-10  4:32 ` [PATCH 10/41] drm/bridge: analogix_dp: Don't change psr while bridge is disabled Sean Paul
2017-03-16 13:40   ` Andrzej Hajda
2017-03-21 19:58     ` Sean Paul
2017-03-22  8:36       ` Andrzej Hajda
2017-03-22 15:19         ` Sean Paul
2017-03-23  9:04           ` Andrzej Hajda
2017-03-10  4:32 ` [PATCH 11/41] drm/rockchip: add mutex vop lock Sean Paul
2017-03-10  4:32 ` [PATCH 13/41] drm/rockchip: pre dither down when output bpc is 8bit Sean Paul
2017-03-10  4:32 ` [PATCH 14/41] drm/rockchip: Only wait for panel ACK on PSR entry Sean Paul
2017-03-10  4:32 ` [PATCH 20/41] drm/bridge: analogix_dp: Set PD_INC_BG first when powering up edp phy Sean Paul
2017-03-16 14:54   ` Andrzej Hajda
     [not found] ` <20170310043305.17216-1-seanpaul-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>
2017-03-10  4:32   ` [PATCH 02/41] drm/rockchip: Get rid of some unnecessary code Sean Paul
2017-12-12 12:25     ` Heiko Stuebner
2017-03-10  4:32   ` [PATCH 06/41] drm/bridge: analogix_dp: Don't power bridge in analogix_dp_bind Sean Paul
2017-03-16 12:31     ` Andrzej Hajda
2017-03-10  4:32   ` [PATCH 08/41] drm/bridge: analogix_dp: detect Sink PSR state after configuring the PSR Sean Paul
2017-03-16 13:28     ` Andrzej Hajda
2017-03-10  4:32   ` [PATCH 12/41] drm/bridge: analogix_dp: add fast link train for eDP Sean Paul
2017-03-16 14:14     ` Andrzej Hajda
2017-03-21 20:37       ` Sean Paul
2017-03-22  8:07         ` Andrzej Hajda
2017-03-10  4:32   ` [PATCH 15/41] drm/bridge: analogix_dp: Move enable video into config_video() Sean Paul
2017-03-16 14:26     ` Andrzej Hajda
2017-03-10  4:32   ` [PATCH 16/41] drm/bridge: analogix_dp: Check AUX_EN status when doing AUX transfer Sean Paul
2017-03-16 14:28     ` Andrzej Hajda
2017-03-10  4:32   ` [PATCH 17/41] drm/bridge: analogix_dp: Don't use fast link training when panel just powered up Sean Paul
2017-03-16 14:34     ` Andrzej Hajda
2017-03-10  4:32   ` [PATCH 18/41] drm/bridge: analogix_dp: Retry bridge enable when it failed Sean Paul
2017-03-16 14:45     ` Andrzej Hajda
2017-03-10  4:32   ` [PATCH 19/41] drm/bridge: analogix_dp: Wait for HPD signal before configuring link Sean Paul
2017-03-16 14:51     ` Andrzej Hajda
2017-03-10  4:32   ` [PATCH 21/41] drm/bridge: analogix_dp: Ensure edp is disabled when shutting down the panel Sean Paul
2017-03-22  8:29     ` Andrzej Hajda
2017-03-10  4:32   ` [PATCH 22/41] drm/bridge: analogix_dp: Extend hpd check time to 100ms Sean Paul
2017-03-22  8:32     ` Andrzej Hajda
2017-03-10  4:32   ` [PATCH 23/41] drm/bridge: analogix_dp: Fix incorrect usage of enhanced mode Sean Paul
2017-03-22  8:46     ` Andrzej Hajda
2017-03-10  4:32   ` [PATCH 24/41] drm/bridge: analogix_dp: Check dpcd write/read status Sean Paul
2017-03-22  9:00     ` Andrzej Hajda
2017-03-10  4:32   ` [PATCH 25/41] drm/bridge: analogix_dp: Fix AUX_PD bit for Rockchip Sean Paul
2017-03-22  9:09     ` Andrzej Hajda
2017-03-10  4:32   ` [PATCH 26/41] drm/bridge: analogix_dp: Reset aux channel if an error occurred Sean Paul
2017-03-22  9:14     ` Andrzej Hajda
2017-03-10  4:32   ` [PATCH 35/41] drm/rockchip: analogix_dp: Fix invalid implementation of unbind Sean Paul
2017-03-10  4:32   ` [PATCH 36/41] drm/bridge: analogix_dp: Add analogix_dp_shutdown Sean Paul
2017-03-10  4:32   ` [PATCH 37/41] drm/rockchip: analogix_dp: Wire the shutdown callback to disable PSR Sean Paul
2017-03-10  4:32   ` [PATCH 38/41] drm/bridge: analogix_dp: Reorder plat_data->power_off to happen sooner Sean Paul
2017-03-22 10:34     ` Andrzej Hajda
2017-03-10  4:32   ` Sean Paul [this message]
2017-03-22 10:57     ` [PATCH 41/41] drm/bridge: analogix_dp: Properly disable aux chan retries on rockchip Andrzej Hajda
2017-03-22 15:59       ` Doug Anderson
2017-03-28 15:40         ` Javier Martinez Canillas
2017-03-10  4:32 ` [PATCH 27/41] drm/rockchip: Restore psr->state when enable/disable psr failed Sean Paul
2017-03-10  4:32 ` [PATCH 28/41] drm/bridge: analogix_dp: Don't use ANALOGIX_DP_PLL_CTL to control pll Sean Paul
2017-03-22  9:17   ` Andrzej Hajda
2017-03-10  4:32 ` [PATCH 29/41] drm/bridge: analogix_dp: Fix timeout of video streamclk config Sean Paul
2017-03-22  9:24   ` Andrzej Hajda
2017-03-10  4:32 ` [PATCH 30/41] drm/bridge: analogix_dp: Fix incorrect operations with register ANALOGIX_DP_FUNC_EN_1 Sean Paul
2017-03-22  9:29   ` Andrzej Hajda
2017-03-10  4:32 ` [PATCH 31/41] drm/bridge: analogix_dp: Move fast link training detect to set_bridge Sean Paul
2017-03-22 10:25   ` Andrzej Hajda
2017-03-10  4:32 ` [PATCH 32/41] drm/rockchip: Flush PSR before committing modeset disables/enables Sean Paul
2017-03-10  4:32 ` [PATCH 33/41] drm/rockchip: Disable VOP windows when PSR is active Sean Paul
2017-03-10  4:32 ` [PATCH 34/41] drm/bridge: analogix_dp: Allow master driver to cleanup in unbind Sean Paul
2017-03-10  7:09   ` Tomasz Figa
2017-03-10 14:24     ` Sean Paul
2017-03-10  4:32 ` [PATCH 39/41] drm/bridge: analogix_dp: Split the platform-specific poweron in two parts Sean Paul
2017-03-22 10:42   ` Andrzej Hajda
2017-03-10  4:32 ` [PATCH 40/41] drm/bridge: analogix_dp: Properly log AUX CH errors Sean Paul
2017-03-22 10:47   ` Andrzej Hajda
2017-03-14 20:43 ` [PATCH 00/41] Chromebook Plus (aka kevin) kernel patches Sean Paul
2017-03-16 16:45   ` Enric Balletbo Serra

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=20170310043305.17216-42-seanpaul@chromium.org \
    --to=seanpaul-f7+t8e8rja9g9huczpvpmw@public.gmane.org \
    --cc=airlied-cv59FeDIM0c@public.gmane.org \
    --cc=architt-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org \
    --cc=dianders-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org \
    --cc=dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org \
    --cc=hl-TNX95d0MmH7DzftRWevZcw@public.gmane.org \
    --cc=krzk-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \
    --cc=linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
    --cc=marcheu-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org \
    --cc=tomeu.vizoso-ZGY8ohtN/8qB+jHODAdFcQ@public.gmane.org \
    --cc=wzz-TNX95d0MmH7DzftRWevZcw@public.gmane.org \
    --cc=ykk-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;
as well as URLs for NNTP newsgroup(s).