mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Terje Bergstrom <tbergstrom@nvidia.com>
To: <thierry.reding@avionic-design.de>, <linux-tegra@vger.kernel.org>,
	<dri-devel@lists.freedesktop.org>
Cc: <linux-kernel@vger.kernel.org>,
	Arto Merilainen <amerilainen@nvidia.com>,
	Terje Bergstrom <tbergstrom@nvidia.com>
Subject: [RFC v2 7/8] gpu: drm: tegra: Prime support
Date: Mon, 26 Nov 2012 15:19:13 +0200	[thread overview]
Message-ID: <1353935954-13763-8-git-send-email-tbergstrom@nvidia.com> (raw)
In-Reply-To: <1353935954-13763-1-git-send-email-tbergstrom@nvidia.com>

From: Arto Merilainen <amerilainen@nvidia.com>

This patch introduces support for exporting allocated memory as
dmabuf objects. Exported buffers are used for delivering data to
nvhost driver.

Signed-off-by: Arto Merilainen <amerilainen@nvidia.com>
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
---
 drivers/gpu/drm/tegra/Makefile |    2 +-
 drivers/gpu/drm/tegra/dmabuf.c |  150 ++++++++++++++++++++++++++++++++++++++++
 drivers/gpu/drm/tegra/drm.c    |    9 ++-
 drivers/gpu/drm/tegra/drm.h    |    6 ++
 4 files changed, 165 insertions(+), 2 deletions(-)
 create mode 100644 drivers/gpu/drm/tegra/dmabuf.c

diff --git a/drivers/gpu/drm/tegra/Makefile b/drivers/gpu/drm/tegra/Makefile
index 57a334d..53ea383 100644
--- a/drivers/gpu/drm/tegra/Makefile
+++ b/drivers/gpu/drm/tegra/Makefile
@@ -3,6 +3,6 @@ ccflags-$(CONFIG_DRM_TEGRA_DEBUG) += -DDEBUG
 
 tegra-drm-y := drm.o fb.o dc.o
 tegra-drm-y += output.o rgb.o hdmi.o tvo.o dsi.o
-tegra-drm-y += plane.o
+tegra-drm-y += plane.o dmabuf.o
 
 obj-$(CONFIG_DRM_TEGRA) += tegra-drm.o
diff --git a/drivers/gpu/drm/tegra/dmabuf.c b/drivers/gpu/drm/tegra/dmabuf.c
new file mode 100644
index 0000000..e81db12
--- /dev/null
+++ b/drivers/gpu/drm/tegra/dmabuf.c
@@ -0,0 +1,150 @@
+/*
+ * drivers/gpu/drm/tegra/dmabuf.c
+ *
+ * dmabuf exporter for cma allocations
+ *
+ * Copyright (c) 2012, NVIDIA Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <drm/drmP.h>
+#include <drm/drm.h>
+#include <drm/drm_gem_cma_helper.h>
+
+#include <linux/sched.h>
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/slab.h>
+#include <linux/fs.h>
+#include <linux/miscdevice.h>
+#include <linux/scatterlist.h>
+#include <linux/uaccess.h>
+#include <linux/io.h>
+#include <linux/platform_device.h>
+#include <linux/dma-buf.h>
+
+#include <asm/page.h>
+#include <asm/dma-iommu.h>
+
+static struct sg_table *tegra_dmabuf_map(struct dma_buf_attachment *attach,
+					enum dma_data_direction dir)
+{
+	struct drm_gem_cma_object *obj = attach->dmabuf->priv;
+	struct page **pages;
+	int npages = obj->base.size / PAGE_SIZE;
+	struct sg_table *sgt;
+	struct scatterlist *sg;
+	int i, page_num = 0;
+
+	/* create a list of used pages */
+	pages = kzalloc(sizeof(*pages) * npages, GFP_KERNEL);
+	if (!pages)
+		goto err_alloc_pages;
+	for (i = 0; i < npages; i++)
+		pages[i] = virt_to_page(obj->vaddr + i * PAGE_SIZE);
+
+	/* generate sgt using the page list */
+	sgt = kzalloc(sizeof(*sgt), GFP_KERNEL);
+	if (!sgt)
+		goto err_alloc_sgt;
+	if (sg_alloc_table_from_pages(sgt, pages, npages, 0, obj->base.size,
+		GFP_KERNEL))
+		goto err_generate_sgt;
+	for_each_sg(sgt->sgl, sg, sgt->nents, i) {
+		sg->dma_address = page_to_phys(pages[page_num]);
+		page_num += sg->length >> PAGE_SHIFT;
+	}
+
+	/* only the sgt is interesting */
+	kfree(pages);
+
+	return sgt;
+
+err_generate_sgt:
+	kfree(sgt);
+err_alloc_sgt:
+	kfree(pages);
+err_alloc_pages:
+	return NULL;
+}
+
+static void tegra_dmabuf_unmap(struct dma_buf_attachment *attach,
+					struct sg_table *sgt,
+					enum dma_data_direction dir)
+{
+	sg_free_table(sgt);
+	kfree(sgt);
+}
+
+static void tegra_dmabuf_release(struct dma_buf *dmabuf)
+{
+	struct drm_gem_cma_object *obj = dmabuf->priv;
+
+	if (obj->base.export_dma_buf == dmabuf) {
+		obj->base.export_dma_buf = NULL;
+		drm_gem_object_unreference_unlocked(&obj->base);
+	}
+}
+
+static void *tegra_dmabuf_kmap_atomic(struct dma_buf *dmabuf,
+					unsigned long page_num)
+{
+	struct drm_gem_cma_object *obj = dmabuf->priv;
+	return obj->vaddr + PAGE_SIZE * page_num;
+}
+
+static void *tegra_dmabuf_kmap(struct dma_buf *dmabuf, unsigned long page_num)
+{
+	return tegra_dmabuf_kmap_atomic(dmabuf, page_num);
+}
+
+static int tegra_dmabuf_mmap(struct dma_buf *dmabuf,
+			       struct vm_area_struct *vma)
+{
+	struct drm_gem_cma_object *obj = dmabuf->priv;
+	DEFINE_DMA_ATTRS(attrs);
+
+	vma->vm_private_data = obj;
+
+	return dma_mmap_attrs(obj->base.dev->dev->parent, vma, obj->vaddr,
+		obj->paddr, obj->base.size, &attrs);
+}
+
+static void *tegra_dmabuf_vmap(struct dma_buf *dmabuf)
+{
+	struct drm_gem_cma_object *obj = dmabuf->priv;
+	return obj->vaddr;
+}
+
+static struct dma_buf_ops tegra_dmabuf_ops = {
+	.map_dma_buf	= tegra_dmabuf_map,
+	.unmap_dma_buf	= tegra_dmabuf_unmap,
+	.release	= tegra_dmabuf_release,
+	.kmap_atomic	= tegra_dmabuf_kmap_atomic,
+	.kmap		= tegra_dmabuf_kmap,
+	.mmap		= tegra_dmabuf_mmap,
+	.vmap		= tegra_dmabuf_vmap,
+};
+
+struct dma_buf *tegra_dmabuf_export(struct drm_device *drm_dev,
+				struct drm_gem_object *obj, int flags)
+{
+	return dma_buf_export(obj, &tegra_dmabuf_ops, obj->size, O_RDWR);
+}
+
+struct drm_gem_object *tegra_dmabuf_import(struct drm_device *drm_dev,
+					struct dma_buf *dmabuf)
+{
+	return NULL;
+}
diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c
index cba2d1d..f78a31b 100644
--- a/drivers/gpu/drm/tegra/drm.c
+++ b/drivers/gpu/drm/tegra/drm.c
@@ -251,7 +251,8 @@ static const struct file_operations tegra_drm_fops = {
 };
 
 struct drm_driver tegra_drm_driver = {
-	.driver_features = DRIVER_BUS_PLATFORM | DRIVER_MODESET | DRIVER_GEM,
+	.driver_features = DRIVER_BUS_PLATFORM | DRIVER_MODESET | DRIVER_GEM |
+		DRIVER_PRIME,
 	.load = tegra_drm_load,
 	.unload = tegra_drm_unload,
 	.open = tegra_drm_open,
@@ -267,6 +268,12 @@ struct drm_driver tegra_drm_driver = {
 	.num_ioctls = ARRAY_SIZE(tegra_drm_ioctls),
 	.fops = &tegra_drm_fops,
 
+	.prime_handle_to_fd = drm_gem_prime_handle_to_fd,
+	.prime_fd_to_handle = drm_gem_prime_fd_to_handle,
+
+	.gem_prime_export = tegra_dmabuf_export,
+	.gem_prime_import = tegra_dmabuf_import,
+
 	.name = DRIVER_NAME,
 	.desc = DRIVER_DESC,
 	.date = DRIVER_DATE,
diff --git a/drivers/gpu/drm/tegra/drm.h b/drivers/gpu/drm/tegra/drm.h
index b2f9f10..1267a38 100644
--- a/drivers/gpu/drm/tegra/drm.h
+++ b/drivers/gpu/drm/tegra/drm.h
@@ -227,4 +227,10 @@ extern struct platform_driver tegra_dsi_driver;
 extern struct platform_driver tegra_dc_driver;
 extern struct drm_driver tegra_drm_driver;
 
+/* from dmabuf.c */
+struct dma_buf *tegra_dmabuf_export(struct drm_device *drm_dev,
+				struct drm_gem_object *obj, int flags);
+struct drm_gem_object *tegra_dmabuf_import(struct drm_device *drm_dev,
+					struct dma_buf *dmabuf);
+
 #endif /* TEGRA_DRM_H */
-- 
1.7.9.5


  parent reply	other threads:[~2012-11-26 13:16 UTC|newest]

Thread overview: 145+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-11-26 13:19 [RFC v2 0/8] Support for Tegra 2D hardware Terje Bergstrom
2012-11-26 13:19 ` [RFC v2 1/8] video: tegra: Add nvhost driver Terje Bergstrom
2012-11-27 10:52   ` Sivaram Nair
2012-11-28 21:23   ` Thierry Reding
2012-11-29 10:21     ` Terje Bergström
2012-11-29 11:47       ` Thierry Reding
2012-11-29 18:38         ` Stephen Warren
2012-11-30  6:52           ` Thierry Reding
2012-11-30  8:50           ` Lucas Stach
2012-12-01 11:44             ` Terje Bergström
2012-12-01 15:10               ` Thierry Reding
2012-12-01 16:55                 ` Terje Bergström
2012-12-01 17:34                   ` Lucas Stach
2012-12-01 19:29                     ` Terje Bergström
2012-12-01 21:42                       ` Dave Airlie
2012-12-01 22:39                         ` Thierry Reding
2012-12-02 11:24                         ` Terje Bergström
2012-12-02 20:55                           ` Thierry Reding
2012-12-03  6:26                             ` Terje Bergström
2012-11-30  8:56         ` Terje Bergström
2012-11-30 10:38           ` Thierry Reding
2012-12-01 11:31             ` Terje Bergström
2012-12-01 13:42               ` Daniel Vetter
2012-12-01 16:22                 ` Terje Bergström
2012-12-01 14:58               ` Thierry Reding
2012-12-01 17:13                 ` Terje Bergström
2012-12-03 19:23                 ` Stephen Warren
2012-12-04 21:31                   ` Thierry Reding
2012-12-03 19:20             ` Stephen Warren
2012-12-03 21:03               ` Thierry Reding
2012-12-04  2:08                 ` Mark Zhang
2012-12-04  2:11                 ` Mark Zhang
2012-12-04  6:17                 ` Terje Bergström
2012-11-29 18:34       ` Stephen Warren
2012-11-30  6:54         ` Terje Bergström
2012-11-30  6:53           ` Thierry Reding
2012-11-29  9:10   ` [RFC,v2,1/8] " Mark Zhang
2012-12-10 10:28     ` Terje Bergström
2012-11-26 13:19 ` [RFC v2 2/8] video: tegra: Add syncpoint wait and interrupts Terje Bergstrom
2012-11-27 11:02   ` Sivaram Nair
2012-11-29  8:44   ` Thierry Reding
2012-11-29 10:39     ` Terje Bergström
2012-11-30  7:22       ` Thierry Reding
2012-11-30  7:41         ` Terje Bergström
2012-11-29 18:41     ` Stephen Warren
2012-11-30  7:23       ` Thierry Reding
2012-11-26 13:19 ` [RFC v2 3/8] video: tegra: host: Add channel and client support Terje Bergstrom
2012-11-29 10:01   ` [RFC,v2,3/8] " Mark Zhang
2012-11-29 10:46     ` Terje Bergström
2012-11-30  6:13       ` Mark Zhang
2012-11-29 10:04   ` [RFC v2 3/8] " Thierry Reding
2012-11-29 11:00     ` Terje Bergström
2012-11-30  7:46       ` Thierry Reding
2012-11-26 13:19 ` [RFC v2 4/8] video: tegra: Add debug support Terje Bergstrom
2012-11-26 13:19 ` [RFC v2 5/8] ARM: tegra: Add auxiliary data for nvhost Terje Bergstrom
2012-11-26 23:39   ` Stephen Warren
2012-11-27  6:33     ` Terje Bergström
2012-11-27 17:17       ` Stephen Warren
2012-11-26 13:19 ` [RFC v2 6/8] gpu: drm: tegra: Remove redundant host1x Terje Bergstrom
2012-12-05  8:33   ` Thierry Reding
2012-12-05 10:10     ` Terje Bergström
2012-12-05 11:13       ` Thierry Reding
2012-12-05 11:47         ` Terje Bergström
2012-12-05 12:02           ` Lucas Stach
2012-12-05 12:03           ` Daniel Vetter
2012-12-05 12:08             ` Daniel Vetter
2012-12-05 12:22             ` Thierry Reding
2012-12-05 12:31               ` Daniel Vetter
2012-12-05 13:28                 ` Thierry Reding
2012-12-05 16:34                   ` Daniel Vetter
2012-12-05 20:44                     ` Thierry Reding
2012-12-05 12:04           ` Thierry Reding
2012-12-05 15:43             ` Terje Bergström
2012-12-10 11:42             ` Terje Bergström
2012-12-12 16:08               ` Thierry Reding
2012-12-12 16:56                 ` Terje Bergström
2012-12-13  8:48                 ` Terje Bergström
2012-12-13  8:57                   ` Thierry Reding
2012-12-13 17:58                     ` Stephen Warren
2012-12-13 20:32                       ` Thierry Reding
2012-12-14  6:09                       ` Terje Bergström
2012-12-14 16:21                         ` Stephen Warren
2012-12-14 19:59                           ` Terje Bergström
2012-12-16 12:16                             ` Thierry Reding
2012-12-16 16:37                               ` Terje Bergström
2012-12-17 20:55                                 ` Stephen Warren
2012-12-18  6:37                                   ` Terje Bergström
2012-12-20  9:17                               ` Terje Bergström
2012-12-20 17:14                                 ` Stephen Warren
2012-12-20 17:46                                   ` Terje Bergström
2012-12-20 17:55                                     ` Stephen Warren
2012-12-20 18:01                                       ` Terje Bergström
2012-12-20 20:30                                         ` Thierry Reding
2012-12-20 21:34                                           ` Terje Bergström
2012-12-20 21:50                                             ` Thierry Reding
2012-12-20 22:29                                               ` Stephen Warren
2012-12-20 22:28                                             ` Stephen Warren
2012-12-21  6:31                                               ` Terje Bergström
2012-12-21  8:57                                   ` Arto Merilainen
2012-12-21 21:19                                     ` Stephen Warren
2013-01-02  5:41                                       ` Terje Bergström
2013-01-04 10:09                                       ` Terje Bergström
2013-01-04 20:25                                         ` Stephen Warren
2013-01-07  8:20                                           ` Terje Bergström
2013-01-07 17:07                                             ` Stephen Warren
2013-01-15 11:30                                           ` Thierry Reding
2013-01-15 11:41                                             ` Terje Bergström
2012-11-26 13:19 ` Terje Bergstrom [this message]
2012-11-26 13:19 ` [RFC v2 8/8] drm: tegra: Add gr2d device Terje Bergstrom
2012-11-26 21:59   ` Rob Clark
2012-11-26 22:15   ` Dave Airlie
2012-11-27  6:52     ` Terje Bergström
2012-11-27  7:33       ` Dave Airlie
2012-11-27  8:16         ` Terje Bergström
2012-11-27  8:32           ` Dave Airlie
2012-11-27  8:45             ` Terje Bergström
2012-11-27 10:22               ` Lucas Stach
2012-11-27 10:37                 ` Thierry Reding
2012-11-27 11:31                   ` Terje Bergström
2012-11-27 11:47                     ` Lucas Stach
2012-11-27 12:59                       ` Terje Bergström
2012-11-27 23:00                     ` Dave Airlie
2012-11-28 13:17                       ` Terje Bergström
2012-11-28 13:33                         ` Lucas Stach
2012-11-28 13:57                           ` Terje Bergström
2012-11-28 14:06                             ` Lucas Stach
2012-11-28 14:45                               ` Terje Bergström
2012-11-28 15:13                                 ` Lucas Stach
2012-11-28 16:23                                   ` Terje Bergström
2012-11-28 18:46                                     ` Lucas Stach
2012-11-29  8:17                                       ` Terje Bergström
2012-11-29  9:09                                         ` Lucas Stach
2012-11-29 12:14                                           ` Thierry Reding
2012-11-30  7:44                                             ` Terje Bergström
2012-11-30  7:53                                               ` Lucas Stach
2012-11-29 13:36                                           ` Terje Bergström
2012-11-28 16:24                                 ` Stephen Warren
2012-11-28 20:53                           ` Thomas Hellstrom
2012-12-03  9:30     ` Mark Zhang
2012-12-03  9:40       ` Daniel Vetter
2012-12-04  1:49         ` Mark Zhang
2012-11-29  7:37   ` [RFC,v2,8/8] " Mark Zhang
2012-12-01 14:45 ` [RFC v2 0/8] Support for Tegra 2D hardware Thierry Reding
2012-12-01 17:08   ` Terje Bergström
2012-12-01 19:29     ` Thierry Reding

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1353935954-13763-8-git-send-email-tbergstrom@nvidia.com \
    --to=tbergstrom@nvidia.com \
    --cc=amerilainen@nvidia.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tegra@vger.kernel.org \
    --cc=thierry.reding@avionic-design.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®