From 178f11521df1de94554c59b103bdec383efecd6c Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Thu, 10 Sep 2009 08:53:04 +0100 Subject: [PATCH] --- yaml --- r: 165995 b: refs/heads/master c: 7e61615857c6fb3afbcb43f5c4e97511a923f5a8 h: refs/heads/master i: 165993: b90c2cf08d14be53e7e10739a10b00550906ba2b 165991: bdfed9c1a4f597512ff815f15cd1ffcf76648471 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/i915_gem.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 08ad7b47a0ab..7c4c6a105ba8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e517a5e97080bbe52857bd0d7df9b66602d53c4d +refs/heads/master: 7e61615857c6fb3afbcb43f5c4e97511a923f5a8 diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c index 30ea4b6b0219..e0da98602eed 100644 --- a/trunk/drivers/gpu/drm/i915/i915_gem.c +++ b/trunk/drivers/gpu/drm/i915/i915_gem.c @@ -3834,7 +3834,8 @@ void i915_gem_free_object(struct drm_gem_object *obj) i915_gem_object_unbind(obj); - i915_gem_free_mmap_offset(obj); + if (obj_priv->mmap_offset) + i915_gem_free_mmap_offset(obj); kfree(obj_priv->page_cpu_valid); kfree(obj_priv->bit_17);