From patchwork Thu Jul 9 21:32:33 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 6759791 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 A2F2C9F46B for ; Thu, 9 Jul 2015 21:30:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D65BE2078F for ; Thu, 9 Jul 2015 21:30:17 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 1667520792 for ; Thu, 9 Jul 2015 21:30:17 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7DC886E644; Thu, 9 Jul 2015 14:30:15 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wi0-f175.google.com (mail-wi0-f175.google.com [209.85.212.175]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6882E6E586 for ; Thu, 9 Jul 2015 14:30:13 -0700 (PDT) Received: by wiga1 with SMTP id a1so323694619wig.0 for ; Thu, 09 Jul 2015 14:30:12 -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=l/nJltTO6mQuMyvGMlwarbI85EKAiwVRpzGj9rhaRt4=; b=lo72KvI+KjVO0QF4t7LVfZGriyaF3Qx/uiJIrPD+wEPqk+T8VvysqNqJ7tBBeNxlvi qC9yB1HWMxf6v2Iv93Du+q76bq1uhUbWWvCWjOtIwzqRHNJrWIPhRcWdcEc8QBnfpJyc 5cWv48GMq73wXdgu79Ohl+ePTL1lgBRqixtCA= 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=l/nJltTO6mQuMyvGMlwarbI85EKAiwVRpzGj9rhaRt4=; b=SukfYRY9D7HWQLuLnLgwrMJGagOC39fBFa5Np+8+PnpYGBuKnIAY4bKUpLdkDMsr4L Q0AwCIP0Z7oDgDpuKNO8yuHCaUBdZ8+hzIUC/wxJIWDEG/iizolIll9180FJPpziaA1u QaGKGVC5CFzQQT8cmZBdmOSDKcPMVSuQ1vQkKPDFi7Qyyi5YPqOKSwzUviEhr3iSxvXG iNOdFo49Ud6IrZtoWXr867EIxJiobkwH0J0wYwa+i8eedbxi8Ve3pdHvcuXxjggQ/c3B yOF7l/C8h2JWqRv6587BXp4Yr3uZwp3vZZPyYj6SFM7zimihTK4R7iq7sq0XSu8g4Oio IK1g== X-Gm-Message-State: ALoCoQl4sVTAhxvL/z2H98yBITnGhDzrB0569iv1K9fdLQraHGLe2Jv0J1UcsR/M5vOeryE3A15z X-Received: by 10.180.10.200 with SMTP id k8mr15226510wib.14.1436477412271; Thu, 09 Jul 2015 14:30:12 -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 j6sm3004128wix.5.2015.07.09.14.30.09 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 09 Jul 2015 14:30:11 -0700 (PDT) From: Daniel Vetter To: DRI Development Date: Thu, 9 Jul 2015 23:32:33 +0200 Message-Id: <1436477570-4936-2-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1436477570-4936-1-git-send-email-daniel.vetter@ffwll.ch> References: <1436477570-4936-1-git-send-email-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , Intel Graphics Development , Martin Peres Subject: [Intel-gfx] [PATCH 01/18] drm/gem: rip out drm vma accounting for gem mmaps 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.4 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 Doesn't really add anything which can't be figured out through proc files. And more clearly separates the new gem mmap handling code from the old drm maps mmap handling code, which is surely a good thing. Cc: Martin Peres Signed-off-by: Daniel Vetter Reviewed-by: Chris Wilson --- drivers/gpu/drm/drm_gem.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c index 16a164770713..27a4228b4343 100644 --- a/drivers/gpu/drm/drm_gem.c +++ b/drivers/gpu/drm/drm_gem.c @@ -778,22 +778,14 @@ void drm_gem_vm_open(struct vm_area_struct *vma) struct drm_gem_object *obj = vma->vm_private_data; drm_gem_object_reference(obj); - - mutex_lock(&obj->dev->struct_mutex); - drm_vm_open_locked(obj->dev, vma); - mutex_unlock(&obj->dev->struct_mutex); } EXPORT_SYMBOL(drm_gem_vm_open); void drm_gem_vm_close(struct vm_area_struct *vma) { struct drm_gem_object *obj = vma->vm_private_data; - struct drm_device *dev = obj->dev; - mutex_lock(&dev->struct_mutex); - drm_vm_close_locked(obj->dev, vma); - drm_gem_object_unreference(obj); - mutex_unlock(&dev->struct_mutex); + drm_gem_object_unreference_unlocked(obj); } EXPORT_SYMBOL(drm_gem_vm_close); @@ -850,7 +842,6 @@ int drm_gem_mmap_obj(struct drm_gem_object *obj, unsigned long obj_size, */ drm_gem_object_reference(obj); - drm_vm_open_locked(dev, vma); return 0; } EXPORT_SYMBOL(drm_gem_mmap_obj);