From patchwork Thu Jan 11 21:44:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 859340 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="QXl4nnx0"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zHfXn1vB0z9sNr for ; Fri, 12 Jan 2018 08:44:25 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932714AbeAKVoY (ORCPT ); Thu, 11 Jan 2018 16:44:24 -0500 Received: from mail-qt0-f196.google.com ([209.85.216.196]:36526 "EHLO mail-qt0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932703AbeAKVoX (ORCPT ); Thu, 11 Jan 2018 16:44:23 -0500 Received: by mail-qt0-f196.google.com with SMTP id a16so3714685qtj.3 for ; Thu, 11 Jan 2018 13:44:23 -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; bh=qZU28F5fFn04JQWfieH4nlQtJUrQufucDxLXsMEXR6o=; b=QXl4nnx0WlBLlK8kxGKkz6yNfAUNob7eW0u7QZX7vKxeOrO8zhCVBmatZFB50wVAKg vVFfahhlD/QiZKJRR2t5LY3cs0k+UjQtKnCfz758/iOo72tdm/c7kRauoBCT9J2fPNW3 UNMfwGbYKJOoFUuF0E7Y6DcsXj49P9gXAl55cZH5yNiCz8zp5hWhv9NRB3yl6N7FDiBx MX3NgjD7ww9wG8EvOCyNjwzM/NcF1v4G7jT0Paxy5+QBk/egqHG66QgvuNvOVTeKX5Fu tNlNQqSzSn0+xltfCWHqym1f2l9U7pgfywV4tx7Ur1NvmsobMJeLlZCbtJaypQPHU/zx kynQ== 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; bh=qZU28F5fFn04JQWfieH4nlQtJUrQufucDxLXsMEXR6o=; b=I+eTYd1i7iONYhbxnhVvEVYn8RCVRaBPzyKFp/zvuAL6mV3YanI3JYg7hGgFDWKPW0 a3mc8+StBn56zDJ/IChUMJ+JMA22J0vydoLfr0ijXl9Xt3QGWjaZdK3Fv9wo8guTfXO7 +erhcIXNZY3TcW79sTORJLR52KDXFMbOECDubqfj0u/Lt6/pMV4NU1HjqVtNicQzG2TB r2dy9wWSW1XU1YYgYau/B6vYkDcydnjvW736WgG/3bfaofPL0OQR06dbW0m+o+7h4kvl KA5SIHpa+v9D6QF78JTA94tQWtKVoQ6CXralvlPUaMcBY6hlYjauQ9du+ST+B5KyvxJU wb1g== X-Gm-Message-State: AKwxytdCrCLo08FBHjrdrkHQhUihXxazk0P07whKsuzkNn2U611SdCa9 T8/aZ6+4KO7it6ktdddp/Gc= X-Google-Smtp-Source: ACJfBotMaAj4Z56PWv0WZBeQnWJeMBP16fbo8b9tnZYzWInGWorB1EOcjDWeobygHT/eIm1otGYpfg== X-Received: by 10.200.24.18 with SMTP id q18mr33406233qtj.210.1515707062506; Thu, 11 Jan 2018 13:44:22 -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 m44sm12845370qtc.9.2018.01.11.13.44.21 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 11 Jan 2018 13:44:21 -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 1/5] drm/prime: Remove duplicate forward declaration Date: Thu, 11 Jan 2018 22:44:16 +0100 Message-Id: <20180111214420.26203-1-thierry.reding@gmail.com> X-Mailer: git-send-email 2.15.1 Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org From: Thierry Reding struct device is forward-declared twice. Remove the second instance. Reviewed-by: Chris Wilson Signed-off-by: Thierry Reding --- include/drm/drm_prime.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/drm/drm_prime.h b/include/drm/drm_prime.h index 9cd9e36f77b5..59ccab402e85 100644 --- a/include/drm/drm_prime.h +++ b/include/drm/drm_prime.h @@ -59,8 +59,6 @@ struct drm_device; struct drm_gem_object; struct drm_file; -struct device; - struct dma_buf *drm_gem_prime_export(struct drm_device *dev, struct drm_gem_object *obj, int flags); 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); From patchwork Thu Jan 11 21:44:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 859342 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="Lln5URRm"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zHfXt0bYKz9sNr for ; Fri, 12 Jan 2018 08:44:30 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932734AbeAKVo3 (ORCPT ); Thu, 11 Jan 2018 16:44:29 -0500 Received: from mail-qt0-f196.google.com ([209.85.216.196]:42976 "EHLO mail-qt0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932703AbeAKVo2 (ORCPT ); Thu, 11 Jan 2018 16:44:28 -0500 Received: by mail-qt0-f196.google.com with SMTP id c2so3714771qtn.9 for ; Thu, 11 Jan 2018 13:44:28 -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=OUOtRJp3d+BZw/g/0k6q60ghTdmIXpflbZVFY6L+apc=; b=Lln5URRmhKawWe5zUjBCJYHurIIpElIu7ql6Yx/6Zd7qOcmTBmMoeLJT6BGo0LXlSd Uiij6G26AQaWNcOMf/bUfFS9MicM8F/9rgSPi+scEadd/zUB9r0mrr0zK/ERpeV9teoQ NIxYeps9XvgQV1xKsNQ21omzomzUPGW9TQ4Ht2xJOIk277m2elQOntSORgvrD4LWInI1 D26IGcIpy0f6p4BKolGZ/GuEIW27IllwaxVMTrdRSqBIwqqkalxzCa1Q5eGkZjozZWpH +dOhr9Lr2kRx9BaXPabX1elMJJZpsM1cgz4DPZM8ecOQj2aeux+Ao5qTcBxQq8MuXRve mTIg== 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=OUOtRJp3d+BZw/g/0k6q60ghTdmIXpflbZVFY6L+apc=; b=DhRZppdERcRmi71MoIt2lXJoLaSP87BpxcUBayblR9pX9VckKkcibRH366j+DMDRpr j0pJSk9GK2lhcygmJj4hFBJ31MKpfWcTWyyjtCrSV3XW8GshEhXRS2E4ljEPLCFMWLxH hkKNMVubs6b/ctXjQkhZDXH2D3e3IOZ9FowDIVjXzcfBiPsYNi5DHV2J/me3uM2DovQL zDQME7fcf8kSbNuODOtlEXtDQ4tcAeZZbeQ4JeN6AnyMYy7lf0KR9s5bEhrGtadsipok +kT7FpSm8IG763psRGudRkWMez+MylThOLOI0xuCnEtIcY6tX+Ysteezmqc5LlPH5U8n +8fQ== X-Gm-Message-State: AKwxytelnZvR606dyt7cWTj3ut7UMsCYiVpIpJayCkzZAtGYD4lTXCQ+ XlSlqRAtfe0b0trQ5U+Bo7M= X-Google-Smtp-Source: ACJfBouDDr1P7c77cHpAWKgV8Ksp0pbS6wu8b1cW6q8oyaQrmWkpn/hVM3mfzTRxdCArgQTMp12+Vg== X-Received: by 10.237.54.8 with SMTP id e8mr35435815qtb.25.1515707067639; Thu, 11 Jan 2018 13:44:27 -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 e63sm12952388qkb.46.2018.01.11.13.44.26 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 11 Jan 2018 13:44:27 -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 3/5] drm/nouveau: Provide custom struct dma_buf_ops Date: Thu, 11 Jan 2018 22:44:18 +0100 Message-Id: <20180111214420.26203-3-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 Instead of relying on the DRM PRIME helpers to provide all of the DMA-BUF operations, provide a custom version of struct dma_buf_ops to allow additional functionality to be implemented. Signed-off-by: Thierry Reding --- drivers/gpu/drm/nouveau/nouveau_drm.c | 9 +- drivers/gpu/drm/nouveau/nouveau_gem.h | 15 +-- drivers/gpu/drm/nouveau/nouveau_prime.c | 157 +++++++++++++++++++++++++------- 3 files changed, 135 insertions(+), 46 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c index 56fe261b6268..3ce2f02e9e58 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drm.c +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c @@ -1081,15 +1081,12 @@ driver_stub = { .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_export = drm_gem_prime_export, - .gem_prime_import = drm_gem_prime_import, + .gem_prime_export = nouveau_gem_prime_export, + .gem_prime_import = nouveau_gem_prime_import, .gem_prime_pin = nouveau_gem_prime_pin, - .gem_prime_res_obj = nouveau_gem_prime_res_obj, .gem_prime_unpin = nouveau_gem_prime_unpin, + .gem_prime_res_obj = nouveau_gem_prime_res_obj, .gem_prime_get_sg_table = nouveau_gem_prime_get_sg_table, - .gem_prime_import_sg_table = nouveau_gem_prime_import_sg_table, - .gem_prime_vmap = nouveau_gem_prime_vmap, - .gem_prime_vunmap = nouveau_gem_prime_vunmap, .gem_free_object_unlocked = nouveau_gem_object_del, .gem_open_object = nouveau_gem_object_open, diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.h b/drivers/gpu/drm/nouveau/nouveau_gem.h index fe39998f65cc..eb55c1eb1d9f 100644 --- a/drivers/gpu/drm/nouveau/nouveau_gem.h +++ b/drivers/gpu/drm/nouveau/nouveau_gem.h @@ -32,13 +32,14 @@ extern int nouveau_gem_ioctl_cpu_fini(struct drm_device *, void *, extern int nouveau_gem_ioctl_info(struct drm_device *, void *, struct drm_file *); -extern int nouveau_gem_prime_pin(struct drm_gem_object *); +struct dma_buf *nouveau_gem_prime_export(struct drm_device *dev, + struct drm_gem_object *obj, + int flags); +struct drm_gem_object *nouveau_gem_prime_import(struct drm_device *drm, + struct dma_buf *buf); +int nouveau_gem_prime_pin(struct drm_gem_object *obj); +void nouveau_gem_prime_unpin(struct drm_gem_object *obj); struct reservation_object *nouveau_gem_prime_res_obj(struct drm_gem_object *); -extern void nouveau_gem_prime_unpin(struct drm_gem_object *); -extern struct sg_table *nouveau_gem_prime_get_sg_table(struct drm_gem_object *); -extern struct drm_gem_object *nouveau_gem_prime_import_sg_table( - struct drm_device *, struct dma_buf_attachment *, struct sg_table *); -extern void *nouveau_gem_prime_vmap(struct drm_gem_object *); -extern void nouveau_gem_prime_vunmap(struct drm_gem_object *, void *); +struct sg_table *nouveau_gem_prime_get_sg_table(struct drm_gem_object *obj); #endif diff --git a/drivers/gpu/drm/nouveau/nouveau_prime.c b/drivers/gpu/drm/nouveau/nouveau_prime.c index 1fefc93af1d7..63cf4aca2d8e 100644 --- a/drivers/gpu/drm/nouveau/nouveau_prime.c +++ b/drivers/gpu/drm/nouveau/nouveau_prime.c @@ -23,69 +23,152 @@ */ #include +#include #include #include "nouveau_drv.h" #include "nouveau_gem.h" -struct sg_table *nouveau_gem_prime_get_sg_table(struct drm_gem_object *obj) +static void *nouveau_gem_prime_kmap_atomic(struct dma_buf *buf, + unsigned long page) { - struct nouveau_bo *nvbo = nouveau_gem_object(obj); - int npages = nvbo->bo.num_pages; + return NULL; +} - return drm_prime_pages_to_sg(nvbo->bo.ttm->pages, npages); +static void nouveau_gem_prime_kunmap_atomic(struct dma_buf *buf, + unsigned long page, void *addr) +{ } -void *nouveau_gem_prime_vmap(struct drm_gem_object *obj) +static void *nouveau_gem_prime_kmap(struct dma_buf *buf, unsigned long page) { - struct nouveau_bo *nvbo = nouveau_gem_object(obj); + return NULL; +} + +static void nouveau_gem_prime_kunmap(struct dma_buf *buf, unsigned long page, + void *addr) +{ +} + +static void *nouveau_gem_prime_vmap(struct dma_buf *buf) +{ + struct nouveau_bo *bo = nouveau_gem_object(buf->priv); int ret; - ret = ttm_bo_kmap(&nvbo->bo, 0, nvbo->bo.num_pages, - &nvbo->dma_buf_vmap); + ret = ttm_bo_kmap(&bo->bo, 0, bo->bo.num_pages, &bo->dma_buf_vmap); if (ret) return ERR_PTR(ret); - return nvbo->dma_buf_vmap.virtual; + return bo->dma_buf_vmap.virtual; } -void nouveau_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr) +static void nouveau_gem_prime_vunmap(struct dma_buf *buf, void *vaddr) { - struct nouveau_bo *nvbo = nouveau_gem_object(obj); + struct nouveau_bo *bo = nouveau_gem_object(buf->priv); + + ttm_bo_kunmap(&bo->dma_buf_vmap); +} + +static const struct dma_buf_ops nouveau_gem_prime_dmabuf_ops = { + .attach = drm_gem_map_attach, + .detach = drm_gem_map_detach, + .map_dma_buf = drm_gem_map_dma_buf, + .unmap_dma_buf = drm_gem_unmap_dma_buf, + .release = drm_gem_dmabuf_release, + .map_atomic = nouveau_gem_prime_kmap_atomic, + .unmap_atomic = nouveau_gem_prime_kunmap_atomic, + .map = nouveau_gem_prime_kmap, + .unmap = nouveau_gem_prime_kunmap, + .vmap = nouveau_gem_prime_vmap, + .vunmap = nouveau_gem_prime_vunmap, +}; + +struct dma_buf *nouveau_gem_prime_export(struct drm_device *dev, + struct drm_gem_object *obj, + int flags) +{ + DEFINE_DMA_BUF_EXPORT_INFO(info); + + info.exp_name = KBUILD_MODNAME; + info.owner = dev->driver->fops->owner; + info.ops = &nouveau_gem_prime_dmabuf_ops; + info.size = obj->size; + info.flags = flags; + info.priv = obj; + + if (dev->driver->gem_prime_res_obj) + info.resv = dev->driver->gem_prime_res_obj(obj); - ttm_bo_kunmap(&nvbo->dma_buf_vmap); + return drm_gem_dmabuf_export(dev, &info); } -struct drm_gem_object *nouveau_gem_prime_import_sg_table(struct drm_device *dev, - struct dma_buf_attachment *attach, - struct sg_table *sg) +struct drm_gem_object *nouveau_gem_prime_import(struct drm_device *dev, + struct dma_buf *buf) { struct nouveau_drm *drm = nouveau_drm(dev); - struct nouveau_bo *nvbo; - struct reservation_object *robj = attach->dmabuf->resv; - u32 flags = 0; + struct dma_buf_attachment *attach; + struct drm_gem_object *obj; + u32 flags = TTM_PL_FLAG_TT; + struct nouveau_bo *bo; + struct sg_table *sgt; int ret; - flags = TTM_PL_FLAG_TT; + if (buf->ops == &nouveau_gem_prime_dmabuf_ops) { + obj = buf->priv; + + if (obj->dev == dev) { + /* + * Importing a DMA-BUF exported from our own GEM + * increases the reference count on the GEM itself + * instead of the f_count of the DMA-BUF. + */ + drm_gem_object_get(obj); + return obj; + } + } - ww_mutex_lock(&robj->lock, NULL); - ret = nouveau_bo_new(&drm->client, attach->dmabuf->size, 0, flags, 0, 0, - sg, robj, &nvbo); - ww_mutex_unlock(&robj->lock); - if (ret) - return ERR_PTR(ret); + attach = dma_buf_attach(buf, dev->dev); + if (IS_ERR(attach)) + return ERR_CAST(attach); - nvbo->valid_domains = NOUVEAU_GEM_DOMAIN_GART; + get_dma_buf(buf); - /* Initialize the embedded gem-object. We return a single gem-reference - * to the caller, instead of a normal nouveau_bo ttm reference. */ - ret = drm_gem_object_init(dev, &nvbo->gem, nvbo->bo.mem.size); - if (ret) { - nouveau_bo_ref(NULL, &nvbo); - return ERR_PTR(-ENOMEM); + sgt = dma_buf_map_attachment(attach, DMA_BIDIRECTIONAL); + if (IS_ERR(sgt)) { + ret = PTR_ERR(sgt); + goto detach; } - return &nvbo->gem; + ww_mutex_lock(&attach->dmabuf->resv->lock, NULL); + ret = nouveau_bo_new(&drm->client, attach->dmabuf->size, 0, flags, 0, + 0, sgt, attach->dmabuf->resv, &bo); + ww_mutex_unlock(&attach->dmabuf->resv->lock); + if (ret) + goto unmap; + + bo->valid_domains = NOUVEAU_GEM_DOMAIN_GART; + + /* + * Initialize the embedded GEM object. We return a single GEM reference + * to the caller, instead of a normal nouveau_bo TTM reference. + */ + ret = drm_gem_object_init(dev, &bo->gem, bo->bo.mem.size); + if (ret) + goto unref; + + bo->gem.import_attach = attach; + + return &bo->gem; + +unref: + nouveau_bo_ref(NULL, &bo); +unmap: + dma_buf_unmap_attachment(attach, sgt, DMA_BIDIRECTIONAL); +detach: + dma_buf_detach(buf, attach); + dma_buf_put(buf); + + return ERR_PTR(ret); } int nouveau_gem_prime_pin(struct drm_gem_object *obj) @@ -114,3 +197,11 @@ struct reservation_object *nouveau_gem_prime_res_obj(struct drm_gem_object *obj) return nvbo->bo.resv; } + +struct sg_table *nouveau_gem_prime_get_sg_table(struct drm_gem_object *obj) +{ + struct nouveau_bo *nvbo = nouveau_gem_object(obj); + int npages = nvbo->bo.num_pages; + + return drm_prime_pages_to_sg(nvbo->bo.ttm->pages, npages); +} From patchwork Thu Jan 11 21:44:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 859343 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="FTCHbqWN"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zHfXw17Cbz9sNr for ; Fri, 12 Jan 2018 08:44:32 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932751AbeAKVob (ORCPT ); Thu, 11 Jan 2018 16:44:31 -0500 Received: from mail-qt0-f195.google.com ([209.85.216.195]:39591 "EHLO mail-qt0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932703AbeAKVob (ORCPT ); Thu, 11 Jan 2018 16:44:31 -0500 Received: by mail-qt0-f195.google.com with SMTP id k19so3720768qtj.6 for ; Thu, 11 Jan 2018 13:44:30 -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=496tRsV910jq7ia+sCRDVe10Xv62i4Ky/Wip+yqkB0s=; b=FTCHbqWN+EkKWIyNIBHsZia/AiqUx45RzXlT3yj1uOwCzfhjnd47D3bqelTsUJs4JS rKbG2uEtL+YbuFwUUU5QBF4KzzlNWhnFHRxZYV71V8j6UWCKqArYpmDlcc0HDaK7Uxqs vji6vkrmoMXIb9e/Fz3Ov9K96WjMDko/usN02inP7wvhNL1iDI6kR1bt3CZec6kt/DiU 88TTPVSpVyVdlNJ/MqyU1zKSU/052ztOuqkgUSJLwZg9Byjgc4bipr9E2y8y5kR9zL2u IsO1r3J5iVDCsr/gFeuyVoTuTQTW4aYZNHfX5XiGoa/bCYjTzRSvgW92bt/t62KKNZzH DNEA== 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=496tRsV910jq7ia+sCRDVe10Xv62i4Ky/Wip+yqkB0s=; b=GXIbefHwdaGYYJ98QddQRavhw7w0b/gH+WSQu3yDqSjwTf0ZjX/hf7hbolX1h1GgfN 1YwuEMIo2OY7M7+0Zi41zLSkC9Qb40s3TlPvjoHKvJTQ0KNF97ktLHphbKtAUKGeMvXY raDm485sO8PrkVLcDugYp8zzMo0EcUxzOEQVa7uqKFW5+goZFqxO1buQRafxtVHIkRQb gVi5iH7Yx9f+R5Xxqc9TBC1lmhylcp5Wx74MKkfIYn/kTmHqIh+QwT2IlJwEuv2TaOYE ZXOFCXqy5sOQ8i/3VuzGDZAzqqF/OppJncfSfMvC74oIFc3mGKGLCbawoyc8/eZ29n/m rN7w== X-Gm-Message-State: AKwxytfMSv54r17dhMamqS67ZROlqzOaStH87rdXVAh7LbK5VkZjJ8e+ ZD4yJ6oglBtJ65DUYxETZSk= X-Google-Smtp-Source: ACJfBosTMGlNkRCsaV/pSjxbsZu0N2TyHT7ACSvFtDDxSVk2fTFoWwhAoeP92LX7BDtdxMay8nZe9A== X-Received: by 10.200.41.131 with SMTP id 3mr33412854qts.247.1515707070129; Thu, 11 Jan 2018 13:44:30 -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 d50sm1375062qtd.38.2018.01.11.13.44.29 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 11 Jan 2018 13:44:29 -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 4/5] drm/nouveau: prime: Implement mmap() Date: Thu, 11 Jan 2018 22:44:19 +0100 Message-Id: <20180111214420.26203-4-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 Provide an implementation of mmap() for PRIME exported buffers. This allows userspace to map these buffers and access them using the CPU. Signed-off-by: Thierry Reding --- drivers/gpu/drm/nouveau/nouveau_prime.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/drivers/gpu/drm/nouveau/nouveau_prime.c b/drivers/gpu/drm/nouveau/nouveau_prime.c index 63cf4aca2d8e..5d885d7cb059 100644 --- a/drivers/gpu/drm/nouveau/nouveau_prime.c +++ b/drivers/gpu/drm/nouveau/nouveau_prime.c @@ -50,6 +50,37 @@ static void nouveau_gem_prime_kunmap(struct dma_buf *buf, unsigned long page, { } +static inline u64 nouveau_bo_mmap_offset(struct nouveau_bo *bo) +{ + return drm_vma_node_offset_addr(&bo->bo.vma_node) >> PAGE_SHIFT; +} + +static int nouveau_gem_prime_mmap(struct dma_buf *buf, + struct vm_area_struct *vma) +{ + struct nouveau_bo *bo = nouveau_gem_object(buf->priv); + struct drm_gem_object *obj = buf->priv; + int ret; + + /* check for valid size */ + if (obj->size < vma->vm_end - vma->vm_start) + return -EINVAL; + + vma->vm_pgoff += nouveau_bo_mmap_offset(bo); + + if (unlikely(vma->vm_pgoff < DRM_FILE_PAGE_OFFSET)) + return drm_legacy_mmap(vma->vm_file, vma); + + ret = drm_vma_node_allow(&obj->vma_node, vma->vm_file->private_data); + if (ret) + return ret; + + ret = ttm_bo_mmap(vma->vm_file, vma, bo->bo.bdev); + drm_vma_node_revoke(&obj->vma_node, vma->vm_file->private_data); + + return ret; +} + static void *nouveau_gem_prime_vmap(struct dma_buf *buf) { struct nouveau_bo *bo = nouveau_gem_object(buf->priv); @@ -79,6 +110,7 @@ static const struct dma_buf_ops nouveau_gem_prime_dmabuf_ops = { .unmap_atomic = nouveau_gem_prime_kunmap_atomic, .map = nouveau_gem_prime_kmap, .unmap = nouveau_gem_prime_kunmap, + .mmap = nouveau_gem_prime_mmap, .vmap = nouveau_gem_prime_vmap, .vunmap = nouveau_gem_prime_vunmap, }; From patchwork Thu Jan 11 21:44:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 859344 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="iS1mCfH9"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zHfXy5PCcz9sNr for ; Fri, 12 Jan 2018 08:44:34 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932703AbeAKVoe (ORCPT ); Thu, 11 Jan 2018 16:44:34 -0500 Received: from mail-qk0-f195.google.com ([209.85.220.195]:35742 "EHLO mail-qk0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932472AbeAKVod (ORCPT ); Thu, 11 Jan 2018 16:44:33 -0500 Received: by mail-qk0-f195.google.com with SMTP id w1so6290354qka.2 for ; Thu, 11 Jan 2018 13:44:33 -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=ylZccpcX9WkFX7w6Xn+VIsUOIp0NK5NAKcx1syprxSA=; b=iS1mCfH9TM4JRtg4cefY1mHGeWUfSfHa1K84h5iiCkzwXsaRLHViGuzRt0ZJ84xo7V VJ+/N9fTez3N3whGv5O7Z97XmPjDrtOCNwblA+5J5f+Oak5RydhmhBWNHPaTTMMIBdg1 UqYnLPx8nlMWP+tJDE+yWq1vjFPNSwxZ80+EuRzV0DKfIEQrP/AdAzKndU7baffeLi/f qjS4rHqll9fxacfE1TY4JkXBEA/a8iDw4UbjSY0S90IpoOyPZUx4IB1oxvZZ08FAK/xr TI07Fh4hY0JlvLlSaKf/oaFTHxGpHBsxp0GmarmDuJPHQg/XRRAcr3iqcG4Gxhmwk/nV QqNw== 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=ylZccpcX9WkFX7w6Xn+VIsUOIp0NK5NAKcx1syprxSA=; b=gS838T2QH36xyjtCcR33r9uYB/JSuMmCcuuSFQLlVlrT33o2aY36gEOd8sGMjUKC6E P/P2yxQymnOZJSamdiPCh35CUbvkIRlZMbZ0K8eHIPCjd4AEXCUP5HD4nTS4ZngLoqqj Lk20KO9fs9lYroAAc93iPF9CagrNMrlTaD2M8Rothieq67CUKlHMixfKzXb47JcdNuB+ +oM8FcYKA4JElsIiiW/HbevwHgqewQTbEUnveGC4UK8mkrWhFlMG9lX/lUz1rf4ybTNo n/pwaQcTuM8OSJQZo6f70oJ53pKBk6TWhJ8lsv0oeLrHVKkJARbXJdkXAJDLTz2ZDen/ MKEw== X-Gm-Message-State: AKwxytfB8lgqIr/Bx6uwSu+LmSmexo428TlJ4sdTBWSw51/ZrMPW6HH7 fNBVysJygedjNAj5yxkuWOo= X-Google-Smtp-Source: ACJfBouJbFDFFxZ9qGzA2f/E+joFQvY5wrWPoSQMeMklJdqlKfAQJnm6p9TKqZ1hJZkGl6VtgHSIIg== X-Received: by 10.55.186.130 with SMTP id k124mr34240857qkf.153.1515707072722; Thu, 11 Jan 2018 13:44:32 -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 j49sm3060724qtc.61.2018.01.11.13.44.31 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 11 Jan 2018 13:44:32 -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 5/5] drm/nouveau: prime: Implement cache maintenance Date: Thu, 11 Jan 2018 22:44:20 +0100 Message-Id: <20180111214420.26203-5-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 Implement the ->begin_cpu_access() and ->end_cpu_access() callbacks to allow userspace to invalidate the cache before accessing a buffer that is exported using PRIME and flush the cache after modifying the buffer through its userspace mapping. Signed-off-by: Thierry Reding --- drivers/gpu/drm/nouveau/nouveau_prime.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/drivers/gpu/drm/nouveau/nouveau_prime.c b/drivers/gpu/drm/nouveau/nouveau_prime.c index 5d885d7cb059..a3a586ce864c 100644 --- a/drivers/gpu/drm/nouveau/nouveau_prime.c +++ b/drivers/gpu/drm/nouveau/nouveau_prime.c @@ -29,6 +29,26 @@ #include "nouveau_drv.h" #include "nouveau_gem.h" +static int nouveau_gem_prime_begin_cpu_access(struct dma_buf *buf, + enum dma_data_direction direction) +{ + struct nouveau_bo *bo = nouveau_gem_object(buf->priv); + + nouveau_bo_sync_for_cpu(bo); + + return 0; +} + +static int nouveau_gem_prime_end_cpu_access(struct dma_buf *buf, + enum dma_data_direction direction) +{ + struct nouveau_bo *bo = nouveau_gem_object(buf->priv); + + nouveau_bo_sync_for_device(bo); + + return 0; +} + static void *nouveau_gem_prime_kmap_atomic(struct dma_buf *buf, unsigned long page) { @@ -106,6 +126,8 @@ static const struct dma_buf_ops nouveau_gem_prime_dmabuf_ops = { .map_dma_buf = drm_gem_map_dma_buf, .unmap_dma_buf = drm_gem_unmap_dma_buf, .release = drm_gem_dmabuf_release, + .begin_cpu_access = nouveau_gem_prime_begin_cpu_access, + .end_cpu_access = nouveau_gem_prime_end_cpu_access, .map_atomic = nouveau_gem_prime_kmap_atomic, .unmap_atomic = nouveau_gem_prime_kunmap_atomic, .map = nouveau_gem_prime_kmap,