From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH] drm/i915: Add locking around framebuffer_references-- Date: Fri, 13 Jun 2014 10:15:26 +0200 Message-ID: <20140613081526.GI5821@phenom.ffwll.local> References: <1402647053-23299-1-git-send-email-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: Received: from mail-wg0-f42.google.com (mail-wg0-f42.google.com [74.125.82.42]) by gabe.freedesktop.org (Postfix) with ESMTP id A16C06E9D0 for ; Fri, 13 Jun 2014 01:15:32 -0700 (PDT) Received: by mail-wg0-f42.google.com with SMTP id z12so2320221wgg.25 for ; Fri, 13 Jun 2014 01:15:31 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1402647053-23299-1-git-send-email-ville.syrjala@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: ville.syrjala@linux.intel.com Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Fri, Jun 13, 2014 at 11:10:53AM +0300, ville.syrjala@linux.intel.com wro= te: > From: Ville Syrj=E4l=E4 > = > obj->framebuffer_references isn't an atomic_t so the decrement needs to > be protected by some lock. struct_mutex seems like the appropriate lock > here, and we may already take it for the obj unref anyway. > = > Signed-off-by: Ville Syrj=E4l=E4 Queued for -next, thanks for the patch. -Daniel > --- > drivers/gpu/drm/i915/intel_display.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > = > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/= intel_display.c > index b5cbb28..5762726 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -11504,11 +11504,14 @@ static void intel_setup_outputs(struct drm_devi= ce *dev) > = > static void intel_user_framebuffer_destroy(struct drm_framebuffer *fb) > { > + struct drm_device *dev =3D fb->dev; > struct intel_framebuffer *intel_fb =3D to_intel_framebuffer(fb); > = > drm_framebuffer_cleanup(fb); > + mutex_lock(&dev->struct_mutex); > WARN_ON(!intel_fb->obj->framebuffer_references--); > - drm_gem_object_unreference_unlocked(&intel_fb->obj->base); > + drm_gem_object_unreference(&intel_fb->obj->base); > + mutex_unlock(&dev->struct_mutex); > kfree(intel_fb); > } > = > -- = > 1.8.5.5 > = > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- = Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch