12 files changed, 94 insertions, 47 deletions

diff --git a/drivers/gpu/drm/drm_fb_cma_helper.c b/drivers/gpu/drm/drm_fb_cma_helper.c
index 0b5af7d0edb1..c385cc5e730e 100644
--- a/drivers/gpu/drm/drm_fb_cma_helper.c
+++ b/drivers/gpu/drm/drm_fb_cma_helper.c
@@ -92,7 +92,7 @@ static struct drm_fb_cma *drm_fb_cma_alloc(struct drm_device *dev,
 
         ret = drm_framebuffer_init(dev, &fb_cma->fb, &drm_fb_cma_funcs);
         if (ret) {
-                dev_err(dev->dev, "Failed to initalize framebuffer: %d\n", ret);
+                dev_err(dev->dev, "Failed to initialize framebuffer: %d\n", ret);
                 kfree(fb_cma);
                 return ERR_PTR(ret);
         }
@@ -376,7 +376,7 @@ struct drm_fbdev_cma *drm_fbdev_cma_init(struct drm_device *dev,
 
         ret = drm_fb_helper_initial_config(helper, preferred_bpp);
         if (ret < 0) {
-                dev_err(dev->dev, "Failed to set inital hw configuration.\n");
+                dev_err(dev->dev, "Failed to set initial hw configuration.\n");
                 goto err_drm_fb_helper_fini;
         }
 
diff --git a/drivers/gpu/drm/i810/i810_dma.c b/drivers/gpu/drm/i810/i810_dma.c
index 004ecdfe1b55..ada49eda489f 100644
--- a/drivers/gpu/drm/i810/i810_dma.c
+++ b/drivers/gpu/drm/i810/i810_dma.c
@@ -97,7 +97,7 @@ static int i810_mmap_buffers(struct file *filp, struct vm_area_struct *vma)
         buf = dev_priv->mmap_buffer;
         buf_priv = buf->dev_private;
 
-        vma->vm_flags |= (VM_IO | VM_DONTCOPY);
+        vma->vm_flags |= VM_DONTCOPY;
 
         buf_priv->currently_mapped = I810_BUF_MAPPED;
 
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index cc1d6056ab70..a416645bcd23 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1806,6 +1806,8 @@ struct drm_gem_object *i915_gem_prime_import(struct drm_device *dev,
 struct dma_buf *i915_gem_prime_export(struct drm_device *dev,
                                 struct drm_gem_object *gem_obj, int flags);
 
+void i915_gem_restore_fences(struct drm_device *dev);
+
 /* i915_gem_context.c */
 void i915_gem_context_init(struct drm_device *dev);
 void i915_gem_context_fini(struct drm_device *dev);
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 769f75262feb..4200c32407ec 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -2247,25 +2247,15 @@ static void i915_gem_reset_ring_lists(struct drm_i915_private *dev_priv,
         }
 }
 
-static void i915_gem_reset_fences(struct drm_device *dev)
+void i915_gem_restore_fences(struct drm_device *dev)
 {
         struct drm_i915_private *dev_priv = dev->dev_private;
         int i;
 
         for (i = 0; i < dev_priv->num_fence_regs; i++) {
                 struct drm_i915_fence_reg *reg = &dev_priv->fence_regs[i];
-
-                if (reg->obj)
-                        i915_gem_object_fence_lost(reg->obj);
-
-                i915_gem_write_fence(dev, i, NULL);
-
-                reg->pin_count = 0;
-                reg->obj = NULL;
-                INIT_LIST_HEAD(&reg->lru_list);
+                i915_gem_write_fence(dev, i, reg->obj);
         }
-
-        INIT_LIST_HEAD(&dev_priv->mm.fence_list);
 }
 
 void i915_gem_reset(struct drm_device *dev)
@@ -2288,8 +2278,7 @@ void i915_gem_reset(struct drm_device *dev)
                 obj->base.read_domains &= ~I915_GEM_GPU_DOMAINS;
         }
 
-        /* The fence registers are invalidated so clear them out */
-        i915_gem_reset_fences(dev);
+        i915_gem_restore_fences(dev);
 }
 
 /**
@@ -4020,8 +4009,6 @@ i915_gem_idle(struct drm_device *dev)
         if (!drm_core_check_feature(dev, DRIVER_MODESET))
                 i915_gem_evict_everything(dev);
 
-        i915_gem_reset_fences(dev);
-
         /* Hack!  Don't let anybody do execbuf while we don't control the chip.
          * We need to replace this with a semaphore, or something.
          * And not confound mm.suspended!
@@ -4357,7 +4344,8 @@ i915_gem_load(struct drm_device *dev)
                 dev_priv->num_fence_regs = 8;
 
         /* Initialize fence registers to zero */
-        i915_gem_reset_fences(dev);
+        INIT_LIST_HEAD(&dev_priv->mm.fence_list);
+        i915_gem_restore_fences(dev);
 
         i915_gem_detect_bit_6_swizzle(dev);
         init_waitqueue_head(&dev_priv->pending_flip_queue);
diff --git a/drivers/gpu/drm/i915/i915_suspend.c b/drivers/gpu/drm/i915/i915_suspend.c
index 88b9a663944f..70db618989c4 100644
--- a/drivers/gpu/drm/i915/i915_suspend.c
+++ b/drivers/gpu/drm/i915/i915_suspend.c
@@ -394,6 +394,7 @@ int i915_restore_state(struct drm_device *dev)
 
         mutex_lock(&dev->struct_mutex);
 
+        i915_gem_restore_fences(dev);
         i915_restore_display(dev);
 
         if (!drm_core_check_feature(dev, DRIVER_MODESET)) {
diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
index 2abb2d3c727b..021e8daa022d 100644
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
@@ -690,6 +690,22 @@ static const struct dmi_system_id intel_no_lvds[] = {
                         DMI_MATCH(DMI_PRODUCT_NAME, "ESPRIMO Q900"),
                 },
         },
+        {
+                .callback = intel_no_lvds_dmi_callback,
+                .ident = "Intel D510MO",
+                .matches = {
+                        DMI_MATCH(DMI_BOARD_VENDOR, "Intel"),
+                        DMI_EXACT_MATCH(DMI_BOARD_NAME, "D510MO"),
+                },
+        },
+        {
+                .callback = intel_no_lvds_dmi_callback,
+                .ident = "Intel D525MW",
+                .matches = {
+                        DMI_MATCH(DMI_BOARD_VENDOR, "Intel"),
+                        DMI_EXACT_MATCH(DMI_BOARD_NAME, "D525MW"),
+                },
+        },
 
         { }     /* terminating entry */
 };
diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c b/drivers/gpu/drm/omapdrm/omap_crtc.c
index ef161ea982e6..11a5263a5e9f 100644
--- a/drivers/gpu/drm/omapdrm/omap_crtc.c
+++ b/drivers/gpu/drm/omapdrm/omap_crtc.c
@@ -40,7 +40,7 @@ struct omap_crtc {
          * mgr->id.)  Eventually this will be replaced w/ something
          * more common-panel-framework-y
          */
-        struct omap_overlay_manager mgr;
+        struct omap_overlay_manager *mgr;
 
         struct omap_video_timings timings;
         bool enabled;
@@ -90,7 +90,32 @@ uint32_t pipe2vbl(struct drm_crtc *crtc)
  * job of sequencing the setup of the video pipe in the proper order
  */
 
+/* ovl-mgr-id -> crtc */
+static struct omap_crtc *omap_crtcs[8];
+
 /* we can probably ignore these until we support command-mode panels: */
+static int omap_crtc_connect(struct omap_overlay_manager *mgr,
+                struct omap_dss_device *dst)
+{
+        if (mgr->output)
+                return -EINVAL;
+
+        if ((mgr->supported_outputs & dst->id) == 0)
+                return -EINVAL;
+
+        dst->manager = mgr;
+        mgr->output = dst;
+
+        return 0;
+}
+
+static void omap_crtc_disconnect(struct omap_overlay_manager *mgr,
+                struct omap_dss_device *dst)
+{
+        mgr->output->manager = NULL;
+        mgr->output = NULL;
+}
+
 static void omap_crtc_start_update(struct omap_overlay_manager *mgr)
 {
 }
@@ -107,7 +132,7 @@ static void omap_crtc_disable(struct omap_overlay_manager *mgr)
 static void omap_crtc_set_timings(struct omap_overlay_manager *mgr,
                 const struct omap_video_timings *timings)
 {
-        struct omap_crtc *omap_crtc = container_of(mgr, struct omap_crtc, mgr);
+        struct omap_crtc *omap_crtc = omap_crtcs[mgr->id];
         DBG("%s", omap_crtc->name);
         omap_crtc->timings = *timings;
         omap_crtc->full_update = true;
@@ -116,7 +141,7 @@ static void omap_crtc_set_timings(struct omap_overlay_manager *mgr,
 static void omap_crtc_set_lcd_config(struct omap_overlay_manager *mgr,
                 const struct dss_lcd_mgr_config *config)
 {
-        struct omap_crtc *omap_crtc = container_of(mgr, struct omap_crtc, mgr);
+        struct omap_crtc *omap_crtc = omap_crtcs[mgr->id];
         DBG("%s", omap_crtc->name);
         dispc_mgr_set_lcd_config(omap_crtc->channel, config);
 }
@@ -135,6 +160,8 @@ static void omap_crtc_unregister_framedone_handler(
 }
 
 static const struct dss_mgr_ops mgr_ops = {
+                .connect = omap_crtc_connect,
+                .disconnect = omap_crtc_disconnect,
                 .start_update = omap_crtc_start_update,
                 .enable = omap_crtc_enable,
                 .disable = omap_crtc_disable,
@@ -564,7 +591,7 @@ static void omap_crtc_pre_apply(struct omap_drm_apply *apply)
         } else {
                 if (encoder) {
                         omap_encoder_set_enabled(encoder, false);
-                        omap_encoder_update(encoder, &omap_crtc->mgr,
+                        omap_encoder_update(encoder, omap_crtc->mgr,
                                         &omap_crtc->timings);
                         omap_encoder_set_enabled(encoder, true);
                         omap_crtc->full_update = false;
@@ -590,6 +617,11 @@ static const char *channel_names[] = {
                 [OMAP_DSS_CHANNEL_LCD2] = "lcd2",
 };
 
+void omap_crtc_pre_init(void)
+{
+        dss_install_mgr_ops(&mgr_ops);
+}
+
 /* initialize crtc */
 struct drm_crtc *omap_crtc_init(struct drm_device *dev,
                 struct drm_plane *plane, enum omap_channel channel, int id)
@@ -630,9 +662,7 @@ struct drm_crtc *omap_crtc_init(struct drm_device *dev,
         omap_irq_register(dev, &omap_crtc->error_irq);
 
         /* temporary: */
-        omap_crtc->mgr.id = channel;
-
-        dss_install_mgr_ops(&mgr_ops);
+        omap_crtc->mgr = omap_dss_get_overlay_manager(channel);
 
         /* TODO: fix hard-coded setup.. add properties! */
         info = &omap_crtc->info;
@@ -646,6 +676,8 @@ struct drm_crtc *omap_crtc_init(struct drm_device *dev,
 
         omap_plane_install_properties(omap_crtc->plane, &crtc->base);
 
+        omap_crtcs[channel] = omap_crtc;
+
         return crtc;
 
 fail:
diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c
index 826586ffbe83..a3004f12b9a3 100644
--- a/drivers/gpu/drm/omapdrm/omap_drv.c
+++ b/drivers/gpu/drm/omapdrm/omap_drv.c
@@ -65,10 +65,8 @@ static int get_connector_type(struct omap_dss_device *dssdev)
         switch (dssdev->type) {
         case OMAP_DISPLAY_TYPE_HDMI:
                 return DRM_MODE_CONNECTOR_HDMIA;
-        case OMAP_DISPLAY_TYPE_DPI:
-                if (!strcmp(dssdev->name, "dvi"))
-                        return DRM_MODE_CONNECTOR_DVID;
-                /* fallthrough */
+        case OMAP_DISPLAY_TYPE_DVI:
+                return DRM_MODE_CONNECTOR_DVID;
         default:
                 return DRM_MODE_CONNECTOR_Unknown;
         }
@@ -97,6 +95,9 @@ static int omap_modeset_init(struct drm_device *dev)
         int num_mgrs = dss_feat_get_num_mgrs();
         int num_crtcs;
         int i, id = 0;
+        int r;
+
+        omap_crtc_pre_init();
 
         drm_mode_config_init(dev);
 
@@ -116,6 +117,7 @@ static int omap_modeset_init(struct drm_device *dev)
                 struct drm_connector *connector;
                 struct drm_encoder *encoder;
                 enum omap_channel channel;
+                struct omap_overlay_manager *mgr;
 
                 if (!dssdev->driver) {
                         dev_warn(dev->dev, "%s has no driver.. skipping it\n",
@@ -131,6 +133,13 @@ static int omap_modeset_init(struct drm_device *dev)
                         continue;
                 }
 
+                r = dssdev->driver->connect(dssdev);
+                if (r) {
+                        dev_err(dev->dev, "could not connect display: %s\n",
+                                        dssdev->name);
+                        continue;
+                }
+
                 encoder = omap_encoder_init(dev, dssdev);
 
                 if (!encoder) {
@@ -172,8 +181,9 @@ static int omap_modeset_init(struct drm_device *dev)
                  * other possible channels to which the encoder can connect are
                  * not considered.
                  */
-                channel = dssdev->output->dispc_channel;
 
+                mgr = omapdss_find_mgr_from_display(dssdev);
+                channel = mgr->id;
                 /*
                  * if this channel hasn't already been taken by a previously
                  * allocated crtc, we create a new crtc for it
@@ -247,6 +257,9 @@ static int omap_modeset_init(struct drm_device *dev)
                 struct drm_encoder *encoder = priv->encoders[i];
                 struct omap_dss_device *dssdev =
                                         omap_encoder_get_dssdev(encoder);
+                struct omap_dss_device *output;
+
+                output = omapdss_find_output_from_display(dssdev);
 
                 /* figure out which crtc's we can connect the encoder to: */
                 encoder->possible_crtcs = 0;
@@ -259,9 +272,11 @@ static int omap_modeset_init(struct drm_device *dev)
                         supported_outputs =
                                 dss_feat_get_supported_outputs(crtc_channel);
 
-                        if (supported_outputs & dssdev->output->id)
+                        if (supported_outputs & output->id)
                                 encoder->possible_crtcs |= (1 << id);
                 }
+
+                omap_dss_put_device(output);
         }
 
         DBG("registered %d planes, %d crtcs, %d encoders and %d connectors\n",
diff --git a/drivers/gpu/drm/omapdrm/omap_drv.h b/drivers/gpu/drm/omapdrm/omap_drv.h
index 215a20dd340c..14f17da2ce25 100644
--- a/drivers/gpu/drm/omapdrm/omap_drv.h
+++ b/drivers/gpu/drm/omapdrm/omap_drv.h
@@ -157,6 +157,7 @@ const struct omap_video_timings *omap_crtc_timings(struct drm_crtc *crtc);
 enum omap_channel omap_crtc_channel(struct drm_crtc *crtc);
 int omap_crtc_apply(struct drm_crtc *crtc,
                 struct omap_drm_apply *apply);
+void omap_crtc_pre_init(void);
 struct drm_crtc *omap_crtc_init(struct drm_device *dev,
                 struct drm_plane *plane, enum omap_channel channel, int id);
 
diff --git a/drivers/gpu/drm/qxl/qxl_ioctl.c b/drivers/gpu/drm/qxl/qxl_ioctl.c
index 6ba49d9922f2..27f45e49250d 100644
--- a/drivers/gpu/drm/qxl/qxl_ioctl.c
+++ b/drivers/gpu/drm/qxl/qxl_ioctl.c
@@ -171,6 +171,11 @@ static int qxl_execbuffer_ioctl(struct drm_device *dev, void *data,
                 if (user_cmd.command_size > PAGE_SIZE - sizeof(union qxl_release_info))
                         return -EINVAL;
 
+                if (!access_ok(VERIFY_READ,
+                               (void *)(unsigned long)user_cmd.command,
+                               user_cmd.command_size))
+                        return -EFAULT;
+
                 ret = qxl_alloc_release_reserved(qdev,
                                                  sizeof(union qxl_release_info) +
                                                  user_cmd.command_size,
diff --git a/drivers/gpu/drm/radeon/mkregtable.c b/drivers/gpu/drm/radeon/mkregtable.c
index 5a82b6b75849..af85299f2126 100644
--- a/drivers/gpu/drm/radeon/mkregtable.c
+++ b/drivers/gpu/drm/radeon/mkregtable.c
@@ -373,19 +373,6 @@ static inline void list_splice_tail_init(struct list_head *list,
                 pos = pos->next)
 
 /**
- * __list_for_each      -       iterate over a list
- * @pos:        the &struct list_head to use as a loop cursor.
- * @head:       the head for your list.
- *
- * This variant differs from list_for_each() in that it's the
- * simplest possible list iteration code, no prefetching is done.
- * Use this for code that knows the list to be very short (empty
- * or 1 entry) most of the time.
- */
-#define __list_for_each(pos, head) \
-        for (pos = (head)->next; pos != (head); pos = pos->next)
-
-/**
  * list_for_each_prev   -       iterate over a list backwards
  * @pos:        the &struct list_head to use as a loop cursor.
  * @head:       the head for your list.
diff --git a/drivers/gpu/drm/radeon/radeon_fb.c b/drivers/gpu/drm/radeon/radeon_fb.c
index b1746741bc59..665ced3b7313 100644
--- a/drivers/gpu/drm/radeon/radeon_fb.c
+++ b/drivers/gpu/drm/radeon/radeon_fb.c
@@ -230,7 +230,7 @@ static int radeonfb_create(struct drm_fb_helper *helper,
 
         ret = radeon_framebuffer_init(rdev->ddev, &rfbdev->rfb, &mode_cmd, gobj);
         if (ret) {
-                DRM_ERROR("failed to initalise framebuffer %d\n", ret);
+                DRM_ERROR("failed to initialize framebuffer %d\n", ret);
                 goto out_unref;
         }