Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/chrome...

[cascardo/linux.git] / drivers / gpu / drm / nouveau / nouveau_display.h

diff --git a/drivers/gpu/drm/nouveau/nouveau_display.h b/drivers/gpu/drm/nouveau/nouveau_display.h
index a71cf77..88ca177 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_display.h
+++ b/drivers/gpu/drm/nouveau/nouveau_display.h
@@ -9,9 +9,11 @@ struct nouveau_framebuffer {
        struct drm_framebuffer base;
        struct nouveau_bo *nvbo;
        struct nouveau_vma vma;
-       u32 r_dma;
+       u32 r_handle;
        u32 r_format;
        u32 r_pitch;
+       struct nvif_object h_base[4];
+       struct nvif_object h_core;
 };
 
 static inline struct nouveau_framebuffer *
@@ -36,8 +38,10 @@ struct nouveau_display {
        int  (*init)(struct drm_device *);
        void (*fini)(struct drm_device *);
 
-       struct nouveau_object *core;
-       struct nouveau_eventh **vblank;
+       int  (*fb_ctor)(struct drm_framebuffer *);
+       void (*fb_dtor)(struct drm_framebuffer *);
+
+       struct nvif_object disp;
 
        struct drm_property *dithering_mode;
        struct drm_property *dithering_depth;