From patchwork Thu Jan 11 21:44:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 859341 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-tegra-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="DrAl4HwC"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zHfXq2K92z9sNr for ; Fri, 12 Jan 2018 08:44:27 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932720AbeAKVo0 (ORCPT ); Thu, 11 Jan 2018 16:44:26 -0500 Received: from mail-qt0-f195.google.com ([209.85.216.195]:43926 "EHLO mail-qt0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932703AbeAKVo0 (ORCPT ); Thu, 11 Jan 2018 16:44:26 -0500 Received: by mail-qt0-f195.google.com with SMTP id s3so3699602qtb.10 for ; Thu, 11 Jan 2018 13:44:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ZJENbVKgteqon4z+zX28aLDz5hbvv4Kh+1+p1sdn36I=; b=DrAl4HwCO3lJeEl8yyg4OyKBRrVo6s2itZQ8l8Zo+sXgFXInpT+ztrMBJ/maUtdoGF TKzqIC766fkjnOeLIkHIk1reUChp0HAt2MJ91Q8GFoA4+FKF9ehwbfrYsII1s2wo2o2m QiLrH28tWGc3/VndJOF51XvkdeYytPVfT9bho5fvSfC3LnAl1MmP8jDrUFSEYRzqgWoi cwI8j1hLE/S7O5VWJv5zLDCioTsY3naf7g3gm12zwKVs+ymbb/qUtMnsP7P0QLQRUAnq XyvFQJTaE5CcTH3SLLEDY2ptAsKB7OpxP1kubvnwiUuNuPuQScmt8RLjAqKPJrWRgbH4 6adw== 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; bh=ZJENbVKgteqon4z+zX28aLDz5hbvv4Kh+1+p1sdn36I=; b=jBC+DH3wv4E1l7mktFQL09+bsTS+O2GjWw75NYfnFvwrscDsv+8XiATV4uenx3kPLl p0Y1ylokbW4QlkBbzHWdoXgedftwvtiZGajHhB7IDhALlKM1R5nKMChOf6+bMsjeFdkf lkD8w2jxgfDm1B39HVV5Gn5OwNiEuVJtOpnDdieto046ook3NSoxtBRLBrbRxQCCQSx6 bWo9byHcKi3hrT7dtiWa201bypxPl547UUsSxdq33zk8hx0yzLb4d8r3jwZWRwxGy6rY +O87Ma4JYkF8bYA31lK/cHXSPz4waVd2AUf+/Z18ldIM5MZ84TZV2np4YSxekMnpgbE0 3GQw== X-Gm-Message-State: AKwxytc7IBZ11DROEW7FCnm2w4S43HnHzoQ1fUN5/3MaIx79uLdvxIWa qE+Sv2rEDE8HD7/ahw9/h1g= X-Google-Smtp-Source: ACJfBouHvR8e2dp1oEyuGTOzHJ3mLRVJTP/xY/12vIOv7RLkNnVUrqB5BpylGd0T7cq3acg4BxSU1A== X-Received: by 10.200.10.11 with SMTP id b11mr34414065qti.287.1515707065160; Thu, 11 Jan 2018 13:44:25 -0800 (PST) Received: from localhost (p200300E41F21CF00227DB10B7BBDB590.dip0.t-ipconnect.de. [2003:e4:1f21:cf00:227d:b10b:7bbd:b590]) by smtp.gmail.com with ESMTPSA id c1sm12876231qta.52.2018.01.11.13.44.24 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 11 Jan 2018 13:44:24 -0800 (PST) From: Thierry Reding To: Ben Skeggs Cc: Daniel Vetter , dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org, linux-tegra@vger.kernel.org Subject: [PATCH 2/5] drm/prime: Export more helpers for drivers Date: Thu, 11 Jan 2018 22:44:17 +0100 Message-Id: <20180111214420.26203-2-thierry.reding@gmail.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180111214420.26203-1-thierry.reding@gmail.com> References: <20180111214420.26203-1-thierry.reding@gmail.com> Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org From: Thierry Reding Export some more of the helpers in order to allow drivers to more fine- grainedly select which helpers to use. This gives drivers an easy way to reuse a lot of the code in the helpers while at the same time allowing them to provide their own implementation for other functions in struct dma_buf_ops. Signed-off-by: Thierry Reding --- drivers/gpu/drm/drm_prime.c | 23 +++++++++++++---------- include/drm/drm_prime.h | 12 ++++++++++++ 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c index 9a17725b0f7a..f9903e6b59f6 100644 --- a/drivers/gpu/drm/drm_prime.c +++ b/drivers/gpu/drm/drm_prime.c @@ -180,9 +180,8 @@ static int drm_prime_lookup_buf_handle(struct drm_prime_file_private *prime_fpri return -ENOENT; } -static int drm_gem_map_attach(struct dma_buf *dma_buf, - struct device *target_dev, - struct dma_buf_attachment *attach) +int drm_gem_map_attach(struct dma_buf *dma_buf, struct device *target_dev, + struct dma_buf_attachment *attach) { struct drm_prime_attachment *prime_attach; struct drm_gem_object *obj = dma_buf->priv; @@ -200,9 +199,10 @@ static int drm_gem_map_attach(struct dma_buf *dma_buf, return dev->driver->gem_prime_pin(obj); } +EXPORT_SYMBOL(drm_gem_map_attach); -static void drm_gem_map_detach(struct dma_buf *dma_buf, - struct dma_buf_attachment *attach) +void drm_gem_map_detach(struct dma_buf *dma_buf, + struct dma_buf_attachment *attach) { struct drm_prime_attachment *prime_attach = attach->priv; struct drm_gem_object *obj = dma_buf->priv; @@ -228,6 +228,7 @@ static void drm_gem_map_detach(struct dma_buf *dma_buf, kfree(prime_attach); attach->priv = NULL; } +EXPORT_SYMBOL(drm_gem_map_detach); void drm_prime_remove_buf_handle_locked(struct drm_prime_file_private *prime_fpriv, struct dma_buf *dma_buf) @@ -254,8 +255,8 @@ void drm_prime_remove_buf_handle_locked(struct drm_prime_file_private *prime_fpr } } -static struct sg_table *drm_gem_map_dma_buf(struct dma_buf_attachment *attach, - enum dma_data_direction dir) +struct sg_table *drm_gem_map_dma_buf(struct dma_buf_attachment *attach, + enum dma_data_direction dir) { struct drm_prime_attachment *prime_attach = attach->priv; struct drm_gem_object *obj = attach->dmabuf->priv; @@ -291,13 +292,15 @@ static struct sg_table *drm_gem_map_dma_buf(struct dma_buf_attachment *attach, return sgt; } +EXPORT_SYMBOL(drm_gem_map_dma_buf); -static void drm_gem_unmap_dma_buf(struct dma_buf_attachment *attach, - struct sg_table *sgt, - enum dma_data_direction dir) +void drm_gem_unmap_dma_buf(struct dma_buf_attachment *attach, + struct sg_table *sgt, + enum dma_data_direction dir) { /* nothing to be done here */ } +EXPORT_SYMBOL(drm_gem_unmap_dma_buf); /** * drm_gem_dmabuf_export - dma_buf export implementation for GEM diff --git a/include/drm/drm_prime.h b/include/drm/drm_prime.h index 59ccab402e85..3a9706815773 100644 --- a/include/drm/drm_prime.h +++ b/include/drm/drm_prime.h @@ -50,8 +50,10 @@ struct drm_prime_file_private { struct rb_root handles; }; +enum dma_data_direction; struct device; +struct dma_buf_attachment; struct dma_buf_export_info; struct dma_buf; @@ -59,6 +61,16 @@ struct drm_device; struct drm_gem_object; struct drm_file; +int drm_gem_map_attach(struct dma_buf *dma_buf, struct device *target_dev, + struct dma_buf_attachment *attach); +void drm_gem_map_detach(struct dma_buf *dma_buf, + struct dma_buf_attachment *attach); +struct sg_table *drm_gem_map_dma_buf(struct dma_buf_attachment *attach, + enum dma_data_direction dir); +void drm_gem_unmap_dma_buf(struct dma_buf_attachment *attach, + struct sg_table *sgt, + enum dma_data_direction dir); + struct dma_buf *drm_gem_prime_export(struct drm_device *dev, struct drm_gem_object *obj, int flags);