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

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

diff --git a/kernel/drivers/gpu/drm/nouveau/dispnv04/disp.c b/kernel/drivers/gpu/drm/nouveau/dispnv04/disp.c
index 4131be5..9e65008 100644 (file)
--- a/kernel/drivers/gpu/drm/nouveau/dispnv04/disp.c
+++ b/kernel/drivers/gpu/drm/nouveau/dispnv04/disp.c
@@ -47,7 +47,7 @@ nv04_display_create(struct drm_device *dev)
        if (!disp)
                return -ENOMEM;
 
-       nvif_object_map(nvif_object(&drm->device));
+       nvif_object_map(&drm->device.object);
 
        nouveau_display(dev)->priv = disp;
        nouveau_display(dev)->dtor = nv04_display_destroy;
@@ -101,7 +101,9 @@ nv04_display_create(struct drm_device *dev)
 
        list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
                struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);
-               nv_encoder->i2c = i2c->find(i2c, nv_encoder->dcb->i2c_index);
+               struct nvkm_i2c_bus *bus =
+                       nvkm_i2c_bus_find(i2c, nv_encoder->dcb->i2c_index);
+               nv_encoder->i2c = bus ? &bus->i2c : NULL;
        }
 
        /* Save previous state */
@@ -151,7 +153,7 @@ nv04_display_destroy(struct drm_device *dev)
        nouveau_display(dev)->priv = NULL;
        kfree(disp);
 
-       nvif_object_unmap(nvif_object(&drm->device));
+       nvif_object_unmap(&drm->device.object);
 }
 
 int