From patchwork Wed Dec 11 10:34:32 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 3323881 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.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 6352CC0D4A for ; Wed, 11 Dec 2013 10:35:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 391A320747 for ; Wed, 11 Dec 2013 10:35:33 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 96485206C3 for ; Wed, 11 Dec 2013 10:35:28 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 92681105781; Wed, 11 Dec 2013 02:35:21 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-ea0-f179.google.com (mail-ea0-f179.google.com [209.85.215.179]) by gabe.freedesktop.org (Postfix) with ESMTP id 3D835FAA25 for ; Wed, 11 Dec 2013 02:34:45 -0800 (PST) Received: by mail-ea0-f179.google.com with SMTP id r15so2810924ead.38 for ; Wed, 11 Dec 2013 02:34:44 -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=xA7BE+5I0jiHfdTp7ijP6t0jgwD86UXZxRWTN8XEb8A=; b=Knjzn1puF/TpJFk+XBdd7uuOhfgM/ObEQ6ionXCbKs5N5Xu7qShVJqGjYbP18RQR2r G00d/Ma07XIR/hhNvqa9dkjcxxbl0Z5xPyeKdj6IF+i1Dqe5H+jkHSCW31JlO8ufuyrh rH23bld6jTvKPFW9Jr5/vegE5EcbCvENvjnKI= 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=xA7BE+5I0jiHfdTp7ijP6t0jgwD86UXZxRWTN8XEb8A=; b=P2LgSu2u4gVYA5ZG3mTelPuJD/+JjhDmcaPGqviBlrR2MMat4b0PIkk8GD3KV62fK+ zv5ZJVweK6FZm4Vc9GRajWWRjpBXEKO/5SEVmFdHTOI0jE2MwcpqLbGyUUB79qzhOLEp dRo0OaeYHb7WgtGgOnXSyy/yEx7Pz2RwGCH8P5C+wwXzgXdazCj1j5b1erTsUqjXpXRT 4bMduVHt4X/40Gw7xEnaAgoTWMXYdL342IAL6MdWOGmSiBx9JRfJIxlBSTzf1h4L5Up+ Fwnb8UR3iygc/lu+eoLUnvliH+UZBTnympb5/VRWb9CJV9CPB2nWzoFiOLz5ZTrUSoui k+5g== X-Gm-Message-State: ALoCoQk4u5lz4D5KW7M+pYsp8bE+Nz88tLolY0QmSXGWBunN1ebGbxdHA0XhZmxhopAoYftvngxp X-Received: by 10.14.69.200 with SMTP id n48mr1026022eed.54.1386758084484; Wed, 11 Dec 2013 02:34:44 -0800 (PST) Received: from phenom.ffwll.local (178-83-130-250.dynamic.hispeed.ch. [178.83.130.250]) by mx.google.com with ESMTPSA id b41sm51932269eef.16.2013.12.11.02.34.43 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 Dec 2013 02:34:43 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH 11/50] drm/bufs: remove handling of _DRM_GEM mappings Date: Wed, 11 Dec 2013 11:34:32 +0100 Message-Id: <1386758111-3446-12-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.8.4.3 In-Reply-To: <1386758111-3446-1-git-send-email-daniel.vetter@ffwll.ch> References: <1386758111-3446-1-git-send-email-daniel.vetter@ffwll.ch> Cc: Daniel Vetter X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org X-Spam-Status: No, score=-4.3 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 Gone with the new gem vma offset manager from David. We can also ditch the uapi header definition from the enum since userspace never used this. It ended up in there purely for historical reasons (for reusing the old drm mmap code essentially), not because userspace ever needed it. Cc: David Herrmann Reviewed-by: David Herrmann Signed-off-by: Daniel Vetter --- drivers/gpu/drm/drm_bufs.c | 6 ------ drivers/gpu/drm/drm_vm.c | 3 --- include/uapi/drm/drm.h | 1 - 3 files changed, 10 deletions(-) diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c index 471e051d295e..766a5474fdbd 100644 --- a/drivers/gpu/drm/drm_bufs.c +++ b/drivers/gpu/drm/drm_bufs.c @@ -303,9 +303,6 @@ static int drm_addmap_core(struct drm_device * dev, resource_size_t offset, break; } - case _DRM_GEM: - DRM_ERROR("tried to addmap GEM object\n"); - break; case _DRM_SCATTER_GATHER: if (!dev->sg) { kfree(map); @@ -483,9 +480,6 @@ int drm_rmmap_locked(struct drm_device *dev, struct drm_local_map *map) dmah.size = map->size; __drm_pci_free(dev, &dmah); break; - case _DRM_GEM: - DRM_ERROR("tried to rmmap GEM object\n"); - break; } kfree(map); diff --git a/drivers/gpu/drm/drm_vm.c b/drivers/gpu/drm/drm_vm.c index 93e95d7efd57..79873bb2923f 100644 --- a/drivers/gpu/drm/drm_vm.c +++ b/drivers/gpu/drm/drm_vm.c @@ -266,9 +266,6 @@ static void drm_vm_shm_close(struct vm_area_struct *vma) dmah.size = map->size; __drm_pci_free(dev, &dmah); break; - case _DRM_GEM: - DRM_ERROR("tried to rmmap GEM object\n"); - break; } kfree(map); } diff --git a/include/uapi/drm/drm.h b/include/uapi/drm/drm.h index 9b24d65fed72..3c9a833992e8 100644 --- a/include/uapi/drm/drm.h +++ b/include/uapi/drm/drm.h @@ -181,7 +181,6 @@ enum drm_map_type { _DRM_AGP = 3, /**< AGP/GART */ _DRM_SCATTER_GATHER = 4, /**< Scatter/gather memory for PCI DMA */ _DRM_CONSISTENT = 5, /**< Consistent memory for PCI DMA */ - _DRM_GEM = 6, /**< GEM object (obsolete) */ }; /**