On Mon, Mar 29, 2021 at 12:58 AM Daniele Ceraolo Spurio daniele.ceraolospurio@intel.com wrote:
From: Bommu Krishnaiah krishnaiah.bommu@intel.com
Same old gem_create but with now with extensions support. This is needed to support various upcoming usecases. For now we use the extensions mechanism to support PAVP.
Signed-off-by: Bommu Krishnaiah krishnaiah.bommu@intel.com Signed-off-by: Matthew Auld matthew.auld@intel.com Cc: Joonas Lahtinen joonas.lahtinen@linux.intel.com Cc: Matthew Auld matthew.auld@intel.com Cc: Telukuntla Sreedhar sreedhar.telukuntla@intel.com
drivers/gpu/drm/i915/gem/i915_gem_create.c | 41 ++++++++++++++++++-
gem changes need to be cc'ed to dri-devel. Also adding Jason on this, since he just reviewed the gem_create_ext rfc from Matt. -Daniel
drivers/gpu/drm/i915/i915_drv.c | 2 +- include/uapi/drm/i915_drm.h | 47 ++++++++++++++++++++++ 3 files changed, 88 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_create.c b/drivers/gpu/drm/i915/gem/i915_gem_create.c index 45d60e3d98e3..3ad3413c459f 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_create.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_create.c @@ -7,6 +7,7 @@ #include "gem/i915_gem_region.h"
#include "i915_drv.h" +#include "i915_user_extensions.h"
static int i915_gem_create(struct drm_file *file, @@ -91,6 +92,35 @@ i915_gem_dumb_create(struct drm_file *file, &args->size, &args->handle); }
+struct create_ext {
struct drm_i915_private *i915;+};
+static int __create_setparam(struct drm_i915_gem_object_param *args,
struct create_ext *ext_data)+{
if (!(args->param & I915_OBJECT_PARAM)) {DRM_DEBUG("Missing I915_OBJECT_PARAM namespace\n");return -EINVAL;}return -EINVAL;+}
+static int create_setparam(struct i915_user_extension __user *base, void *data) +{
struct drm_i915_gem_create_ext_setparam ext;if (copy_from_user(&ext, base, sizeof(ext)))return -EFAULT;return __create_setparam(&ext.param, data);+}
+static const i915_user_extension_fn create_extensions[] = {
[I915_GEM_CREATE_EXT_SETPARAM] = create_setparam,+};
/**
- Creates a new mm object and returns a handle to it.
- @dev: drm device pointer
@@ -102,10 +132,19 @@ i915_gem_create_ioctl(struct drm_device *dev, void *data, struct drm_file *file) { struct drm_i915_private *i915 = to_i915(dev);
struct drm_i915_gem_create *args = data;
struct create_ext ext_data = { .i915 = i915 };struct drm_i915_gem_create_ext *args = data;int ret; i915_gem_flush_free_objects(i915);ret = i915_user_extensions(u64_to_user_ptr(args->extensions),create_extensions,ARRAY_SIZE(create_extensions),&ext_data);if (ret)return ret;return i915_gem_create(file, intel_memory_region_by_type(i915, INTEL_MEMORY_SYSTEM),diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 02d5b2b6ee39..f13e1ca2087b 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -1707,7 +1707,7 @@ static const struct drm_ioctl_desc i915_ioctls[] = { DRM_IOCTL_DEF_DRV(I915_GEM_THROTTLE, i915_gem_throttle_ioctl, DRM_RENDER_ALLOW), DRM_IOCTL_DEF_DRV(I915_GEM_ENTERVT, drm_noop, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY), DRM_IOCTL_DEF_DRV(I915_GEM_LEAVEVT, drm_noop, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
DRM_IOCTL_DEF_DRV(I915_GEM_CREATE, i915_gem_create_ioctl, DRM_RENDER_ALLOW),
DRM_IOCTL_DEF_DRV(I915_GEM_CREATE_EXT, i915_gem_create_ioctl, DRM_RENDER_ALLOW), DRM_IOCTL_DEF_DRV(I915_GEM_PREAD, i915_gem_pread_ioctl, DRM_RENDER_ALLOW), DRM_IOCTL_DEF_DRV(I915_GEM_PWRITE, i915_gem_pwrite_ioctl, DRM_RENDER_ALLOW), DRM_IOCTL_DEF_DRV(I915_GEM_MMAP, i915_gem_mmap_ioctl, DRM_RENDER_ALLOW),diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h index 7a2088eccc9f..d5e502269a55 100644 --- a/include/uapi/drm/i915_drm.h +++ b/include/uapi/drm/i915_drm.h @@ -392,6 +392,7 @@ typedef struct _drm_i915_sarea { #define DRM_IOCTL_I915_GEM_ENTERVT DRM_IO(DRM_COMMAND_BASE + DRM_I915_GEM_ENTERVT) #define DRM_IOCTL_I915_GEM_LEAVEVT DRM_IO(DRM_COMMAND_BASE + DRM_I915_GEM_LEAVEVT) #define DRM_IOCTL_I915_GEM_CREATE DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_CREATE, struct drm_i915_gem_create) +#define DRM_IOCTL_I915_GEM_CREATE_EXT DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_CREATE, struct drm_i915_gem_create_ext) #define DRM_IOCTL_I915_GEM_PREAD DRM_IOW (DRM_COMMAND_BASE + DRM_I915_GEM_PREAD, struct drm_i915_gem_pread) #define DRM_IOCTL_I915_GEM_PWRITE DRM_IOW (DRM_COMMAND_BASE + DRM_I915_GEM_PWRITE, struct drm_i915_gem_pwrite) #define DRM_IOCTL_I915_GEM_MMAP DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_MMAP, struct drm_i915_gem_mmap) @@ -729,6 +730,27 @@ struct drm_i915_gem_create { __u32 pad; };
+struct drm_i915_gem_create_ext {
/*** Requested size for the object.** The (page-aligned) allocated size for the object will be returned.*/__u64 size;/*** Returned handle for the object.** Object handles are nonzero.*/__u32 handle;__u32 pad;+#define I915_GEM_CREATE_EXT_SETPARAM (1u << 0) +#define I915_GEM_CREATE_EXT_FLAGS_UNKNOWN \
(-(I915_GEM_CREATE_EXT_SETPARAM << 1))__u64 extensions;+};
struct drm_i915_gem_pread { /** Handle for the object being read. */ __u32 handle; @@ -1720,6 +1742,31 @@ struct drm_i915_gem_context_param { __u64 value; };
+struct drm_i915_gem_object_param {
/* Object handle (0 for I915_GEM_CREATE_EXT_SETPARAM) */__u32 handle;/* Data pointer size */__u32 size;+/*
- I915_OBJECT_PARAM:
- Select object namespace for the param.
- */
+#define I915_OBJECT_PARAM (1ull << 32)
__u64 param;/* Data value or pointer */__u64 data;+};
+struct drm_i915_gem_create_ext_setparam {
struct i915_user_extension base;struct drm_i915_gem_object_param param;+};
/**
- Context SSEU programming
-- 2.29.2
Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
dri-devel@lists.freedesktop.org
-
Daniel Vetter