Otherwise we don't know where a etnaviv GEM buffer object should put when
we create it at userspace.
Signed-off-by: Sui Jingfeng <sui.jingfeng@xxxxxxxxx>
---
drivers/gpu/drm/etnaviv/etnaviv_drv.c | 9 +++++++++
include/uapi/drm/etnaviv_drm.h | 12 ++++++++++++
2 files changed, 21 insertions(+)
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_drv.c b/drivers/gpu/drm/etnaviv/etnaviv_drv.c
index f10661fe079f..cdc62f64b200 100644
--- a/drivers/gpu/drm/etnaviv/etnaviv_drv.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_drv.c
@@ -331,11 +331,20 @@ static int etnaviv_ioctl_gem_new(struct drm_device *dev, void *data,
struct drm_file *file)
{
struct drm_etnaviv_gem_new *args = data;
+ u32 domain;
+
+ domain = args->flags & ETNA_BO_DOMAIN_MASK;
+
+ args->flags &= ~ETNA_BO_DOMAIN_MASK;
if (args->flags & ~(ETNA_BO_CACHED | ETNA_BO_WC | ETNA_BO_UNCACHED |
ETNA_BO_FORCE_MMU))
return -EINVAL;
+ if (domain == ETNA_BO_PL_VRAM)
+ return etnaviv_gem_new_vram(dev, file, args->size,
+ args->flags, &args->handle);
+
return etnaviv_gem_new_handle(dev, file, args->size,
args->flags, &args->handle);
}
diff --git a/include/uapi/drm/etnaviv_drm.h b/include/uapi/drm/etnaviv_drm.h
index 61eaa8cd0f5e..00e778c9d312 100644
--- a/include/uapi/drm/etnaviv_drm.h
+++ b/include/uapi/drm/etnaviv_drm.h
@@ -99,6 +99,18 @@ struct drm_etnaviv_param {
/* map flags */
#define ETNA_BO_FORCE_MMU 0x00100000
+/* domain (placement) flags */
+#define ETNA_BO_DOMAIN_MASK 0x00f00000
+
+/* CPU accessible, GPU accessible pages in dedicated VRAM */
+#define ETNA_BO_PL_VRAM 0x01000000
+/* CPU accessible, GPU accessible pages in SHMEM */
+#define ETNA_BO_PL_GTT 0x02000000
+/* Userspace allocated memory, at least CPU accessible */
+#define ETNA_BO_PL_USERPTR 0x08000000
+/* GPU accessible but CPU not accessible private VRAM pages */
+#define ETNA_BO_PL_PRIV 0x04000000
+
struct drm_etnaviv_gem_new {
__u64 size; /* in */
__u32 flags; /* in, mask of ETNA_BO_x */
--
2.43.0
