Backmerge remote-tracking branch 'drm/drm-next' into drm-misc-next

[linux-block.git] / drivers / gpu / drm / nouveau / dispnv04 / crtc.c

diff --git a/drivers/gpu/drm/nouveau/dispnv04/crtc.c b/drivers/gpu/drm/nouveau/dispnv04/crtc.c
index 640738f3196ce8fe931c72fa2ef6633e22adf691..086f7cf4c23e450cfa4bd7e84bd4fb3ca181e17e 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv04/crtc.c
+++ b/drivers/gpu/drm/nouveau/dispnv04/crtc.c
@@ -845,7 +845,7 @@ nv04_crtc_do_mode_set_base(struct drm_crtc *crtc,
        }
 
        nvbo = nouveau_gem_object(drm_fb->obj[0]);
-       nv_crtc->fb.offset = nvbo->bo.offset;
+       nv_crtc->fb.offset = nvbo->offset;
 
        if (nv_crtc->lut.depth != drm_fb->format->depth) {
                nv_crtc->lut.depth = drm_fb->format->depth;
@@ -1013,7 +1013,7 @@ nv04_crtc_cursor_set(struct drm_crtc *crtc, struct drm_file *file_priv,
                nv04_cursor_upload(dev, cursor, nv_crtc->cursor.nvbo);
 
        nouveau_bo_unmap(cursor);
-       nv_crtc->cursor.offset = nv_crtc->cursor.nvbo->bo.offset;
+       nv_crtc->cursor.offset = nv_crtc->cursor.nvbo->offset;
        nv_crtc->cursor.set_offset(nv_crtc, nv_crtc->cursor.offset);
        nv_crtc->cursor.show(nv_crtc, true);
 out:
@@ -1192,7 +1192,7 @@ nv04_crtc_page_flip(struct drm_crtc *crtc, struct drm_framebuffer *fb,
        /* Initialize a page flip struct */
        *s = (struct nv04_page_flip_state)
                { { }, event, crtc, fb->format->cpp[0] * 8, fb->pitches[0],
-                 new_bo->bo.offset };
+                 new_bo->offset };
 
        /* Keep vblanks on during flip, for the target crtc of this flip */
        drm_crtc_vblank_get(crtc);