Merge branch 'modesetting-101' of git+ssh://git.freedesktop.org/git/mesa/drm into...

diff --combined linux-core/drm_edid.c
index 7e254ee,bf1ea94..33018da
--- 1/linux-core/drm_edid.c
--- 2/linux-core/drm_edid.c
+++ b/linux-core/drm_edid.c
@@@ -1,8 -1,3 +1,8 @@@
 +/*
 + * Copyright (c) 2007 Intel Corporation
 + *   Jesse Barnes <jesse.barnes@intel.com>
 + */
 +
  #include <linux/i2c.h>
  #include <linux/fb.h>
  #include "drmP.h"
@@@ -78,7 -73,7 +78,7 @@@ struct detailed_data_monitor_range 
        u16 sec_gtf_toggle; /* A000=use above, 20=use below */
        u8 hfreq_start_khz; /* need to multiply by 2 */
        u8 c; /* need to divide by 2 */
 -      u16 m;
 +      u16 m; /* FIXME: byte order */
        u8 k;
        u8 j; /* need to divide by 2 */
  } __attribute__((packed));
@@@ -131,9 -126,9 +131,9 @@@ struct detailed_timing 
  struct edid {
        u8 header[8];
        /* Vendor & product info */
 -      u16 mfg_id;
 -      u16 prod_code;
 -      u32 serial;
 +      u16 mfg_id; /* FIXME: byte order */
 +      u16 prod_code; /* FIXME: byte order */
 +      u32 serial; /* FIXME: byte order */
        u8 mfg_week;
        u8 mfg_year;
        /* EDID version */
@@@ -217,7 -212,8 +217,8 @@@ bad
   *
   * Punts for now.
   */
- struct drm_display_mode *drm_mode_std(struct std_timing *t)
+ struct drm_display_mode *drm_mode_std(struct drm_device *dev,
+                                     struct std_timing *t)
  {
  //    struct fb_videomode mode;
  
@@@ -226,7 -222,7 +227,7 @@@
        struct drm_display_mode *mode;
        int hsize = t->hsize * 8 + 248, vsize;
  
-       mode = kzalloc(sizeof(struct drm_display_mode), GFP_KERNEL);
+       mode = drm_crtc_mode_create(dev);
        if (!mode)
                return NULL;
  
@@@ -244,7 -240,8 +245,8 @@@
        return mode;
  }
  
- struct drm_display_mode *drm_mode_detailed(struct detailed_timing *timing,
+ struct drm_display_mode *drm_mode_detailed(drm_device_t *dev,
+                                          struct detailed_timing *timing,
                                           bool preferred)
  {
        struct drm_display_mode *mode;
@@@ -259,7 -256,7 +261,7 @@@
                return NULL;
        }
  
-       mode = kzalloc(sizeof(struct drm_display_mode), GFP_KERNEL);
+       mode = drm_crtc_mode_create(dev);
        if (!mode)
                return NULL;
  
@@@ -362,6 -359,7 +364,7 @@@ static struct drm_display_mode establis
   */
  static int add_established_modes(struct drm_output *output, struct edid *edid)
  {
+       struct drm_device *dev = output->dev;
        unsigned long est_bits = edid->established_timings.t1 |
                (edid->established_timings.t2 << 8) |
                ((edid->established_timings.mfg_rsvd & 0x80) << 9);
@@@ -370,7 -368,7 +373,7 @@@
        for (i = 0; i <= EDID_EST_TIMINGS; i++)
                if (est_bits & (1<<i)) {
                        drm_mode_probed_add(output,
-                                   drm_mode_duplicate(&established_modes[i]));
+                                           drm_mode_duplicate(dev, &established_modes[i]));
                        modes++;
                }
  
@@@ -387,6 -385,7 +390,7 @@@
  static int add_standard_modes(struct drm_output *output, struct edid *edid)
  {
        int i, modes = 0;
+       struct drm_device *dev = output->dev;
  
        for (i = 0; i < EDID_STD_TIMINGS; i++) {
                struct std_timing *t = &edid->standard_timings[i];
@@@ -396,7 -395,7 +400,7 @@@
                        continue;
  
                drm_mode_probed_add(output,
-                                drm_mode_std(&edid->standard_timings[i]));
+                                   drm_mode_std(dev, &edid->standard_timings[i]));
                modes++;
        }
  
@@@ -414,6 -413,7 +418,7 @@@ static int add_detailed_info(struct drm
  {
        int i, j, modes = 0;
        bool preferred = 0;
+       struct drm_device *dev = output->dev;
  
        for (i = 0; i < EDID_DETAILED_TIMINGS; i++) {
                struct detailed_timing *timing = &edid->detailed_timings[i];
@@@ -428,7 -428,7 +433,7 @@@
                        if (i == 0 && edid->preferred_timing)
                                preferred = 1;
                        drm_mode_probed_add(output,
-                                        drm_mode_detailed(timing, preferred));
+                                           drm_mode_detailed(dev, timing, preferred));
                        modes++;
                        continue;
                }
@@@ -451,7 -451,7 +456,7 @@@
                                struct std_timing *std;
  
                                std = &data->data.timings[j];
-                               drm_mode_probed_add(output, drm_mode_std(std));
+                               drm_mode_probed_add(output, drm_mode_std(dev, std));
                                modes++;
                        }
                        break;