From patchwork Thu Oct 15 07:36:41 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 7403611 Return-Path: X-Original-To: patchwork-dri-devel@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 10BB99F1B9 for ; Thu, 15 Oct 2015 07:34:22 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3E4A420852 for ; Thu, 15 Oct 2015 07:34:21 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 50B7E207E1 for ; Thu, 15 Oct 2015 07:34:20 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 41DFE7A112; Thu, 15 Oct 2015 00:34:19 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wi0-f173.google.com (mail-wi0-f173.google.com [209.85.212.173]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4B7427A111 for ; Thu, 15 Oct 2015 00:34:16 -0700 (PDT) Received: by wijq8 with SMTP id q8so115940544wij.0 for ; Thu, 15 Oct 2015 00:34:15 -0700 (PDT) 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=ygMU2JxyXCDFzrD389tbEVnjcEgjYFCYSSS1IImpUag=; b=Mxzy31kHNuNMHRye+h2B15f4CqETMD8Lt+4Ja2FvZxeKLojEfwYcmbf5RVYFQ+0mdE WE0NB3msD6+gA64fKAN3FxR3bMJyEJTiX/2BJY3+Flrg+AkKzSm2WpKwGPfiKyWn7Ez7 6ENqyTInTNpKrCHFx0xcd7tqMXrFnsOs76szc= 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=ygMU2JxyXCDFzrD389tbEVnjcEgjYFCYSSS1IImpUag=; b=iGw2mslJ+AywFV66+ugaOvzZX/mySh3oYt4i/IO29rPBLC1IpJ22MBGRWENkhzdC69 Eh/B83LgXr8yY5QMoZFoTvUNzkyKxuHpyc3ZikKo3JAVb21Y8WiNgWfOOjd0buUFDUha T68A+q5XVzYkYSzdOWxTG9Aks796HMpeeb5aVMTsYRnvjRJkUcMnzkghI+70wMeZwxe5 5maL+cKXV4tt7Kf6fJt/gzxo2bJDGVSZRxh+2Fq/nGw91o3+h4URmaBuwJXlfzD7lOgU jG8rmR463wL5LxBwu9IN87aTWqD5vW8/bUTpAJmdbXEGgs7HzENH8HzWxUf3Iu2u97W/ KcyA== X-Gm-Message-State: ALoCoQk36pA/F2rW9W4pjwLcM7FNcT1SkcQ7JYTSVNEAobFSkbRZBa7QGEW2CzR5qLNtVmmvKjh1 X-Received: by 10.194.235.39 with SMTP id uj7mr9778083wjc.115.1444894455051; Thu, 15 Oct 2015 00:34:15 -0700 (PDT) Received: from phenom.ffwll.local (212-51-149-109.fiber7.init7.net. [212.51.149.109]) by smtp.gmail.com with ESMTPSA id z4sm10201014wjz.29.2015.10.15.00.34.14 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 15 Oct 2015 00:34:14 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 25/25] drm/vgem: Drop dev->struct_mutex Date: Thu, 15 Oct 2015 09:36:41 +0200 Message-Id: <1444894601-5200-26-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.5.1 In-Reply-To: <1444894601-5200-1-git-send-email-daniel.vetter@ffwll.ch> References: <1444894601-5200-1-git-send-email-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , 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.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, 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. Signed-off-by: Daniel Vetter --- drivers/gpu/drm/vgem/vgem_drv.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/vgem/vgem_drv.c b/drivers/gpu/drm/vgem/vgem_drv.c index 1a609347236b..b525208375aa 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) @@ -224,8 +217,7 @@ int vgem_gem_dumb_map(struct drm_file *file, struct drm_device *dev, unref: drm_gem_object_unreference(obj); -unlock: - mutex_unlock(&dev->struct_mutex); + return ret; }