[RFC v2 20/20] drm/nouveau/kms: Start using drm_dp_read_dpcd_caps()

[Lyude Paul]

Now that we've extracted i915's code for reading both the normal DPCD
caps and extended DPCD caps into a shared helper, let's start using this
in nouveau to enable us to start checking extended DPCD caps for free.

Signed-off-by: Lyude Paul <ly...@redhat.com>
Reviewed-by: Ben Skeggs <bske...@redhat.com>
---
 drivers/gpu/drm/nouveau/nouveau_dp.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/nouveau/nouveau_dp.c 
b/drivers/gpu/drm/nouveau/nouveau_dp.c
index 89afc97ee2591..271a0a863a0e1 100644
--- a/drivers/gpu/drm/nouveau/nouveau_dp.c
+++ b/drivers/gpu/drm/nouveau/nouveau_dp.c
@@ -55,15 +55,13 @@ nouveau_dp_probe_dpcd(struct nouveau_connector 
*nv_connector,
        int ret;
        u8 *dpcd = outp->dp.dpcd;
 
-       ret = drm_dp_dpcd_read(aux, DP_DPCD_REV, dpcd, DP_RECEIVER_CAP_SIZE);
-       if (ret == DP_RECEIVER_CAP_SIZE && dpcd[DP_DPCD_REV]) {
-               ret = drm_dp_read_desc(aux, &outp->dp.desc,
-                                      drm_dp_is_branch(dpcd));
-               if (ret < 0)
-                       goto out;
-       } else {
+       ret = drm_dp_read_dpcd_caps(aux, dpcd);
+       if (ret < 0)
+               goto out;
+
+       ret = drm_dp_read_desc(aux, &outp->dp.desc, drm_dp_is_branch(dpcd));
+       if (ret < 0)
                goto out;
-       }
 
        if (nouveau_mst) {
                mstm = outp->dp.mstm;
-- 
2.26.2