From patchwork Wed Aug 7 14:20:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Paul X-Patchwork-Id: 11082257 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C95EA912 for ; Wed, 7 Aug 2019 14:21:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B7A3D1FE8D for ; Wed, 7 Aug 2019 14:21:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AB71C28A21; Wed, 7 Aug 2019 14:21:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2D2A328A1B for ; Wed, 7 Aug 2019 14:21:17 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8E0CB89622; Wed, 7 Aug 2019 14:21:16 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-yb1-xb42.google.com (mail-yb1-xb42.google.com [IPv6:2607:f8b0:4864:20::b42]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3AF0389622 for ; Wed, 7 Aug 2019 14:21:15 +0000 (UTC) Received: by mail-yb1-xb42.google.com with SMTP id c9so4887662ybq.2 for ; Wed, 07 Aug 2019 07:21:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=lI1zGJ+Zt8c98UTqq/Rr2tAZw/+25EjsPxHKnIbPXkU=; b=K8Hitie3knyKTzdRvldIfIaHlPkgAvy8QQGxaVpbBlpLJ7bRfJp18GUjBEVpJIz6FJ aM5cSuYDh8E8hui8NB0fz9g/OLrD553FhqsBHpq+6URqDNG1pvKSqF77P0TJw0nNh1Ib 4R1qkyAySm2D27uwk4NupPAYREe6jQH0+t8HJJKAmCMc5804bz/yMBPI9PjTIBKx1PSP UX9gI/h7lF5XQTOmwozY+o70anUOWB83vknjHOzXESaGB91PKVrh5asfqsip7nGnePjh jLPoo9qmrEDWyu8b8YhQ18eh9bL4X8rxEVACx1toQGsPumr2ISGS7x45UnbBcYj7ftWp nOJg== X-Gm-Message-State: APjAAAV3GlgQ1ph8ZQvL82dIrtDjkNNmR42AaM4lTb++koM10RQZCsYB qglyROM6Sm3gqGmqN5eizc70ePTx2N0= X-Google-Smtp-Source: APXvYqyKYAJVAKESLMMDLI1zap4etG+C9AjSzw2mblxI1/X53J3r42g6lNlLJuUZOrdgy4jG6gCoJA== X-Received: by 2002:a25:7545:: with SMTP id q66mr6313866ybc.327.1565187674164; Wed, 07 Aug 2019 07:21:14 -0700 (PDT) Received: from rosewood.cam.corp.google.com ([2620:0:1013:11:89c6:2139:5435:371d]) by smtp.gmail.com with ESMTPSA id d204sm20419451ywe.33.2019.08.07.07.21.13 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 07 Aug 2019 07:21:13 -0700 (PDT) From: Sean Paul To: dri-devel@lists.freedesktop.org, daniel@ffwll.ch, airlied@gmail.com, mripard@kernel.org, robh@kernel.org, emil.velikov@collabora.com Subject: [PATCH 1/5] Revert "Revert "drm/gem: Rename drm_gem_dumb_map_offset() to drm_gem_map_offset()"" Date: Wed, 7 Aug 2019 10:20:54 -0400 Message-Id: <20190807142101.251400-2-sean@poorly.run> X-Mailer: git-send-email 2.23.0.rc1.153.gdeed80330f-goog In-Reply-To: <20190807142101.251400-1-sean@poorly.run> References: <20190807142101.251400-1-sean@poorly.run> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=poorly.run; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lI1zGJ+Zt8c98UTqq/Rr2tAZw/+25EjsPxHKnIbPXkU=; b=bAXcwVqpZMRgxdbdyTn3snRXXud0IZFexhEnJ584tEgw9i0GvWvKsEinXHPwdEwe3R WG3lgRm0eM2iAls4EYxL+Tr5GSQ9oTI0o7Fd8ey3iNH0/pw3MGSa/h3/xQkf15RPu5eZ 0wSfuH5hvU/urxk7HZ7M1/m2urFmsb2Yy2cbqC88d/nCrb80qEpFASuQxdUvHUQW0nmQ xOzXVT6LlCxYMBUw42s6r8Er0RlQYh3KecpZ7uMvrC9PaL3bzaSeZq6ZhKmtBckaOufK r1mrnGqRWyO4meGPAqNdWNbyWenBR1HV+Jo2ol2fACwv7F2N5z6RCqivih5Z5bivzt4w Rgmg== X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sean Paul Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Sean Paul This reverts commit 415d2e9e07574d3de63b8df77dc686e0ebf64865. Mandatory review was missing from this patch. Signed-off-by: Sean Paul --- drivers/gpu/drm/drm_dumb_buffers.c | 4 ++-- drivers/gpu/drm/drm_gem.c | 10 +++++++--- drivers/gpu/drm/exynos/exynos_drm_gem.c | 3 +-- include/drm/drm_gem.h | 4 ++-- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/drm_dumb_buffers.c b/drivers/gpu/drm/drm_dumb_buffers.c index d18a740fe0f1..b55cfc9e8772 100644 --- a/drivers/gpu/drm/drm_dumb_buffers.c +++ b/drivers/gpu/drm/drm_dumb_buffers.c @@ -48,7 +48,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 @@ -127,7 +127,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 afc38cece3f5..8cbfd60e09c0 100644 --- a/drivers/gpu/drm/drm_gem.c +++ b/drivers/gpu/drm/drm_gem.c @@ -298,7 +298,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 @@ -307,10 +307,14 @@ EXPORT_SYMBOL(drm_gem_handle_delete); * This implements the &drm_driver.dumb_map_offset kms driver callback for * drivers which use gem to manage their backing storage. * + * It can also be used by drivers using GEM BO implementations which + * have same restriction that imported objects cannot be mapped. The + * shmem backend is one example. + * * 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; @@ -336,7 +340,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 d734d9d51762..bf0ad8e5a02b 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_gem.c +++ b/drivers/gpu/drm/exynos/exynos_drm_gem.c @@ -273,8 +273,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 ae693c0666cd..0d6445fa9541 100644 --- a/include/drm/drm_gem.h +++ b/include/drm/drm_gem.h @@ -401,8 +401,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);