1 files changed, 8 insertions, 7 deletions

diff --git a/drivers/gpu/drm/nouveau/dispnv04/dac.c b/drivers/gpu/drm/nouveau/dispnv04/dac.c
index 81c1efb8b3b6..71e99cdfc40e 100644
--- a/drivers/gpu/drm/nouveau/dispnv04/dac.c
+++ b/drivers/gpu/drm/nouveau/dispnv04/dac.c
@@ -65,7 +65,8 @@ int nv04_dac_output_offset(struct drm_encoder *encoder)
 
 static int sample_load_twice(struct drm_device *dev, bool sense[2])
 {
-        struct nvif_device *device = &nouveau_drm(dev)->device;
+        struct nouveau_drm *drm = nouveau_drm(dev);
+        struct nvif_object *device = &drm->device.object;
         int i;
 
         for (i = 0; i < 2; i++) {
@@ -79,19 +80,19 @@ static int sample_load_twice(struct drm_device *dev, bool sense[2])
                  * use a 10ms timeout (guards against crtc being inactive, in
                  * which case blank state would never change)
                  */
-                if (nvif_msec(device, 10,
+                if (nvif_msec(&drm->device, 10,
                         if (!(nvif_rd32(device, NV_PRMCIO_INP0__COLOR) & 1))
                                 break;
                 ) < 0)
                         return -EBUSY;
 
-                if (nvif_msec(device, 10,
+                if (nvif_msec(&drm->device, 10,
                         if ( (nvif_rd32(device, NV_PRMCIO_INP0__COLOR) & 1))
                                 break;
                 ) < 0)
                         return -EBUSY;
 
-                if (nvif_msec(device, 10,
+                if (nvif_msec(&drm->device, 10,
                         if (!(nvif_rd32(device, NV_PRMCIO_INP0__COLOR) & 1))
                                 break;
                 ) < 0)
@@ -132,7 +133,7 @@ static enum drm_connector_status nv04_dac_detect(struct drm_encoder *encoder,
                                                  struct drm_connector *connector)
 {
         struct drm_device *dev = encoder->dev;
-        struct nvif_device *device = &nouveau_drm(dev)->device;
+        struct nvif_object *device = &nouveau_drm(dev)->device.object;
         struct nouveau_drm *drm = nouveau_drm(dev);
         uint8_t saved_seq1, saved_pi, saved_rpc1, saved_cr_mode;
         uint8_t saved_palette0[3], saved_palette_mask;
@@ -235,8 +236,8 @@ uint32_t nv17_dac_sample_load(struct drm_encoder *encoder)
 {
         struct drm_device *dev = encoder->dev;
         struct nouveau_drm *drm = nouveau_drm(dev);
-        struct nvif_device *device = &nouveau_drm(dev)->device;
-        struct nvkm_gpio *gpio = nvxx_gpio(device);
+        struct nvif_object *device = &nouveau_drm(dev)->device.object;
+        struct nvkm_gpio *gpio = nvxx_gpio(&drm->device);
         struct dcb_output *dcb = nouveau_encoder(encoder)->dcb;
         uint32_t sample, testval, regoffset = nv04_dac_output_offset(encoder);
         uint32_t saved_powerctrl_2 = 0, saved_powerctrl_4 = 0, saved_routput,