drm/i915: Don't access snooped pages through the GTT (even for error capture)
authorChris Wilson <chris@chris-wilson.co.uk>
Thu, 30 Jan 2014 14:38:16 +0000 (14:38 +0000)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Thu, 30 Jan 2014 16:25:39 +0000 (17:25 +0100)
We want to use the GTT for reading back objects upon an error so that we
have exactly the information that the GPU saw. However, it is verboten
to access snoopable pages through the GTT and causes my PineView GPU to
throw a page fault instead.

This has not been a problem in the past as we only dumped ringbuffers
and batchbuffers, both of which must be not snooped. However, the
introduction of HWS page dumping leads to a read of a snooped object
through the GTT. This was introduced by

commit f3ce3821393e31a3f1a8ca6c24eb2d735a428445
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date:   Thu Jan 23 22:40:36 2014 +0000

    drm/i915: Include HW status page in error capture

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
[danvet:s/uncached/not snooped/ for one case in the commit message as
requested by Chris.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/i915_gpu_error.c

index 64591ca7fa3ee4447ba68a6af76f62cee94dc7b2..94542d498296cc3c2669f83858a05b5a84e67f0b 100644 (file)
@@ -536,7 +536,8 @@ i915_error_object_create_sized(struct drm_i915_private *dev_priv,
                        goto unwind;
 
                local_irq_save(flags);
-               if (reloc_offset < dev_priv->gtt.mappable_end &&
+               if (src->cache_level == I915_CACHE_NONE &&
+                   reloc_offset < dev_priv->gtt.mappable_end &&
                    src->has_global_gtt_mapping &&
                    i915_is_ggtt(vm)) {
                        void __iomem *s;