Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp677412yba; Thu, 16 May 2019 07:16:50 -0700 (PDT) X-Google-Smtp-Source: APXvYqxfPTY6xb7bzqL1TaVGSlRJR+c0IcrCw8OzxzkFjvn6C8WG1JW+nUM2BCwFP+B8QoWzxHuh X-Received: by 2002:a17:902:3225:: with SMTP id y34mr6038288plb.89.1558016210379; Thu, 16 May 2019 07:16:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558016210; cv=none; d=google.com; s=arc-20160816; b=eJVzibcQKg91ND9zg28A63RJNk9uljFWEnn8UbrgDDFrmLNspgpgE5VayqBuA8mSrp kOecJNTmcsp4MFrgPVFY3Yz3fTIXWh/slehiBFq1rQxXR4qoOWo+uZgXxXorDm2E3PYL NA3SJrOLRsDInMTDC0Op0fWrLIb6PJNMzElkg/SplXSWjUhaQO7Sl8Nd/+qYA6x8gquA 0CjaBklyI3NJONAUXYSBElLrAaDVYVcXrkXBjJl0Dx+HhoeV97q38Zt1ro1Ny+EaTfI4 X/IoeaCsoyiaelM8DIR/KpKido/FxGHFLPn2DTH22gUBu1td/zucl5/u5rotfVPO93DA Lazg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=6raNcvRbJi0xZnHujHh3dO2yjBJU8Bzabt6w2OacOog=; b=lExKXseb+y0Gfc61ByJw1uktgwo1wB13i6QF6Y5Uxp9yal1pRh2tmVFhZsUuKjRFJ+ WfOu6HcwB+H1pxRX9Le6mSeqF/xOcReeKyDU7KQxWlMBAECbWWVEdWmBvXAjNcE92yIi UFomflOpjiQU+oJ+7HCt4aCdyfZjzXdpuD6r4tiERBTc9p9x0WUbu0jUSoB9HTkU33Oi PBVZCywDXq+SpTSkv51LhPMJD9aJgCngTLGqbPnWv3VAsweO+oZ+EUGEPeyKuVLav6RQ dedcsw6MvCHTMbdLHD17lerOoSgeXQpJrUQcVAGoitWGMCk0DR+YveYYHFaIpz3VGXbU +IwA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z22si4924874pgv.196.2019.05.16.07.16.27; Thu, 16 May 2019 07:16:50 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727773AbfEPOPD (ORCPT + 99 others); Thu, 16 May 2019 10:15:03 -0400 Received: from foss.arm.com ([217.140.101.70]:47168 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726736AbfEPOPC (ORCPT ); Thu, 16 May 2019 10:15:02 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id B02A319F6; Thu, 16 May 2019 07:15:01 -0700 (PDT) Received: from e112269-lin.arm.com (e112269-lin.cambridge.arm.com [10.1.196.69]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id BBD393F71E; Thu, 16 May 2019 07:14:58 -0700 (PDT) From: Steven Price To: Daniel Vetter , Rob Herring , Tomeu Vizoso Cc: Steven Price , Alyssa Rosenzweig , Chris Wilson , David Airlie , Inki Dae , Joonyoung Shim , Krzysztof Kozlowski , Kukjin Kim , Kyungmin Park , Maarten Lankhorst , Maxime Ripard , Sean Paul , Seung-Woo Kim , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/3] drm/gem: Rename drm_gem_dumb_map_offset() to drm_gem_map_offset() Date: Thu, 16 May 2019 15:14:45 +0100 Message-Id: <20190516141447.46839-2-steven.price@arm.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190516141447.46839-1-steven.price@arm.com> References: <20190516141447.46839-1-steven.price@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org drm_gem_dumb_map_offset() is a useful helper for non-dumb clients, so rename it to remove the _dumb. Signed-off-by: Steven Price --- drivers/gpu/drm/drm_dumb_buffers.c | 4 ++-- drivers/gpu/drm/drm_gem.c | 6 +++--- drivers/gpu/drm/exynos/exynos_drm_gem.c | 3 +-- include/drm/drm_gem.h | 4 ++-- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/drm_dumb_buffers.c b/drivers/gpu/drm/drm_dumb_buffers.c index 81dfdd33753a..956665464296 100644 --- a/drivers/gpu/drm/drm_dumb_buffers.c +++ b/drivers/gpu/drm/drm_dumb_buffers.c @@ -46,7 +46,7 @@ * To support dumb objects drivers must implement the &drm_driver.dumb_create * operation. &drm_driver.dumb_destroy defaults to drm_gem_dumb_destroy() if * not set and &drm_driver.dumb_map_offset defaults to - * drm_gem_dumb_map_offset(). See the callbacks for further details. + * drm_gem_map_offset(). See the callbacks for further details. * * Note that dumb objects may not be used for gpu acceleration, as has been * attempted on some ARM embedded platforms. Such drivers really must have @@ -125,7 +125,7 @@ int drm_mode_mmap_dumb_ioctl(struct drm_device *dev, args->handle, &args->offset); else - return drm_gem_dumb_map_offset(file_priv, dev, args->handle, + return drm_gem_map_offset(file_priv, dev, args->handle, &args->offset); } diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c index 50de138c89e0..99bb7f79a70b 100644 --- a/drivers/gpu/drm/drm_gem.c +++ b/drivers/gpu/drm/drm_gem.c @@ -294,7 +294,7 @@ drm_gem_handle_delete(struct drm_file *filp, u32 handle) EXPORT_SYMBOL(drm_gem_handle_delete); /** - * drm_gem_dumb_map_offset - return the fake mmap offset for a gem object + * drm_gem_map_offset - return the fake mmap offset for a gem object * @file: drm file-private structure containing the gem object * @dev: corresponding drm_device * @handle: gem object handle @@ -306,7 +306,7 @@ EXPORT_SYMBOL(drm_gem_handle_delete); * Returns: * 0 on success or a negative error code on failure. */ -int drm_gem_dumb_map_offset(struct drm_file *file, struct drm_device *dev, +int drm_gem_map_offset(struct drm_file *file, struct drm_device *dev, u32 handle, u64 *offset) { struct drm_gem_object *obj; @@ -332,7 +332,7 @@ int drm_gem_dumb_map_offset(struct drm_file *file, struct drm_device *dev, return ret; } -EXPORT_SYMBOL_GPL(drm_gem_dumb_map_offset); +EXPORT_SYMBOL_GPL(drm_gem_map_offset); /** * drm_gem_dumb_destroy - dumb fb callback helper for gem based drivers diff --git a/drivers/gpu/drm/exynos/exynos_drm_gem.c b/drivers/gpu/drm/exynos/exynos_drm_gem.c index a55f5ac41bf3..5e3aa9e4a096 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_gem.c +++ b/drivers/gpu/drm/exynos/exynos_drm_gem.c @@ -276,8 +276,7 @@ int exynos_drm_gem_map_ioctl(struct drm_device *dev, void *data, { struct drm_exynos_gem_map *args = data; - return drm_gem_dumb_map_offset(file_priv, dev, args->handle, - &args->offset); + return drm_gem_map_offset(file_priv, dev, args->handle, &args->offset); } struct exynos_drm_gem *exynos_drm_gem_get(struct drm_file *filp, diff --git a/include/drm/drm_gem.h b/include/drm/drm_gem.h index 5047c7ee25f5..91b07c2325e9 100644 --- a/include/drm/drm_gem.h +++ b/include/drm/drm_gem.h @@ -395,8 +395,8 @@ int drm_gem_fence_array_add(struct xarray *fence_array, int drm_gem_fence_array_add_implicit(struct xarray *fence_array, struct drm_gem_object *obj, bool write); -int drm_gem_dumb_map_offset(struct drm_file *file, struct drm_device *dev, - u32 handle, u64 *offset); +int drm_gem_map_offset(struct drm_file *file, struct drm_device *dev, + u32 handle, u64 *offset); int drm_gem_dumb_destroy(struct drm_file *file, struct drm_device *dev, uint32_t handle); -- 2.20.1