Return-Path: Received: from smtp-outbound-1.vmware.com ([208.91.2.12]:47308 "EHLO smtp-outbound-1.vmware.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752192AbbKTTn0 (ORCPT ); Fri, 20 Nov 2015 14:43:26 -0500 From: "Sinclair Yeh" To: dri-devel@lists.freedesktop.org Cc: stable@vger.kernel.org, syeh@vmware.com, Thomas Hellstrom Subject: [PATCH] [drm-fixes] drm/ttm: Fixed a read/write lock imbalance Date: Fri, 20 Nov 2015 11:43:50 -0800 Message-Id: <1448048630-8067-1-git-send-email-syeh@vmware.com> Sender: stable-owner@vger.kernel.org List-ID: From: Thomas Hellstrom In ttm_write_lock(), the uninterruptible path should call __ttm_write_lock() not __ttm_read_lock(). This fixes a vmwgfx hang on F23 start up. syeh: Extracted this from one of Thomas' internal patches. Cc: Signed-off-by: Thomas Hellstrom Reviewed-by: Sinclair Yeh --- drivers/gpu/drm/ttm/ttm_lock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/ttm/ttm_lock.c b/drivers/gpu/drm/ttm/ttm_lock.c index 6a95454..f154fb1 100644 --- a/drivers/gpu/drm/ttm/ttm_lock.c +++ b/drivers/gpu/drm/ttm/ttm_lock.c @@ -180,7 +180,7 @@ int ttm_write_lock(struct ttm_lock *lock, bool interruptible) spin_unlock(&lock->lock); } } else - wait_event(lock->queue, __ttm_read_lock(lock)); + wait_event(lock->queue, __ttm_write_lock(lock)); return ret; } -- 1.9.1