| Message ID | 20200406221253.1307209-5-lyude@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/dp_mst: drm_dp_check_act_status() fixes | expand |
On Mon, Apr 6, 2020 at 6:13 PM Lyude Paul <lyude@redhat.com> wrote: > > Although it's not unexpected for drm_dp_check_act_status() to fail due > to DPCD read failures (as the hub may have just been unplugged > suddenly), timeouts are a bit more worrying as they either mean we need > a longer timeout value, or we aren't setting up payload allocations > properly. So, let's start printing errors on timeouts. > > Signed-off-by: Lyude Paul <lyude@redhat.com> > Cc: Sean Paul <sean@poorly.run> Patches 1,2,4 are still Reviewed-by: Sean Paul <sean@poorly.run> > --- > drivers/gpu/drm/drm_dp_mst_topology.c | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c > index ce61964baa7c..0cbeb0f5c834 100644 > --- a/drivers/gpu/drm/drm_dp_mst_topology.c > +++ b/drivers/gpu/drm/drm_dp_mst_topology.c > @@ -4499,10 +4499,14 @@ int drm_dp_check_act_status(struct drm_dp_mst_topology_mgr *mgr) > status & DP_PAYLOAD_ACT_HANDLED || status < 0, > 100, timeout_ms * USEC_PER_MSEC); > if (ret < 0 && status >= 0) { > - DRM_DEBUG_KMS("Failed to get ACT bit %d after %dms\n", > - status, timeout_ms); > + DRM_ERROR("Failed to get ACT after %dms, last status: %02x\n", > + timeout_ms, status); > return -EINVAL; > } else if (status < 0) { > + /* > + * Failure here isn't unexpected - the hub may have > + * just been unplugged > + */ > DRM_DEBUG_KMS("Failed to read payload table status: %d\n", > status); > return status; > -- > 2.25.1 >
diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c index ce61964baa7c..0cbeb0f5c834 100644 --- a/drivers/gpu/drm/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/drm_dp_mst_topology.c @@ -4499,10 +4499,14 @@ int drm_dp_check_act_status(struct drm_dp_mst_topology_mgr *mgr) status & DP_PAYLOAD_ACT_HANDLED || status < 0, 100, timeout_ms * USEC_PER_MSEC); if (ret < 0 && status >= 0) { - DRM_DEBUG_KMS("Failed to get ACT bit %d after %dms\n", - status, timeout_ms); + DRM_ERROR("Failed to get ACT after %dms, last status: %02x\n", + timeout_ms, status); return -EINVAL; } else if (status < 0) { + /* + * Failure here isn't unexpected - the hub may have + * just been unplugged + */ DRM_DEBUG_KMS("Failed to read payload table status: %d\n", status); return status;
Although it's not unexpected for drm_dp_check_act_status() to fail due to DPCD read failures (as the hub may have just been unplugged suddenly), timeouts are a bit more worrying as they either mean we need a longer timeout value, or we aren't setting up payload allocations properly. So, let's start printing errors on timeouts. Signed-off-by: Lyude Paul <lyude@redhat.com> Cc: Sean Paul <sean@poorly.run> --- drivers/gpu/drm/drm_dp_mst_topology.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)