These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / gpu / drm / nouveau / nouveau_dp.c

diff --git a/kernel/drivers/gpu/drm/nouveau/nouveau_dp.c b/kernel/drivers/gpu/drm/nouveau/nouveau_dp.c
index c3ef30b..e17e15e 100644 (file)
--- a/kernel/drivers/gpu/drm/nouveau/nouveau_dp.c
+++ b/kernel/drivers/gpu/drm/nouveau/nouveau_dp.c
@@ -31,8 +31,7 @@
 #include "nouveau_crtc.h"
 
 static void
-nouveau_dp_probe_oui(struct drm_device *dev, struct nvkm_i2c_port *auxch,
-                    u8 *dpcd)
+nouveau_dp_probe_oui(struct drm_device *dev, struct nvkm_i2c_aux *aux, u8 *dpcd)
 {
        struct nouveau_drm *drm = nouveau_drm(dev);
        u8 buf[3];
@@ -40,11 +39,11 @@ nouveau_dp_probe_oui(struct drm_device *dev, struct nvkm_i2c_port *auxch,
        if (!(dpcd[DP_DOWN_STREAM_PORT_COUNT] & DP_OUI_SUPPORT))
                return;
 
-       if (!nv_rdaux(auxch, DP_SINK_OUI, buf, 3))
+       if (!nvkm_rdaux(aux, DP_SINK_OUI, buf, 3))
                NV_DEBUG(drm, "Sink OUI: %02hx%02hx%02hx\n",
                             buf[0], buf[1], buf[2]);
 
-       if (!nv_rdaux(auxch, DP_BRANCH_OUI, buf, 3))
+       if (!nvkm_rdaux(aux, DP_BRANCH_OUI, buf, 3))
                NV_DEBUG(drm, "Branch OUI: %02hx%02hx%02hx\n",
                             buf[0], buf[1], buf[2]);
 
@@ -55,15 +54,15 @@ nouveau_dp_detect(struct nouveau_encoder *nv_encoder)
 {
        struct drm_device *dev = nv_encoder->base.base.dev;
        struct nouveau_drm *drm = nouveau_drm(dev);
-       struct nvkm_i2c_port *auxch;
+       struct nvkm_i2c_aux *aux;
        u8 *dpcd = nv_encoder->dp.dpcd;
        int ret;
 
-       auxch = nv_encoder->i2c;
-       if (!auxch)
+       aux = nv_encoder->aux;
+       if (!aux)
                return -ENODEV;
 
-       ret = nv_rdaux(auxch, DP_DPCD_REV, dpcd, 8);
+       ret = nvkm_rdaux(aux, DP_DPCD_REV, dpcd, 8);
        if (ret)
                return ret;
 
@@ -84,6 +83,6 @@ nouveau_dp_detect(struct nouveau_encoder *nv_encoder)
        NV_DEBUG(drm, "maximum: %dx%d\n",
                     nv_encoder->dp.link_nr, nv_encoder->dp.link_bw);
 
-       nouveau_dp_probe_oui(dev, auxch, dpcd);
+       nouveau_dp_probe_oui(dev, aux, dpcd);
        return 0;
 }