From patchwork Thu Oct 15 07:36:23 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 7403461 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 B91C4BEEA4 for ; Thu, 15 Oct 2015 07:34:04 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D4570207E1 for ; Thu, 15 Oct 2015 07:34:03 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 0121720785 for ; Thu, 15 Oct 2015 07:34:03 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D907F7A08A; Thu, 15 Oct 2015 00:34:01 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wi0-f169.google.com (mail-wi0-f169.google.com [209.85.212.169]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5DEE67A0C5 for ; Thu, 15 Oct 2015 00:33:58 -0700 (PDT) Received: by wicll6 with SMTP id ll6so5386333wic.1 for ; Thu, 15 Oct 2015 00:33:57 -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=mGym9HKYSZ471wJwY0koWWY1jwBHKAjlndsFN4EA0FY=; b=KLIunH/SXokoUa7UKJsclJjt9sC42yOZLuDxDS4yhIXJzp3czwVtKPxHV1zpGjDIa2 PN1cgUHVguzGinUxgCY+twbaA7XJLfnQH3XGxcYkU6ahqGmnhW4MQ969RovmgXAz8onr K0tFfS4WpcdAeL725US1lADqX2f3eV2fTsjr0= 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=mGym9HKYSZ471wJwY0koWWY1jwBHKAjlndsFN4EA0FY=; b=Apg7girYa0BaqIx5toWpTZVkMMzJqhbxJ1D9DxyYkg1gjjXScZR774w6b4mXrdguTF qBX7AD+gPXlhqz9uk2Zg6YgMrEODEWh4N1kdsBcDhTLghP1Rui4Y4ovW/QaxcMzkgMcF Gp79uGQd7B+7/kqmtdKN9LewnbYqodvX78kQgKPfGbqP3FMz0+2IFJhcgGB+iNPpv/zh deZp+eX9VcrhTZPFCJDSSFX7nINHUX/RHMOH9LLmGBxtSa2rUzYjeGYeMV6LgXbdAGTR ATvL+H/zfoFBX8LGUcMtrhUMr+Tle/LYNDscpi/8ddAi3VqMY7bRO8SxRf0rU/eAD11V 1O7Q== X-Gm-Message-State: ALoCoQnU9Y+Kdn4R0oLHAjky/Z05WdB1mb3QeIoMjzqvnmLZUMj8h+2vv5w3oaJopMPQPMajqV8Z X-Received: by 10.194.6.66 with SMTP id y2mr9474160wjy.82.1444894437124; Thu, 15 Oct 2015 00:33:57 -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.33.56 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 15 Oct 2015 00:33:56 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 07/25] drm/vgem: Drop vgem_drm_gem_mmap Date: Thu, 15 Oct 2015 09:36:23 +0200 Message-Id: <1444894601-5200-8-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 It's duplicating (without using some of the helpers) drm_gem_mmap with the addition that it can redirect to drm-buf mmap support. But prime import/export was dropped in commit 990ed2720717173bbdea4cfb2bad37cc7aa91495 Author: Rob Clark Date: Thu May 21 11:58:30 2015 -0400 drm/vgem: drop DRIVER_PRIME (v2) for now, so this is dead code. And since I want to rework the locking for drm_gem_mmap it seems simpler to de-dupe this code for now and then start over with the reworked one again, if we want to resurrect this all indeed. Signed-off-by: Daniel Vetter --- drivers/gpu/drm/vgem/vgem_drv.c | 55 +---------------------------------------- 1 file changed, 1 insertion(+), 54 deletions(-) diff --git a/drivers/gpu/drm/vgem/vgem_drv.c b/drivers/gpu/drm/vgem/vgem_drv.c index 27c2c473d9d3..02ae60c395b7 100644 --- a/drivers/gpu/drm/vgem/vgem_drv.c +++ b/drivers/gpu/drm/vgem/vgem_drv.c @@ -235,66 +235,13 @@ unlock: return ret; } -int vgem_drm_gem_mmap(struct file *filp, struct vm_area_struct *vma) -{ - struct drm_file *priv = filp->private_data; - struct drm_device *dev = priv->minor->dev; - struct drm_vma_offset_node *node; - struct drm_gem_object *obj; - struct drm_vgem_gem_object *vgem_obj; - int ret = 0; - - mutex_lock(&dev->struct_mutex); - - node = drm_vma_offset_exact_lookup(dev->vma_offset_manager, - vma->vm_pgoff, - vma_pages(vma)); - if (!node) { - ret = -EINVAL; - goto out_unlock; - } else if (!drm_vma_node_is_allowed(node, filp)) { - ret = -EACCES; - goto out_unlock; - } - - obj = container_of(node, struct drm_gem_object, vma_node); - - vgem_obj = to_vgem_bo(obj); - - if (obj->dma_buf && vgem_obj->use_dma_buf) { - ret = dma_buf_mmap(obj->dma_buf, vma, 0); - goto out_unlock; - } - - if (!obj->dev->driver->gem_vm_ops) { - ret = -EINVAL; - goto out_unlock; - } - - vma->vm_flags |= VM_IO | VM_MIXEDMAP | VM_DONTEXPAND | VM_DONTDUMP; - vma->vm_ops = obj->dev->driver->gem_vm_ops; - vma->vm_private_data = vgem_obj; - vma->vm_page_prot = - pgprot_writecombine(vm_get_page_prot(vma->vm_flags)); - - mutex_unlock(&dev->struct_mutex); - drm_gem_vm_open(vma); - return ret; - -out_unlock: - mutex_unlock(&dev->struct_mutex); - - return ret; -} - - static struct drm_ioctl_desc vgem_ioctls[] = { }; static const struct file_operations vgem_driver_fops = { .owner = THIS_MODULE, .open = drm_open, - .mmap = vgem_drm_gem_mmap, + .mmap = drm_gem_mmap, .poll = drm_poll, .read = drm_read, .unlocked_ioctl = drm_ioctl,