Merge branch 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6

* 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (55 commits)
  io-mapping: move asm include inside the config option
  vgaarb: drop vga.h include
  drm/radeon: Add probing of clocks from device-tree
  drm/radeon: drop old and broken mesa warning
  drm/radeon: Fix pci_map_page() error checking
  drm: Remove count_lock for calling lastclose() after 58474713 (v2)
  drm/radeon/kms: allow FG_ALPHA_VALUE on r5xx
  drm/radeon/kms: another r6xx/r7xx CS checker fix
  DRM: Replace kmalloc/memset combos with kzalloc
  drm: expand gamma_set
  drm/edid: Split mode lists out to their own header for readability
  drm/edid: Rewrite mode parse to use the generic detailed block walk
  drm/edid: Add detailed block walk for VTB extensions
  drm/edid: Add detailed block walk for CEA extensions
  drm: Remove unused fields from drm_display_info
  drm: Use ENOENT consistently for the error return for an unmatched handle.
  drm/radeon/kms: mark 3D power states as performance
  drm: Only set DPMS once on the CRTC not after every encoder.
  drm/radeon/kms: add additional quirk for Acer rv620 laptop
  drm: Propagate error code from fb_create()
  ...

Fix up trivial conflicts in drivers/gpu/drm/drm_edid.c

1 files changed, 2 insertions, 35 deletions

diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
index c707270bff5a..c9f3cc5949a8 100644
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
@@ -189,49 +189,16 @@ enum subpixel_order {
  */
 struct drm_display_info {
         char name[DRM_DISPLAY_INFO_LEN];
-        /* Input info */
-        bool serration_vsync;
-        bool sync_on_green;
-        bool composite_sync;
-        bool separate_syncs;
-        bool blank_to_black;
-        unsigned char video_level;
-        bool digital;
+
         /* Physical size */
         unsigned int width_mm;
         unsigned int height_mm;
 
-        /* Display parameters */
-        unsigned char gamma; /* FIXME: storage format */
-        bool gtf_supported;
-        bool standard_color;
-        enum {
-                monochrome = 0,
-                rgb,
-                other,
-                unknown,
-        } display_type;
-        bool active_off_supported;
-        bool suspend_supported;
-        bool standby_supported;
-
-        /* Color info FIXME: storage format */
-        unsigned short redx, redy;
-        unsigned short greenx, greeny;
-        unsigned short bluex, bluey;
-        unsigned short whitex, whitey;
-
         /* Clock limits FIXME: storage format */
         unsigned int min_vfreq, max_vfreq;
         unsigned int min_hfreq, max_hfreq;
         unsigned int pixel_clock;
 
-        /* White point indices FIXME: storage format */
-        unsigned int wpx1, wpy1;
-        unsigned int wpgamma1;
-        unsigned int wpx2, wpy2;
-        unsigned int wpgamma2;
-
         enum subpixel_order subpixel_order;
 
         char *raw_edid; /* if any */
@@ -342,7 +309,7 @@ struct drm_crtc_funcs {
 
         /* Set gamma on the CRTC */
         void (*gamma_set)(struct drm_crtc *crtc, u16 *r, u16 *g, u16 *b,
-                          uint32_t size);
+                          uint32_t start, uint32_t size);
         /* Object destroy routine */
         void (*destroy)(struct drm_crtc *crtc);