linux-next: manual merge of the drm tree with Linus' tree

[Stephen Rothwell]

Hi Dave,

Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/i915/i915_gem_gtt.c between commit 8ee661b50561
("drm/i915: Undo gtt scratch pte unmapping again") from Linus' tree and
commit 782f149523d3 ("drm/i915: Make clear/insert vfuncs args absolute")
from the drm tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    s...@canb.auug.org.au

diff --cc drivers/gpu/drm/i915/i915_gem_gtt.c
index d278be110805,63a6dc7a6bb6..000000000000
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@@ -840,9 -1337,9 +1337,9 @@@ void i915_gem_suspend_gtt_mappings(stru
        i915_check_and_clear_faults(dev);
  
        dev_priv->gtt.base.clear_range(&dev_priv->gtt.base,
-                                      dev_priv->gtt.base.start / PAGE_SIZE,
-                                      dev_priv->gtt.base.total / PAGE_SIZE,
+                                      dev_priv->gtt.base.start,
+                                      dev_priv->gtt.base.total,
 -                                     false);
 +                                     true);
  }
  
  void i915_gem_restore_gtt_mappings(struct drm_device *dev)

pgp9myKkpGqVT.pgp
Description: PGP signature