From e3785591bd7f722a6fb31607700d4d450d48e5f0 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Tue, 31 Jul 2012 15:58:13 +1000 Subject: [PATCH] --- yaml --- r: 321613 b: refs/heads/master c: f00f979145756e39b5512d7d4e4050534d1c3d7f h: refs/heads/master i: 321611: 9c6b8fd72e86faa4d5ffae9955a5076d7039f2a4 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/i915_gem_gtt.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 389733987285..0abcafbc9ee2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e47e9ad9186ff265ddf316d25cd4942bab019d57 +refs/heads/master: f00f979145756e39b5512d7d4e4050534d1c3d7f diff --git a/trunk/drivers/gpu/drm/i915/i915_gem_gtt.c b/trunk/drivers/gpu/drm/i915/i915_gem_gtt.c index 9fd25a435536..ee9b68f6bc36 100644 --- a/trunk/drivers/gpu/drm/i915/i915_gem_gtt.c +++ b/trunk/drivers/gpu/drm/i915/i915_gem_gtt.c @@ -361,7 +361,8 @@ int i915_gem_gtt_prepare_object(struct drm_i915_gem_object *obj) struct drm_device *dev = obj->base.dev; struct drm_i915_private *dev_priv = dev->dev_private; - if (dev_priv->mm.gtt->needs_dmar) + /* don't map imported dma buf objects */ + if (dev_priv->mm.gtt->needs_dmar && !obj->sg_table) return intel_gtt_map_memory(obj->pages, obj->base.size >> PAGE_SHIFT, &obj->sg_list,