From 95f45ba16cc1d703e400a22d363e7c63c890f968 Mon Sep 17 00:00:00 2001 From: Jesse Barnes Date: Wed, 11 Feb 2009 13:28:14 -0800 Subject: [PATCH] --- yaml --- r: 131631 b: refs/heads/master c: 496818f08a78476abdb307e241911536221239fc h: refs/heads/master i: 131629: fc3c5230eff56abd85ded6684dc06216a46e96d8 131627: 3c62ff283cbc81b1b996b04d85ee7ae6e453ad12 131623: 3041697dbead5499583a4eb2214ec621a4f889d3 131615: 98918018f7e4e72ac46f0487adda231de1bb45e7 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/intel_display.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 857d23d43b27..f4d3679a2eec 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 43565a0648e664744ac9201c199681451355edcc +refs/heads/master: 496818f08a78476abdb307e241911536221239fc diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c index 13f9b6667c94..4d2baf7b00be 100644 --- a/trunk/drivers/gpu/drm/i915/intel_display.c +++ b/trunk/drivers/gpu/drm/i915/intel_display.c @@ -1606,7 +1606,9 @@ intel_user_framebuffer_create(struct drm_device *dev, ret = intel_framebuffer_create(dev, mode_cmd, &fb, obj); if (ret) { + mutex_lock(&dev->struct_mutex); drm_gem_object_unreference(obj); + mutex_unlock(&dev->struct_mutex); return NULL; }