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: 7679101 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id EAAE0C05CA for ; Mon, 23 Nov 2015 09:33:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 21AD020643 for ; Mon, 23 Nov 2015 09:33:59 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 0D95120629 for ; Mon, 23 Nov 2015 09:33:58 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 802477210D; Mon, 23 Nov 2015 01:33:49 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-f41.google.com (mail-wm0-f41.google.com [74.125.82.41]) by gabe.freedesktop.org (Postfix) with ESMTPS id D5B18720FF for ; Mon, 23 Nov 2015 01:33:41 -0800 (PST) Received: by wmww144 with SMTP id w144so87855314wmw.1 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=WvNJbLxm31DAKzH1fn+XXgN0Eh3o4OMLlHaGY2diAGgQ9fsW1eAVKoijTKuULm5i+M wF6q4IJ8hQa9wTvR5HFqiT/+ONsXYzo6nyZUZKDuWeH2xFEo4PiFcTxLVgZoXMmqyxpm qceggmCm44Ufsl0/fkxF4/2BEP2CVtrUzdn+s5LnnVQ6PQV/jR6JC1alxPQ/rK1HEPwT kzCO7/Lxe6qjhU3q6krD317DDKsxLMjz7Yv4Y/F007sQlpfdGA/r9n4SBraOwO3vdEOV 7xZgQBdfGh7x9oHLGowY3ax+axBfa6/holIgW5JZp5nW0q5zetYYg7WZ/NIPO/yw3nVf /hVg== X-Gm-Message-State: ALoCoQm9ORxeJWdIS7tZjZPggLbH0c5BAFaFw4Cc3f5oiDYOFCiDvL7iQWsHgdh7cwTYxrp/zwy3 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 Subject: [PATCH 28/29] drm/vgem: Drop dev->struct_mutex 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 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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; }