github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-28 01:55:51 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

drm/i915: Flatten intel_dp_check_mst_status() a bit

Browse Source 
Make intel_dp_check_mst_status() somewhat legible by humans.

Note that the return value of drm_dp_mst_hpd_irq() is always
either 0 or -ENOMEM, and we never did anything with the latter
so we can just ignore the whole thing.

We can also get rid of the direct drm_dp_mst_topology_mgr_set_mst(false)
call since returning -EINVAL causes the caller to do the very same call
for us.

Cc: Lyude Paul <lyude@redhat.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200417152734.464-1-ville.syrjala@linux.intel.com
Reviewed-by: Lyude Paul <lyude@redhat.com>
This commit is contained in:
Ville Syrjälä 2020-04-17 18:27:33 +03:00
parent eed22a46b9
commit 3c0ec2c2d5
1 changed files with 41 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
drivers/gpu/drm/i915/display/intel_dp.c
View File

@ -5625,61 +5625,55 @@ static int
intel_dp_check_mst_status(struct intel_dp *intel_dp) intel_dp_check_mst_status(struct intel_dp *intel_dp)
{ {
struct drm_i915_private *i915 = dp_to_i915(intel_dp); struct drm_i915_private *i915 = dp_to_i915(intel_dp);
bool bret;
if (intel_dp->is_mst) { if (!intel_dp->is_mst)
u8 esi[DP_DPRX_ESI_LEN] = { 0 }; return -EINVAL;
int ret = 0;
WARN_ON_ONCE(intel_dp->active_mst_links < 0);
for (;;) {
u8 esi[DP_DPRX_ESI_LEN] = {};
bool bret, handled;
int retry; int retry;
bool handled;
WARN_ON_ONCE(intel_dp->active_mst_links < 0);
bret = intel_dp_get_sink_irq_esi(intel_dp, esi); bret = intel_dp_get_sink_irq_esi(intel_dp, esi);
go_again: if (!bret) {
if (bret == true) {
/* check link status - esi[10] = 0x200c */
if (intel_dp->active_mst_links > 0 &&
!drm_dp_channel_eq_ok(&esi[10], intel_dp->lane_count)) {
drm_dbg_kms(&i915->drm,
"channel EQ not ok, retraining\n");
intel_dp_start_link_train(intel_dp);
intel_dp_stop_link_train(intel_dp);
}
drm_dbg_kms(&i915->drm, "got esi %3ph\n", esi);
ret = drm_dp_mst_hpd_irq(&intel_dp->mst_mgr, esi, &handled);
if (handled) {
for (retry = 0; retry < 3; retry++) {
int wret;
wret = drm_dp_dpcd_write(&intel_dp->aux,
DP_SINK_COUNT_ESI+1,
&esi[1], 3);
if (wret == 3) {
break;
}
}
bret = intel_dp_get_sink_irq_esi(intel_dp, esi);
if (bret == true) {
drm_dbg_kms(&i915->drm,
"got esi2 %3ph\n", esi);
goto go_again;
}
} else
ret = 0;
return ret;
} else {
drm_dbg_kms(&i915->drm, drm_dbg_kms(&i915->drm,
"failed to get ESI - device may have failed\n"); "failed to get ESI - device may have failed\n");
intel_dp->is_mst = false; return -EINVAL;
drm_dp_mst_topology_mgr_set_mst(&intel_dp->mst_mgr, }
intel_dp->is_mst);
/* check link status - esi[10] = 0x200c */
/*
* FIXME kill this and use the SST retraining approach
* for MST as well.
*/
if (intel_dp->active_mst_links > 0 &&
!drm_dp_channel_eq_ok(&esi[10], intel_dp->lane_count)) {
drm_dbg_kms(&i915->drm,
"channel EQ not ok, retraining\n");
intel_dp_start_link_train(intel_dp);
intel_dp_stop_link_train(intel_dp);
}
drm_dbg_kms(&i915->drm, "got esi %3ph\n", esi);
drm_dp_mst_hpd_irq(&intel_dp->mst_mgr, esi, &handled);
if (!handled)
break;
for (retry = 0; retry < 3; retry++) {
int wret;
wret = drm_dp_dpcd_write(&intel_dp->aux,
DP_SINK_COUNT_ESI+1,
&esi[1], 3);
if (wret == 3)
break;
} }
} }
return -EINVAL;
return 0;
} }
static bool static bool