Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next

Pull in drm-next with Dave's DP MST support so that I can merge some
conflicting patches which also touch the driver load sequencing around
interrupt handling.

Conflicts:
	drivers/gpu/drm/i915/intel_display.c
	drivers/gpu/drm/i915/intel_dp.c

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

5 files changed, 25 insertions, 26 deletions

diff --git a/drivers/gpu/drm/omapdrm/omap_connector.c b/drivers/gpu/drm/omapdrm/omap_connector.c
index 86f4ead0441d..36bc5cc80816 100644
--- a/drivers/gpu/drm/omapdrm/omap_connector.c
+++ b/drivers/gpu/drm/omapdrm/omap_connector.c
@@ -130,7 +130,7 @@ static void omap_connector_destroy(struct drm_connector *connector)
         struct omap_dss_device *dssdev = omap_connector->dssdev;
 
         DBG("%s", omap_connector->dssdev->name);
-        drm_sysfs_connector_remove(connector);
+        drm_connector_unregister(connector);
         drm_connector_cleanup(connector);
         kfree(omap_connector);
 
@@ -307,7 +307,7 @@ struct drm_connector *omap_connector_init(struct drm_device *dev,
         connector->interlace_allowed = 1;
         connector->doublescan_allowed = 0;
 
-        drm_sysfs_connector_add(connector);
+        drm_connector_register(connector);
 
         return connector;
 
diff --git a/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c b/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c
index f926b4caf449..56c60552abba 100644
--- a/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c
+++ b/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c
@@ -199,7 +199,7 @@ static struct dmm_txn *dmm_txn_init(struct dmm *dmm, struct tcm *tcm)
 static void dmm_txn_append(struct dmm_txn *txn, struct pat_area *area,
                 struct page **pages, uint32_t npages, uint32_t roll)
 {
-        dma_addr_t pat_pa = 0;
+        dma_addr_t pat_pa = 0, data_pa = 0;
         uint32_t *data;
         struct pat *pat;
         struct refill_engine *engine = txn->engine_handle;
@@ -223,7 +223,9 @@ static void dmm_txn_append(struct dmm_txn *txn, struct pat_area *area,
                         .lut_id = engine->tcm->lut_id,
                 };
 
-        data = alloc_dma(txn, 4*i, &pat->data_pa);
+        data = alloc_dma(txn, 4*i, &data_pa);
+        /* FIXME: what if data_pa is more than 32-bit ? */
+        pat->data_pa = data_pa;
 
         while (i--) {
                 int n = i + roll;
diff --git a/drivers/gpu/drm/omapdrm/omap_fbdev.c b/drivers/gpu/drm/omapdrm/omap_fbdev.c
index 1388ca7f87e8..8436c6857cda 100644
--- a/drivers/gpu/drm/omapdrm/omap_fbdev.c
+++ b/drivers/gpu/drm/omapdrm/omap_fbdev.c
@@ -281,7 +281,7 @@ fail:
         return ret;
 }
 
-static struct drm_fb_helper_funcs omap_fb_helper_funcs = {
+static const struct drm_fb_helper_funcs omap_fb_helper_funcs = {
         .fb_probe = omap_fbdev_create,
 };
 
@@ -325,7 +325,7 @@ struct drm_fb_helper *omap_fbdev_init(struct drm_device *dev)
 
         helper = &fbdev->base;
 
-        helper->funcs = &omap_fb_helper_funcs;
+        drm_fb_helper_prepare(dev, helper, &omap_fb_helper_funcs);
 
         ret = drm_fb_helper_init(dev, helper,
                         priv->num_crtcs, priv->num_connectors);
diff --git a/drivers/gpu/drm/omapdrm/omap_gem.c b/drivers/gpu/drm/omapdrm/omap_gem.c
index 95dbce286a41..e4849413ee80 100644
--- a/drivers/gpu/drm/omapdrm/omap_gem.c
+++ b/drivers/gpu/drm/omapdrm/omap_gem.c
@@ -233,11 +233,7 @@ static int omap_gem_attach_pages(struct drm_gem_object *obj)
 
         WARN_ON(omap_obj->pages);
 
-        /* TODO: __GFP_DMA32 .. but somehow GFP_HIGHMEM is coming from the
-         * mapping_gfp_mask(mapping) which conflicts w/ GFP_DMA32.. probably
-         * we actually want CMA memory for it all anyways..
-         */
-        pages = drm_gem_get_pages(obj, GFP_KERNEL);
+        pages = drm_gem_get_pages(obj);
         if (IS_ERR(pages)) {
                 dev_err(obj->dev->dev, "could not get pages: %ld\n", PTR_ERR(pages));
                 return PTR_ERR(pages);
@@ -791,7 +787,7 @@ int omap_gem_get_paddr(struct drm_gem_object *obj,
                         omap_obj->paddr = tiler_ssptr(block);
                         omap_obj->block = block;
 
-                        DBG("got paddr: %08x", omap_obj->paddr);
+                        DBG("got paddr: %pad", &omap_obj->paddr);
                 }
 
                 omap_obj->paddr_cnt++;
@@ -985,9 +981,9 @@ void omap_gem_describe(struct drm_gem_object *obj, struct seq_file *m)
 
         off = drm_vma_node_start(&obj->vma_node);
 
-        seq_printf(m, "%08x: %2d (%2d) %08llx %08Zx (%2d) %p %4d",
+        seq_printf(m, "%08x: %2d (%2d) %08llx %pad (%2d) %p %4d",
                         omap_obj->flags, obj->name, obj->refcount.refcount.counter,
-                        off, omap_obj->paddr, omap_obj->paddr_cnt,
+                        off, &omap_obj->paddr, omap_obj->paddr_cnt,
                         omap_obj->vaddr, omap_obj->roll);
 
         if (omap_obj->flags & OMAP_BO_TILED) {
@@ -1183,9 +1179,7 @@ int omap_gem_op_sync(struct drm_gem_object *obj, enum omap_gem_op op)
                         }
                 }
                 spin_unlock(&sync_lock);
-
-                if (waiter)
-                        kfree(waiter);
+                kfree(waiter);
         }
         return ret;
 }
@@ -1347,6 +1341,7 @@ struct drm_gem_object *omap_gem_new(struct drm_device *dev,
         struct omap_drm_private *priv = dev->dev_private;
         struct omap_gem_object *omap_obj;
         struct drm_gem_object *obj = NULL;
+        struct address_space *mapping;
         size_t size;
         int ret;
 
@@ -1404,14 +1399,16 @@ struct drm_gem_object *omap_gem_new(struct drm_device *dev,
                 omap_obj->height = gsize.tiled.height;
         }
 
-        ret = 0;
-        if (flags & (OMAP_BO_DMA|OMAP_BO_EXT_MEM))
+        if (flags & (OMAP_BO_DMA|OMAP_BO_EXT_MEM)) {
                 drm_gem_private_object_init(dev, obj, size);
-        else
+        } else {
                 ret = drm_gem_object_init(dev, obj, size);
+                if (ret)
+                        goto fail;
 
-        if (ret)
-                goto fail;
+                mapping = file_inode(obj->filp)->i_mapping;
+                mapping_set_gfp_mask(mapping, GFP_USER | __GFP_DMA32);
+        }
 
         return obj;
 
@@ -1467,8 +1464,8 @@ void omap_gem_init(struct drm_device *dev)
                         entry->paddr = tiler_ssptr(block);
                         entry->block = block;
 
-                        DBG("%d:%d: %dx%d: paddr=%08x stride=%d", i, j, w, h,
-                                        entry->paddr,
+                        DBG("%d:%d: %dx%d: paddr=%pad stride=%d", i, j, w, h,
+                                        &entry->paddr,
                                         usergart[i].stride_pfn << PAGE_SHIFT);
                 }
         }
diff --git a/drivers/gpu/drm/omapdrm/omap_plane.c b/drivers/gpu/drm/omapdrm/omap_plane.c
index da9d15d214cf..891a4dc608af 100644
--- a/drivers/gpu/drm/omapdrm/omap_plane.c
+++ b/drivers/gpu/drm/omapdrm/omap_plane.c
@@ -142,8 +142,8 @@ static void omap_plane_pre_apply(struct omap_drm_apply *apply)
         DBG("%dx%d -> %dx%d (%d)", info->width, info->height,
                         info->out_width, info->out_height,
                         info->screen_width);
-        DBG("%d,%d %08x %08x", info->pos_x, info->pos_y,
-                        info->paddr, info->p_uv_addr);
+        DBG("%d,%d %pad %pad", info->pos_x, info->pos_y,
+                        &info->paddr, &info->p_uv_addr);
 
         /* TODO: */
         ilace = false;