diff options
| author | Lyude Paul <lyude@redhat.com> | 2021-04-30 18:34:28 -0400 |
|---|---|---|
| committer | Lyude Paul <lyude@redhat.com> | 2021-05-07 17:32:23 -0400 |
| commit | 4fca55de564ae798c859b21201582ac2c82ccd32 (patch) | |
| tree | c2bf3ab8d0a8385b98076370a5d9ac4048ff4f60 | |
| parent | 205bb69a90363541a634a662a599fddb95956524 (diff) | |
| download | linux-4fca55de564ae798c859b21201582ac2c82ccd32.tar.bz2 | |
drm/dp: Drop open-coded drm_dp_is_branch() in drm_dp_read_downstream_info()
Noticed this while fixing another issue in drm_dp_read_downstream_info(),
the open coded DP_DOWNSTREAMPORT_PRESENT check here just duplicates what we
already do in drm_dp_is_branch(), so just get rid of it.
Signed-off-by: Lyude Paul <lyude@redhat.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210430223428.10514-2-lyude@redhat.com
| -rw-r--r-- | drivers/gpu/drm/drm_dp_helper.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/drm/drm_dp_helper.c b/drivers/gpu/drm/drm_dp_helper.c index 27c8c5bdf7d9..0f84df8798ab 100644 --- a/drivers/gpu/drm/drm_dp_helper.c +++ b/drivers/gpu/drm/drm_dp_helper.c @@ -677,9 +677,7 @@ int drm_dp_read_downstream_info(struct drm_dp_aux *aux, memset(downstream_ports, 0, DP_MAX_DOWNSTREAM_PORTS); /* No downstream info to read */ - if (!drm_dp_is_branch(dpcd) || - dpcd[DP_DPCD_REV] < DP_DPCD_REV_10 || - !(dpcd[DP_DOWNSTREAMPORT_PRESENT] & DP_DWN_STRM_PORT_PRESENT)) + if (!drm_dp_is_branch(dpcd) || dpcd[DP_DPCD_REV] < DP_DPCD_REV_10) return 0; /* Some branches advertise having 0 downstream ports, despite also advertising they have a |