From patchwork Wed Sep 17 13:48:45 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Inki Dae X-Patchwork-Id: 4924541 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D7C949F3EC for ; Wed, 17 Sep 2014 13:47:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 782FC20121 for ; Wed, 17 Sep 2014 13:49:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 69FF22017D for ; Wed, 17 Sep 2014 13:48:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755698AbaIQNsv (ORCPT ); Wed, 17 Sep 2014 09:48:51 -0400 Received: from mailout3.samsung.com ([203.254.224.33]:57024 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755689AbaIQNsu (ORCPT ); Wed, 17 Sep 2014 09:48:50 -0400 Received: from epcpsbgr2.samsung.com (u142.gpu120.samsung.co.kr [203.254.230.142]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0NC100B4WT1CP2C0@mailout3.samsung.com> for linux-samsung-soc@vger.kernel.org; Wed, 17 Sep 2014 22:48:48 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [172.20.52.114]) by epcpsbgr2.samsung.com (EPCPMTA) with SMTP id 07.04.04049.04199145; Wed, 17 Sep 2014 22:48:48 +0900 (KST) X-AuditID: cbfee68e-f79536d000000fd1-15-5419914037c6 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id B0.06.04943.04199145; Wed, 17 Sep 2014 22:48:48 +0900 (KST) Received: from daeinki-desktop.10.32.193.11 ([10.252.83.67]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0NC100F8ET1AGNB0@mmp1.samsung.com>; Wed, 17 Sep 2014 22:48:48 +0900 (KST) From: Inki Dae To: dri-devel@lists.freedesktop.org Cc: airlied@linux.ie, daniel@ffwll.ch, linux-samsung-soc@vger.kernel.org, Inki Dae Subject: [PATCH 1/2] drm/exynos: remove DRM_EXYNOS_GEM_MAP_OFFSET ioctl Date: Wed, 17 Sep 2014 22:48:45 +0900 Message-id: <1410961726-2533-2-git-send-email-inki.dae@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1410961726-2533-1-git-send-email-inki.dae@samsung.com> References: <1410961726-2533-1-git-send-email-inki.dae@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrALMWRmVeSWpSXmKPExsWyRsSkSNdhomSIwen/Uha9504yWfzfNpHZ 4srX92wWk+5PYLGYcX4fkwOrx95vC1g8tn97wOpxv/s4k0ffllWMHp83yQWwRnHZpKTmZJal FunbJXBlTP0znbGgXaGi8/4PlgbGv1JdjJwcEgImEvPPLWeCsMUkLtxbz9bFyMUhJLCUUeLO /n5mmKJTTSsZQWwhgUWMEufuuEMUdTNJPJo+jQ0kwSagKjFxxX0wW0RAWeLvxFVgDcwC2RLL Lt0F2yAs4C7x7cEjMJsFqH7hq1+sIDavgLNE97Qr7F2MHEDLFCTmTLIBCXMKuEgsfPICaq+z RPu1l4wgeyUE2tklJr3vhpojIPFt8iEWiF5ZiU0HoG6WlDi44gbLBEbhBYwMqxhFUwuSC4qT 0ouM9IoTc4tL89L1kvNzNzECA/r0v2d9OxhvHrA+xCjAwajEw7vhskSIEGtiWXFl7iFGU6AN E5mlRJPzgXGTVxJvaGxmZGFqYmpsZG5ppiTOmyD1M1hIID2xJDU7NbUgtSi+qDQntfgQIxMH p1QDY695YwJPCKPYgjgT0zMHnDydPizO3TfpfP/LbbMmz/6zTIrbpU/5hburvUhglcKP6YqP YyJuJjD8Op18dw57znPBUtH3f2ZtsI2dt9FNZv5rJvaZhju+qzLp9xg+kPEtq76fflrKgUFg vaWCkM8e9hOzdwQoPdHd2X7RStNvZuqzLH0Z/pk8SizFGYmGWsxFxYkAOXM5CGMCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprFIsWRmVeSWpSXmKPExsVy+t9jAV2HiZIhBq82CVv0njvJZPF/20Rm iytf37NZTLo/gcVixvl9TA6sHnu/LWDx2P7tAavH/e7jTB59W1YxenzeJBfAGtXAaJORmpiS WqSQmpecn5KZl26r5B0c7xxvamZgqGtoaWGupJCXmJtqq+TiE6DrlpkDtF1JoSwxpxQoFJBY XKykb4dpQmiIm64FTGOErm9IEFyPkQEaSFjDmDH1z3TGgnaFis77P1gaGP9KdTFyckgImEic alrJCGGLSVy4t54NxBYSWMQoce6OexcjF5DdzSTxaPo0sASbgKrExBX3wWwRAWWJvxNXgTUz C2RLLLt0lwnEFhZwl/j24BGYzQJUv/DVL1YQm1fAWaJ72hX2LkYOoGUKEnMm2YCEOQVcJBY+ ecEIsddZov3aS8YJjLwLGBlWMYqmFiQXFCel5xrqFSfmFpfmpesl5+duYgTHyzOpHYwrGywO MQpwMCrx8G64LBEixJpYVlyZe4hRgoNZSYT3fbtkiBBvSmJlVWpRfnxRaU5q8SFGU6CjJjJL iSbnA2M5ryTe0NjEzMjSyNzQwsjYXEmc90CrdaCQQHpiSWp2ampBahFMHxMHp1QDY8fOpB9G Fazaf5aZdk2o9rSbcvaSpLD/VMXC20pTm3PrzwWxlPtEJV+72KqduP/C/he56z3t7wcsmSvl U1mzdjv3if9zbgv/8Dyc9cTgxVmbbT+f3XX5rfq9vX375XcnTVuyL7SFnv0rNNnxGZ/q33U9 99g8+3uv7qgWUBH523//dcQUzbk+fUosxRmJhlrMRcWJACT4I/6tAgAA DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 This interface and relevant codes aren't used anymore. Signed-off-by: Inki Dae --- drivers/gpu/drm/exynos/exynos_drm_drv.c | 3 --- drivers/gpu/drm/exynos/exynos_drm_gem.c | 17 ----------------- drivers/gpu/drm/exynos/exynos_drm_gem.h | 4 ---- include/uapi/drm/exynos_drm.h | 18 ------------------ 4 files changed, 42 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c index 9b00e4e..10ad3d4 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_drv.c +++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c @@ -282,9 +282,6 @@ static const struct vm_operations_struct exynos_drm_gem_vm_ops = { static const struct drm_ioctl_desc exynos_ioctls[] = { DRM_IOCTL_DEF_DRV(EXYNOS_GEM_CREATE, exynos_drm_gem_create_ioctl, DRM_UNLOCKED | DRM_AUTH), - DRM_IOCTL_DEF_DRV(EXYNOS_GEM_MAP_OFFSET, - exynos_drm_gem_map_offset_ioctl, DRM_UNLOCKED | - DRM_AUTH), DRM_IOCTL_DEF_DRV(EXYNOS_GEM_MMAP, exynos_drm_gem_mmap_ioctl, DRM_UNLOCKED | DRM_AUTH), DRM_IOCTL_DEF_DRV(EXYNOS_GEM_GET, diff --git a/drivers/gpu/drm/exynos/exynos_drm_gem.c b/drivers/gpu/drm/exynos/exynos_drm_gem.c index 15db801..2f3665d 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_gem.c +++ b/drivers/gpu/drm/exynos/exynos_drm_gem.c @@ -318,23 +318,6 @@ void exynos_drm_gem_put_dma_addr(struct drm_device *dev, drm_gem_object_unreference_unlocked(obj); } -int exynos_drm_gem_map_offset_ioctl(struct drm_device *dev, void *data, - struct drm_file *file_priv) -{ - struct drm_exynos_gem_map_off *args = data; - - DRM_DEBUG_KMS("handle = 0x%x, offset = 0x%lx\n", - args->handle, (unsigned long)args->offset); - - if (!(dev->driver->driver_features & DRIVER_GEM)) { - DRM_ERROR("does not support GEM.\n"); - return -ENODEV; - } - - return exynos_drm_gem_dumb_map_offset(file_priv, dev, args->handle, - &args->offset); -} - int exynos_drm_gem_mmap_buffer(struct file *filp, struct vm_area_struct *vma) { diff --git a/drivers/gpu/drm/exynos/exynos_drm_gem.h b/drivers/gpu/drm/exynos/exynos_drm_gem.h index 1592c0b..8e46094 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_gem.h +++ b/drivers/gpu/drm/exynos/exynos_drm_gem.h @@ -111,10 +111,6 @@ void exynos_drm_gem_put_dma_addr(struct drm_device *dev, unsigned int gem_handle, struct drm_file *filp); -/* get buffer offset to map to user space. */ -int exynos_drm_gem_map_offset_ioctl(struct drm_device *dev, void *data, - struct drm_file *file_priv); - /* * mmap the physically continuous memory that a gem object contains * to user space. diff --git a/include/uapi/drm/exynos_drm.h b/include/uapi/drm/exynos_drm.h index d584412..67a751c 100644 --- a/include/uapi/drm/exynos_drm.h +++ b/include/uapi/drm/exynos_drm.h @@ -33,20 +33,6 @@ struct drm_exynos_gem_create { }; /** - * A structure for getting buffer offset. - * - * @handle: a pointer to gem object created. - * @pad: just padding to be 64-bit aligned. - * @offset: relatived offset value of the memory region allocated. - * - this value should be set by user. - */ -struct drm_exynos_gem_map_off { - unsigned int handle; - unsigned int pad; - uint64_t offset; -}; - -/** * A structure for mapping buffer. * * @handle: a handle to gem object created. @@ -316,7 +302,6 @@ struct drm_exynos_ipp_cmd_ctrl { }; #define DRM_EXYNOS_GEM_CREATE 0x00 -#define DRM_EXYNOS_GEM_MAP_OFFSET 0x01 #define DRM_EXYNOS_GEM_MMAP 0x02 /* Reserved 0x03 ~ 0x05 for exynos specific gem ioctl */ #define DRM_EXYNOS_GEM_GET 0x04 @@ -336,9 +321,6 @@ struct drm_exynos_ipp_cmd_ctrl { #define DRM_IOCTL_EXYNOS_GEM_CREATE DRM_IOWR(DRM_COMMAND_BASE + \ DRM_EXYNOS_GEM_CREATE, struct drm_exynos_gem_create) -#define DRM_IOCTL_EXYNOS_GEM_MAP_OFFSET DRM_IOWR(DRM_COMMAND_BASE + \ - DRM_EXYNOS_GEM_MAP_OFFSET, struct drm_exynos_gem_map_off) - #define DRM_IOCTL_EXYNOS_GEM_MMAP DRM_IOWR(DRM_COMMAND_BASE + \ DRM_EXYNOS_GEM_MMAP, struct drm_exynos_gem_mmap)