Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

Pull DRM updates from Dave Airlie:
 "Like all good pull reqs this ends with a revert, so it must mean we
  tested it,

[ Ed. That's _one_ way of looking at it ]

  This pull is missing nouveau, Ben has been stuck trying to track down
  a very longstanding bug that revealed itself due to some other
  changes.  I've asked him to send you a direct pull request for nouveau
  once he cleans things up.  I'm away until Monday so don't want to
  delay things, you can make a decision on that when he sends it, I have
  my phone so I can ack things just not really merge much.

  It has one trivial conflict with your tree in armada_drv.c, and also
  the pull request contains some component changes that are already in
  your tree, the base tree from Russell went via Greg's tree already,
  but some stuff still shows up in here that doesn't when I merge my
  tree into yours.

  Otherwise all pretty standard graphics fare, one new driver and
  changes all over the place.

  New drivers:
   - sti kms driver for STMicroelectronics chipsets stih416 and stih407.

  core:
   - lots of cleanups to the drm core
   - DP MST helper code merged
   - universal cursor planes.
   - render nodes enabled by default

  panel:
   - better panel interfaces
   - new panel support
   - non-continuous cock advertising ability

  ttm:
   - shrinker fixes

  i915:
   - hopefully ditched UMS support
   - runtime pm fixes
   - psr tracking and locking - now enabled by default
   - userptr fixes
   - backlight brightness fixes
   - MST support merged
   - runtime PM for dpms
   - primary planes locking fixes
   - gen8 hw semaphore support
   - fbc fixes
   - runtime PM on SOix sleep state hw.
   - mmio base page flipping
   - lots of vlv/chv fixes.
   - universal cursor planes

  radeon:
   - Hawaii fixes
   - display scalar support for non-fixed mode displays
   - new firmware format support
   - dpm on more asics by default
   - GPUVM improvements
   - uncached and wc GTT buffers
   - BOs > visible VRAM

  exynos:
   - i80 interface support
   - module auto-loading
   - ipp driver consolidated.

  armada:
   - irq handling in crtc layer only
   - crtc renumbering
   - add component support
   - DT interaction changes.

  tegra:
   - load as module fixes
   - eDP bpp and sync polarity fixed
   - DSI non-continuous clock mode support
   - better support for importing buffers from nouveau

  msm:
   - mdp5/adq8084 v1.3 hw enablement
   - devicetree clk changse
   - ifc6410 board working

  tda998x:
   - component support
   - DT documentation update

  vmwgfx:
   - fix compat shader namespace"

* 'drm-next' of git://people.freedesktop.org/~airlied/linux: (551 commits)
  Revert "drm: drop redundant drm_file->is_master"
  drm/panel: simple: Use devm_gpiod_get_optional()
  drm/dsi: Replace upcasting macro by function
  drm/panel: ld9040: Replace upcasting macro by function
  drm/exynos: dp: Modify driver to support drm_panel
  drm/exynos: Move DP setup into commit()
  drm/panel: simple: Add AUO B133HTN01 panel support
  drm/panel: simple: Support delays in panel functions
  drm/panel: simple: Add proper definition for prepare and unprepare
  drm/panel: s6e8aa0: Add proper definition for prepare and unprepare
  drm/panel: ld9040: Add proper definition for prepare and unprepare
  drm/tegra: Add support for panel prepare and unprepare routines
  drm/exynos: dsi: Add support for panel prepare and unprepare routines
  drm/exynos: dpi: Add support for panel prepare and unprepare routines
  drm/panel: simple: Add dummy prepare and unprepare routines
  drm/panel: s6e8aa0: Add dummy prepare and unprepare routines
  drm/panel: ld9040: Add dummy prepare and unprepare routines
  drm/panel: Provide convenience wrapper for .get_modes()
  drm/panel: add .prepare() and .unprepare() functions
  drm/panel: simple: Remove simple-panel compatible
  ...

1 files changed, 15 insertions, 18 deletions

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);
                 }
         }