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

Pull main drm updates from Dave Airlie:
 "This is the main merge window request for the drm.

  It's big, but jam packed will lots of features and of course 0
  regressions.  (okay maybe there'll be one).

  Highlights:

   - new KMS drivers for server GPU chipsets: ast, mgag200 and cirrus
     (qemu only).  These drivers use the generic modesetting drivers.

   - initial prime/dma-buf support for i915, nouveau, radeon, udl and
     exynos

   - switcheroo audio support: so GPUs with HDMI can turn off the sound
     driver without crashing stuff.

   - There are some patches drifting outside drivers/gpu into x86 and
     EFI for better handling of multiple video adapters in Apple Macs,
     they've got correct acks except one trivial fixup.

   - Core:
	edid parser has better DMT and reduced blanking support,
	crtc properties,
	plane properties,

   - Drivers:
	exynos: add 2D core accel support, prime support, hdmi features
	intel: more Haswell support, initial Valleyview support, more
	    hdmi infoframe fixes, update MAINTAINERS for Daniel, lots of
	    cleanups and fixes
	radeon: more HDMI audio support, improved GPU lockup recovery
	    support, remove nested mutexes, less memory copying on PCIE, fix
	    bus master enable race (kexec), improved fence handling
	gma500: cleanups, 1080p support, acpi fixes
	nouveau: better nva3 memory reclocking, kepler accel (needs
	    external firmware rip), async buffer moves on nv84+ hw.

  I've some more dma-buf patches that rely on the dma-buf merge for vmap
  stuff, and I've a few fixes building up, but I'd decided I'd better
  get rid of the main pull sooner rather than later, so the audio guys
  are also unblocked."

Fix up trivial conflict due to some duplicated changes in
drivers/gpu/drm/i915/intel_ringbuffer.c

* 'drm-core-next' of git://people.freedesktop.org/~airlied/linux: (605 commits)
  drm/nouveau/nvd9: Fix GPIO initialisation sequence.
  drm/nouveau: Unregister switcheroo client on exit
  drm/nouveau: Check dsm on switcheroo unregister
  drm/nouveau: fix a minor annoyance in an output string
  drm/nouveau: turn a BUG into a WARN
  drm/nv50: decode PGRAPH DATA_ERROR = 0x24
  drm/nouveau/disp: fix dithering not being enabled on some eDP macbooks
  drm/nvd9/copy: initialise copy engine, seems to work like nvc0
  drm/nvc0/ttm: use copy engines for async buffer moves
  drm/nva3/ttm: use copy engine for async buffer moves
  drm/nv98/ttm: add in a (disabled) crypto engine buffer copy method
  drm/nv84/ttm: use crypto engine for async buffer copies
  drm/nouveau/ttm: untangle code to support accelerated buffer moves
  drm/nouveau/fbcon: use fence for sync, rather than notifier
  drm/nv98/crypt: non-stub implementation of the engine hooks
  drm/nouveau/fifo: turn all fifo modules into engine modules
  drm/nv50/graph: remove ability to do interrupt-driven context switching
  drm/nv50: remove manual context unload on context destruction
  drm/nv50: remove execution engine context saves on suspend
  drm/nv50/fifo: use hardware channel kickoff functionality
  ...

1 files changed, 16 insertions, 16 deletions

diff --git a/drivers/gpu/drm/gma500/gtt.c b/drivers/gpu/drm/gma500/gtt.c
index c6465b40090f..04a371aceb34 100644
--- a/drivers/gpu/drm/gma500/gtt.c
+++ b/drivers/gpu/drm/gma500/gtt.c
@@ -39,6 +39,10 @@ static inline uint32_t psb_gtt_mask_pte(uint32_t pfn, int type)
 {
         uint32_t mask = PSB_PTE_VALID;
 
+        /* Ensure we explode rather than put an invalid low mapping of
+           a high mapping page into the gtt */
+        BUG_ON(pfn & ~(0xFFFFFFFF >> PAGE_SHIFT));
+
         if (type & PSB_MMU_CACHED_MEMORY)
                 mask |= PSB_PTE_CACHED;
         if (type & PSB_MMU_RO_MEMORY)
@@ -57,7 +61,7 @@ static inline uint32_t psb_gtt_mask_pte(uint32_t pfn, int type)
  *      Given a gtt_range object return the GTT offset of the page table
  *      entries for this gtt_range
  */
-static u32 *psb_gtt_entry(struct drm_device *dev, struct gtt_range *r)
+static u32 __iomem *psb_gtt_entry(struct drm_device *dev, struct gtt_range *r)
 {
         struct drm_psb_private *dev_priv = dev->dev_private;
         unsigned long offset;
@@ -78,7 +82,8 @@ static u32 *psb_gtt_entry(struct drm_device *dev, struct gtt_range *r)
  */
 static int psb_gtt_insert(struct drm_device *dev, struct gtt_range *r)
 {
-        u32 *gtt_slot, pte;
+        u32 __iomem *gtt_slot;
+        u32 pte;
         struct page **pages;
         int i;
 
@@ -93,7 +98,7 @@ static int psb_gtt_insert(struct drm_device *dev, struct gtt_range *r)
         pages = r->pages;
 
         /* Make sure changes are visible to the GPU */
-        set_pages_array_uc(pages, r->npage);
+        set_pages_array_wc(pages, r->npage);
 
         /* Write our page entries into the GTT itself */
         for (i = r->roll; i < r->npage; i++) {
@@ -122,7 +127,8 @@ static int psb_gtt_insert(struct drm_device *dev, struct gtt_range *r)
 static void psb_gtt_remove(struct drm_device *dev, struct gtt_range *r)
 {
         struct drm_psb_private *dev_priv = dev->dev_private;
-        u32 *gtt_slot, pte;
+        u32 __iomem *gtt_slot;
+        u32 pte;
         int i;
 
         WARN_ON(r->stolen);
@@ -148,7 +154,8 @@ static void psb_gtt_remove(struct drm_device *dev, struct gtt_range *r)
  */
 void psb_gtt_roll(struct drm_device *dev, struct gtt_range *r, int roll)
 {
-        u32 *gtt_slot, pte;
+        u32 __iomem *gtt_slot;
+        u32 pte;
         int i;
 
         if (roll >= r->npage) {
@@ -409,8 +416,6 @@ int psb_gtt_init(struct drm_device *dev, int resume)
         unsigned long stolen_size, vram_stolen_size;
         unsigned i, num_pages;
         unsigned pfn_base;
-        uint32_t vram_pages;
-        uint32_t dvmt_mode = 0;
         struct psb_gtt *pg;
 
         int ret = 0;
@@ -483,13 +488,8 @@ int psb_gtt_init(struct drm_device *dev, int resume)
 
         stolen_size = vram_stolen_size;
 
-        printk(KERN_INFO "Stolen memory information\n");
-        printk(KERN_INFO "       base in RAM: 0x%x\n", dev_priv->stolen_base);
-        printk(KERN_INFO "       size: %luK, calculated by (GTT RAM base) - (Stolen base), seems wrong\n",
-                vram_stolen_size/1024);
-        dvmt_mode = (dev_priv->gmch_ctrl >> 4) & 0x7;
-        printk(KERN_INFO "      the correct size should be: %dM(dvmt mode=%d)\n",
-                (dvmt_mode == 1) ? 1 : (2 << (dvmt_mode - 1)), dvmt_mode);
+        dev_dbg(dev->dev, "Stolen memory base 0x%x, size %luK\n",
+                        dev_priv->stolen_base, vram_stolen_size / 1024);
 
         if (resume && (gtt_pages != pg->gtt_pages) &&
             (stolen_size != pg->stolen_size)) {
@@ -525,8 +525,8 @@ int psb_gtt_init(struct drm_device *dev, int resume)
          */
 
         pfn_base = dev_priv->stolen_base >> PAGE_SHIFT;
-        vram_pages = num_pages = vram_stolen_size >> PAGE_SHIFT;
-        printk(KERN_INFO"Set up %d stolen pages starting at 0x%08x, GTT offset %dK\n",
+        num_pages = vram_stolen_size >> PAGE_SHIFT;
+        dev_dbg(dev->dev, "Set up %d stolen pages starting at 0x%08x, GTT offset %dK\n",
                 num_pages, pfn_base << PAGE_SHIFT, 0);
         for (i = 0; i < num_pages; ++i) {
                 pte = psb_gtt_mask_pte(pfn_base + i, 0);