From patchwork Mon Nov 23 09:33:01 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 7679131 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 2B6889FCA2 for ; Mon, 23 Nov 2015 09:34:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5589C2041F for ; Mon, 23 Nov 2015 09:34:01 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 97D5220621 for ; Mon, 23 Nov 2015 09:34:00 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5F75772108; Mon, 23 Nov 2015 01:33:55 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-f47.google.com (mail-wm0-f47.google.com [74.125.82.47]) by gabe.freedesktop.org (Postfix) with ESMTPS id E75B172102 for ; Mon, 23 Nov 2015 01:33:41 -0800 (PST) Received: by wmuu63 with SMTP id u63so45638293wmu.0 for ; Mon, 23 Nov 2015 01:33:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=XECLoGCDPWfW8LGL9wlFhxQ7ycGkys2LTn3HESpkQuc=; b=ZSXDqfte4rwi97cDxuQHxylozIMAgWnve05upBpEh0BWDdNmV04N9O+4ot4ed5hIgH OylggwEYKhaiO5PdJ76cuhsHOVQckS7e3DYgoO7SlrIg90vAkqZfNXGdb7Y7IZKu6aUH HRIHyYrxiwCy+H6rVM+HTMbZGaF0xcyDZAbLI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=XECLoGCDPWfW8LGL9wlFhxQ7ycGkys2LTn3HESpkQuc=; b=RV+eVDhBt2KErTSjHLHyIsqY3a2Qsw74OsiC+HyU3KROsdydDICnEDBfZR3/Su1qb0 yGsys3ekNbAgJRLBZOmguLWr1g5AFRyirnD8YienfnCQcOiEABmptdODIAxwtEslIwEM bQQ/3DnWUEt0t4KZfCMWyYPhRs+KOSwcxjKUhfGCvF74ynFdGm//iJkOUwZr5mWus2Dx RwB5KPyQHGwV6t+MTTXVUJQEh3e2pKpdX8gAm91hdPNxj3N9MO1Y1x3qXI+M0bPaD8zF GsWDODGuLy+UoWtuVbHd8n/3WyWE2husZRG3hJ2FYpSpu4aXQwGK5gPw3QzG0iaOFFjF ZJcA== X-Gm-Message-State: ALoCoQmovu/spWj4i9PAlL/n+M3KZ3Q1qeEwwOnBNZPHamccF/1j1U9FrLHvATG37W5hUYuF9zxx X-Received: by 10.28.9.18 with SMTP id 18mr11114350wmj.99.1448271220635; Mon, 23 Nov 2015 01:33:40 -0800 (PST) Received: from phenom.ffwll.local (212-51-149-109.fiber7.init7.net. [212.51.149.109]) by smtp.gmail.com with ESMTPSA id pn6sm12332758wjb.15.2015.11.23.01.33.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 23 Nov 2015 01:33:40 -0800 (PST) From: Daniel Vetter To: DRI Development Date: Mon, 23 Nov 2015 10:33:01 +0100 Message-Id: <1448271183-20523-29-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.5.1 In-Reply-To: <1448271183-20523-1-git-send-email-daniel.vetter@ffwll.ch> References: <1448271183-20523-1-git-send-email-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , Intel Graphics Development , Daniel Vetter Subject: [Intel-gfx] [PATCH 28/29] drm/vgem: Drop dev->struct_mutex X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-4.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP With the previous two changes it doesn't protect anything any more. v2: Use _unlocked unreference variant. Signed-off-by: Daniel Vetter --- drivers/gpu/drm/vgem/vgem_drv.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/vgem/vgem_drv.c b/drivers/gpu/drm/vgem/vgem_drv.c index 1a609347236b..807a24d3c0a8 100644 --- a/drivers/gpu/drm/vgem/vgem_drv.c +++ b/drivers/gpu/drm/vgem/vgem_drv.c @@ -103,12 +103,8 @@ static int vgem_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf) if (page_offset > num_pages) return VM_FAULT_SIGBUS; - mutex_lock(&dev->struct_mutex); - ret = vm_insert_page(vma, (unsigned long)vmf->virtual_address, obj->pages[page_offset]); - - mutex_unlock(&dev->struct_mutex); switch (ret) { case 0: return VM_FAULT_NOPAGE; @@ -205,12 +201,9 @@ int vgem_gem_dumb_map(struct drm_file *file, struct drm_device *dev, int ret = 0; struct drm_gem_object *obj; - mutex_lock(&dev->struct_mutex); obj = drm_gem_object_lookup(dev, file, handle); - if (!obj) { - ret = -ENOENT; - goto unlock; - } + if (!obj) + return -ENOENT; ret = drm_gem_create_mmap_offset(obj); if (ret) @@ -223,9 +216,8 @@ int vgem_gem_dumb_map(struct drm_file *file, struct drm_device *dev, *offset = drm_vma_node_offset_addr(&obj->vma_node); unref: - drm_gem_object_unreference(obj); -unlock: - mutex_unlock(&dev->struct_mutex); + drm_gem_object_unreference_unlocked(obj); + return ret; }