From: Lyude <cpaul@redhat.com> To: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, "Jani Nikula" <jani.nikula@linux.intel.com>, "Ville Syrjälä" <ville.syrjala@linux.intel.com> Cc: Lyude <cpaul@redhat.com>, David Airlie <airlied@linux.ie>, linux-kernel@vger.kernel.org (open list) Subject: [PATCH v5 1/4] drm/dp_helper: Always wait before retrying native aux transactions Date: Wed, 13 Apr 2016 10:58:30 -0400 [thread overview] Message-ID: <1460559513-32280-2-git-send-email-cpaul@redhat.com> (raw) In-Reply-To: <1460559513-32280-1-git-send-email-cpaul@redhat.com> This is part of a patch series to migrate all of the workarounds for commonly seen behavior from bad sinks in intel_dp_dpcd_read_wake() to drm's DP helper. Some sinks need some time during the process of resuming the system from sleep before they're ready to handle transactions. While it would be nice if they responded with NACKs in these scenarios, this isn't always the case as a few sinks will just timeout on all of the transactions they receive until they're ready. Signed-off-by: Lyude <cpaul@redhat.com> --- drivers/gpu/drm/drm_dp_helper.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/drm_dp_helper.c b/drivers/gpu/drm/drm_dp_helper.c index df64ed1..7dd330a 100644 --- a/drivers/gpu/drm/drm_dp_helper.c +++ b/drivers/gpu/drm/drm_dp_helper.c @@ -196,6 +196,10 @@ static int drm_dp_dpcd_access(struct drm_dp_aux *aux, u8 request, * sufficient, bump to 32 which makes Dell 4k monitors happier. */ for (retry = 0; retry < 32; retry++) { + if (err != 0 && err != -ETIMEDOUT) { + usleep_range(AUX_RETRY_INTERVAL, + AUX_RETRY_INTERVAL + 100); + } err = aux->transfer(aux, &msg); if (err < 0) { @@ -205,7 +209,6 @@ static int drm_dp_dpcd_access(struct drm_dp_aux *aux, u8 request, goto unlock; } - switch (msg.reply & DP_AUX_NATIVE_REPLY_MASK) { case DP_AUX_NATIVE_REPLY_ACK: if (err < size) @@ -215,10 +218,6 @@ static int drm_dp_dpcd_access(struct drm_dp_aux *aux, u8 request, case DP_AUX_NATIVE_REPLY_NACK: err = -EIO; goto unlock; - - case DP_AUX_NATIVE_REPLY_DEFER: - usleep_range(AUX_RETRY_INTERVAL, AUX_RETRY_INTERVAL + 100); - break; } } -- 2.5.5
WARNING: multiple messages have this Message-ID (diff)
From: Lyude <cpaul@redhat.com> To: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, "Jani Nikula" <jani.nikula@linux.intel.com>, "Ville Syrjälä" <ville.syrjala@linux.intel.com> Cc: Lyude <cpaul@redhat.com>, open list <linux-kernel@vger.kernel.org> Subject: [PATCH v5 1/4] drm/dp_helper: Always wait before retrying native aux transactions Date: Wed, 13 Apr 2016 10:58:30 -0400 [thread overview] Message-ID: <1460559513-32280-2-git-send-email-cpaul@redhat.com> (raw) In-Reply-To: <1460559513-32280-1-git-send-email-cpaul@redhat.com> This is part of a patch series to migrate all of the workarounds for commonly seen behavior from bad sinks in intel_dp_dpcd_read_wake() to drm's DP helper. Some sinks need some time during the process of resuming the system from sleep before they're ready to handle transactions. While it would be nice if they responded with NACKs in these scenarios, this isn't always the case as a few sinks will just timeout on all of the transactions they receive until they're ready. Signed-off-by: Lyude <cpaul@redhat.com> --- drivers/gpu/drm/drm_dp_helper.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/drm_dp_helper.c b/drivers/gpu/drm/drm_dp_helper.c index df64ed1..7dd330a 100644 --- a/drivers/gpu/drm/drm_dp_helper.c +++ b/drivers/gpu/drm/drm_dp_helper.c @@ -196,6 +196,10 @@ static int drm_dp_dpcd_access(struct drm_dp_aux *aux, u8 request, * sufficient, bump to 32 which makes Dell 4k monitors happier. */ for (retry = 0; retry < 32; retry++) { + if (err != 0 && err != -ETIMEDOUT) { + usleep_range(AUX_RETRY_INTERVAL, + AUX_RETRY_INTERVAL + 100); + } err = aux->transfer(aux, &msg); if (err < 0) { @@ -205,7 +209,6 @@ static int drm_dp_dpcd_access(struct drm_dp_aux *aux, u8 request, goto unlock; } - switch (msg.reply & DP_AUX_NATIVE_REPLY_MASK) { case DP_AUX_NATIVE_REPLY_ACK: if (err < size) @@ -215,10 +218,6 @@ static int drm_dp_dpcd_access(struct drm_dp_aux *aux, u8 request, case DP_AUX_NATIVE_REPLY_NACK: err = -EIO; goto unlock; - - case DP_AUX_NATIVE_REPLY_DEFER: - usleep_range(AUX_RETRY_INTERVAL, AUX_RETRY_INTERVAL + 100); - break; } } -- 2.5.5 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2016-04-13 14:59 UTC|newest] Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-03-28 14:33 [PATCH v4 RESEND 0/5] Move workarounds from intel_dp_dpcd_read_wake() into drm's DP helpers Lyude 2016-03-28 14:33 ` Lyude 2016-03-28 14:31 ` ✗ Fi.CI.BAT: failure for " Patchwork 2016-03-28 14:33 ` [PATCH v4 RESEND 1/5] drm/dp_helper: Increase retry interval to 1000us Lyude 2016-03-28 14:33 ` Lyude 2016-03-29 8:27 ` Daniel Vetter 2016-03-29 8:27 ` Daniel Vetter 2016-03-29 14:05 ` Lyude Paul 2016-03-28 14:33 ` [PATCH v4 RESEND 2/5] drm/dp_helper: Always wait before retrying native aux transactions Lyude 2016-03-28 14:33 ` Lyude 2016-03-28 14:33 ` [PATCH v4 RESEND 3/5] drm/dp_helper: Retry aux transactions on all errors Lyude 2016-03-28 14:33 ` Lyude 2016-03-28 14:33 ` [PATCH v4 RESEND 4/5] drm/dp_helper: Perform throw-away read before actual read in drm_dp_dpcd_read() Lyude 2016-03-28 14:33 ` Lyude 2016-03-29 20:43 ` [PATCH v5 " Lyude 2016-03-29 20:43 ` Lyude 2016-03-28 14:33 ` [PATCH v4 RESEND 5/5] drm/i915: Get rid of intel_dp_dpcd_read_wake() Lyude 2016-03-28 14:33 ` Lyude 2016-03-30 14:26 ` Jani Nikula 2016-03-30 14:26 ` Jani Nikula 2016-04-12 10:17 ` [PATCH v4 RESEND 0/5] Move workarounds from intel_dp_dpcd_read_wake() into drm's DP helpers Jani Nikula 2016-04-12 10:17 ` Jani Nikula 2016-04-12 15:59 ` Lyude 2016-04-12 15:59 ` Lyude 2016-04-13 14:58 ` [PATCH v5 0/4] " Lyude 2016-04-13 14:58 ` Lyude 2016-04-13 14:58 ` Lyude [this message] 2016-04-13 14:58 ` [PATCH v5 1/4] drm/dp_helper: Always wait before retrying native aux transactions Lyude 2016-04-13 14:58 ` [PATCH v5 2/4] drm/dp_helper: Retry aux transactions on all errors Lyude 2016-04-13 14:58 ` Lyude 2016-04-13 14:58 ` [PATCH v5 3/4] drm/dp_helper: Perform throw-away read before actual read in drm_dp_dpcd_read() Lyude 2016-04-13 14:58 ` Lyude 2016-04-14 17:01 ` Ville Syrjälä 2016-04-14 17:01 ` Ville Syrjälä 2016-04-15 14:25 ` [PATCH v6 " Lyude 2016-04-15 14:25 ` Lyude 2016-04-15 14:31 ` Ville Syrjälä 2016-04-15 14:31 ` Ville Syrjälä 2016-04-13 14:58 ` [PATCH v5 4/4] drm/i915: Get rid of intel_dp_dpcd_read_wake() Lyude 2016-04-13 14:58 ` Lyude 2016-04-22 16:54 ` Daniel Vetter 2016-04-22 16:54 ` Daniel Vetter 2016-04-14 10:58 ` ✗ Fi.CI.BAT: failure for series starting with [v5,1/4] drm/dp_helper: Always wait before retrying native aux transactions Patchwork
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=1460559513-32280-2-git-send-email-cpaul@redhat.com \ --to=cpaul@redhat.com \ --cc=airlied@linux.ie \ --cc=dri-devel@lists.freedesktop.org \ --cc=intel-gfx@lists.freedesktop.org \ --cc=jani.nikula@linux.intel.com \ --cc=linux-kernel@vger.kernel.org \ --cc=ville.syrjala@linux.intel.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.