Merge tag 'drm-misc-next-2018-06-21' of git://anongit.freedesktop.org/drm/drm-misc...

[mirror_ubuntu-disco-kernel.git] / drivers / gpu / drm / cirrus / cirrus_drv.h

diff --git a/drivers/gpu/drm/cirrus/cirrus_drv.h b/drivers/gpu/drm/cirrus/cirrus_drv.h
index be2d7e4880621a075b4d0f900d14cc204e86c262..ce9db7aab2255c773218778aab7fd62e607a071d 100644 (file)
--- a/drivers/gpu/drm/cirrus/cirrus_drv.h
+++ b/drivers/gpu/drm/cirrus/cirrus_drv.h
@@ -92,7 +92,6 @@
 
 #define to_cirrus_crtc(x) container_of(x, struct cirrus_crtc, base)
 #define to_cirrus_encoder(x) container_of(x, struct cirrus_encoder, base)
-#define to_cirrus_framebuffer(x) container_of(x, struct cirrus_framebuffer, base)
 
 struct cirrus_crtc {
        struct drm_crtc                 base;
@@ -117,11 +116,6 @@ struct cirrus_connector {
        struct drm_connector            base;
 };
 
-struct cirrus_framebuffer {
-       struct drm_framebuffer          base;
-       struct drm_gem_object *obj;
-};
-
 struct cirrus_mc {
        resource_size_t                 vram_size;
        resource_size_t                 vram_base;
@@ -152,7 +146,7 @@ struct cirrus_device {
 
 struct cirrus_fbdev {
        struct drm_fb_helper helper;
-       struct cirrus_framebuffer gfb;
+       struct drm_framebuffer gfb;
        void *sysram;
        int size;
        int x1, y1, x2, y2; /* dirty rect */
@@ -198,7 +192,7 @@ int cirrus_dumb_create(struct drm_file *file,
                       struct drm_mode_create_dumb *args);
 
 int cirrus_framebuffer_init(struct drm_device *dev,
-                          struct cirrus_framebuffer *gfb,
+                           struct drm_framebuffer *gfb,
                            const struct drm_mode_fb_cmd2 *mode_cmd,
                            struct drm_gem_object *obj);