From mboxrd@z Thu Jan 1 00:00:00 1970 From: Devendra Naga Subject: [PATCH] vmwgfx: add missing mutex_unlocks Date: Sat, 4 Aug 2012 11:18:40 +0545 Message-ID: <1344058420-18329-1-git-send-email-develkernel412222@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-pb0-f49.google.com (mail-pb0-f49.google.com [209.85.160.49]) by gabe.freedesktop.org (Postfix) with ESMTP id DD4859E76C for ; Fri, 3 Aug 2012 22:33:56 -0700 (PDT) Received: by pbbrq13 with SMTP id rq13so2586631pbb.36 for ; Fri, 03 Aug 2012 22:33:57 -0700 (PDT) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org Errors-To: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org To: David Airlie , Jakob Bornecrantz , Thomas Hellstrom , Dave Airlie , dri-devel@lists.freedesktop.org Cc: Devendra Naga List-Id: dri-devel@lists.freedesktop.org we have done a proper mutex_unlock in the error cases of the vmw_fifo_reserve, but there are missing mutex unlocks where we return a valid pointer in vmw_fifo_reserve. Signed-off-by: Devendra Naga --- drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c index a0c2f12..e3abd7a 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c @@ -355,6 +355,7 @@ void *vmw_fifo_reserve(struct vmw_private *dev_priv, uint32_t bytes) if (reserveable) iowrite32(bytes, fifo_mem + SVGA_FIFO_RESERVED); + mutex_unlock(&fifo_state->fifo_mutex); return fifo_mem + (next_cmd >> 2); } else { need_bounce = true; @@ -363,10 +364,12 @@ void *vmw_fifo_reserve(struct vmw_private *dev_priv, uint32_t bytes) if (need_bounce) { fifo_state->using_bounce_buffer = true; - if (bytes < fifo_state->static_buffer_size) + if (bytes < fifo_state->static_buffer_size) { + mutex_unlock(&fifo_state->fifo_mutex); return fifo_state->static_buffer; - else { + } else { fifo_state->dynamic_buffer = vmalloc(bytes); + mutex_unlock(&fifo_state->fifo_mutex); return fifo_state->dynamic_buffer; } } -- 1.7.9.5