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

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

diff --git a/drivers/gpu/drm/nouveau/dispnv04/disp.c b/drivers/gpu/drm/nouveau/dispnv04/disp.c
index 0f4ebefed1fd0db40ea3fcb1a1b1a419f4834641..76be805fc488799aa90e46b55dd531873c3483c6 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv04/disp.c
+++ b/drivers/gpu/drm/nouveau/dispnv04/disp.c
@@ -152,7 +152,8 @@ nv04_display_init(struct drm_device *dev, bool resume, bool runtime)
                        continue;
 
                if (nv_crtc->cursor.set_offset)
-                       nv_crtc->cursor.set_offset(nv_crtc, nv_crtc->cursor.nvbo->bo.offset);
+                       nv_crtc->cursor.set_offset(nv_crtc,
+                                                  nv_crtc->cursor.nvbo->offset);
                nv_crtc->cursor.set_pos(nv_crtc, nv_crtc->cursor_saved_x,
                                                 nv_crtc->cursor_saved_y);
        }