Merge tag 'for-linus-20141215' of git://git.infradead.org/linux-mtd

[karo-tx-linux.git] / include / drm / drm_fb_helper.h

diff --git a/include/drm/drm_fb_helper.h b/include/drm/drm_fb_helper.h
index bfd329d613c4541fe1bb311e5e435dbac5c3da1a..b597068103aa9d8d1bf66841f76858e904f72c34 100644 (file)
--- a/include/drm/drm_fb_helper.h
+++ b/include/drm/drm_fb_helper.h
@@ -34,9 +34,14 @@ struct drm_fb_helper;
 
 #include <linux/kgdb.h>
 
+struct drm_fb_offset {
+       int x, y;
+};
+
 struct drm_fb_helper_crtc {
        struct drm_mode_set mode_set;
        struct drm_display_mode *desired_mode;
+       int x, y;
 };
 
 struct drm_fb_helper_surface_size {
@@ -72,12 +77,12 @@ struct drm_fb_helper_funcs {
        bool (*initial_config)(struct drm_fb_helper *fb_helper,
                               struct drm_fb_helper_crtc **crtcs,
                               struct drm_display_mode **modes,
+                              struct drm_fb_offset *offsets,
                               bool *enabled, int width, int height);
 };
 
 struct drm_fb_helper_connector {
        struct drm_connector *connector;
-       struct drm_cmdline_mode cmdline_mode;
 };
 
 struct drm_fb_helper {