Re: [PATCH i-g-t] drm-uapi: sync with drm-next f112b68f273f

["Dixit, Ashutosh" <ashutosh.dixit@intel.com>]

On Tue, 27 Feb 2024 06:32:19 -0800, Kamil Konieczny wrote:
>
> Hi Ashutosh,
> On 2024-02-26 at 21:27:40 -0800, Ashutosh Dixit wrote:
> > Sync with drm-next commit 'f112b68f273f ("Merge v6.8-rc6 into drm-next")'.
> >
> > Signed-off-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
> > ---
> >  include/drm-uapi/i915_drm.h    | 24 +++++++++---
> >  include/drm-uapi/nouveau_drm.h | 70 ++++++++++++++++++++--------------
> >  include/drm-uapi/xe_drm.h      | 51 +++++++++++++++++++++++++
>
> It seems that later on there are more changes to xe_drm.h header?
> I am not sure if you want to keep this xe_drm.h from f112b6?

Possibly, but afaik we need to sync headers from drm-next and this is the
latest drm-next. Other headers go into *_local.h etc. So I think this is
fine for now.

> If yes,
>
> Reviewed-by: Kamil Konieczny <kamil.konieczny@linux.intel.com>

Thanks, I'll take a look and likely merge this today.

>
> Regards,
> Kamil
>
> >  3 files changed, 110 insertions(+), 35 deletions(-)
> >
> > diff --git a/include/drm-uapi/i915_drm.h b/include/drm-uapi/i915_drm.h
> > index ce9fa2812e..fe3cf9bca5 100644
> > --- a/include/drm-uapi/i915_drm.h
> > +++ b/include/drm-uapi/i915_drm.h
> > @@ -693,7 +693,7 @@ typedef struct drm_i915_irq_wait {
> >  #define I915_PARAM_HAS_EXEC_FENCE	 44
> >
> >  /* Query whether DRM_I915_GEM_EXECBUFFER2 supports the ability to capture
> > - * user specified bufffers for post-mortem debugging of GPU hangs. See
> > + * user-specified buffers for post-mortem debugging of GPU hangs. See
> >   * EXEC_OBJECT_CAPTURE.
> >   */
> >  #define I915_PARAM_HAS_EXEC_CAPTURE	 45
> > @@ -1606,7 +1606,7 @@ struct drm_i915_gem_busy {
> >	 * is accurate.
> >	 *
> >	 * The returned dword is split into two fields to indicate both
> > -	 * the engine classess on which the object is being read, and the
> > +	 * the engine classes on which the object is being read, and the
> >	 * engine class on which it is currently being written (if any).
> >	 *
> >	 * The low word (bits 0:15) indicate if the object is being written
> > @@ -1815,7 +1815,7 @@ struct drm_i915_gem_madvise {
> >	__u32 handle;
> >
> >	/* Advice: either the buffer will be needed again in the near future,
> > -	 *         or wont be and could be discarded under memory pressure.
> > +	 *         or won't be and could be discarded under memory pressure.
> >	 */
> >	__u32 madv;
> >
> > @@ -3013,6 +3013,7 @@ struct drm_i915_query_item {
> >	 *  - %DRM_I915_QUERY_MEMORY_REGIONS (see struct drm_i915_query_memory_regions)
> >	 *  - %DRM_I915_QUERY_HWCONFIG_BLOB (see `GuC HWCONFIG blob uAPI`)
> >	 *  - %DRM_I915_QUERY_GEOMETRY_SUBSLICES (see struct drm_i915_query_topology_info)
> > +	 *  - %DRM_I915_QUERY_GUC_SUBMISSION_VERSION (see struct drm_i915_query_guc_submission_version)
> >	 */
> >	__u64 query_id;
> >  #define DRM_I915_QUERY_TOPOLOGY_INFO		1
> > @@ -3021,6 +3022,7 @@ struct drm_i915_query_item {
> >  #define DRM_I915_QUERY_MEMORY_REGIONS		4
> >  #define DRM_I915_QUERY_HWCONFIG_BLOB		5
> >  #define DRM_I915_QUERY_GEOMETRY_SUBSLICES	6
> > +#define DRM_I915_QUERY_GUC_SUBMISSION_VERSION	7
> >  /* Must be kept compact -- no holes and well documented */
> >
> >	/**
> > @@ -3246,7 +3248,7 @@ struct drm_i915_query_topology_info {
> >   *		// enough to hold our array of engines. The kernel will fill out the
> >   *		// item.length for us, which is the number of bytes we need.
> >   *		//
> > - *		// Alternatively a large buffer can be allocated straight away enabling
> > + *	// Alternatively a large buffer can be allocated straightaway enabling
> >   *		// querying in one pass, in which case item.length should contain the
> >   *		// length of the provided buffer.
> >   *		err = ioctl(fd, DRM_IOCTL_I915_QUERY, &query);
> > @@ -3256,7 +3258,7 @@ struct drm_i915_query_topology_info {
> >   *		// Now that we allocated the required number of bytes, we call the ioctl
> >   *		// again, this time with the data_ptr pointing to our newly allocated
> >   *		// blob, which the kernel can then populate with info on all engines.
> > - *		item.data_ptr = (uintptr_t)&info,
> > + *	item.data_ptr = (uintptr_t)&info;
> >   *
> >   *		err = ioctl(fd, DRM_IOCTL_I915_QUERY, &query);
> >   *		if (err) ...
> > @@ -3286,7 +3288,7 @@ struct drm_i915_query_topology_info {
> >  /**
> >   * struct drm_i915_engine_info
> >   *
> > - * Describes one engine and it's capabilities as known to the driver.
> > + * Describes one engine and its capabilities as known to the driver.
> >   */
> >  struct drm_i915_engine_info {
> >	/** @engine: Engine class and instance. */
> > @@ -3566,6 +3568,16 @@ struct drm_i915_query_memory_regions {
> >	struct drm_i915_memory_region_info regions[];
> >  };
> >
> > +/**
> > + * struct drm_i915_query_guc_submission_version - query GuC submission interface version
> > + */
> > +struct drm_i915_query_guc_submission_version {
> > +	__u32 branch;
> > +	__u32 major;
> > +	__u32 minor;
> > +	__u32 patch;
> > +};
> > +
> >  /**
> >   * DOC: GuC HWCONFIG blob uAPI
> >   *
> > diff --git a/include/drm-uapi/nouveau_drm.h b/include/drm-uapi/nouveau_drm.h
> > index 0bade1592f..cd84227f1b 100644
> > --- a/include/drm-uapi/nouveau_drm.h
> > +++ b/include/drm-uapi/nouveau_drm.h
> > @@ -54,6 +54,20 @@ extern "C" {
> >   */
> >  #define NOUVEAU_GETPARAM_EXEC_PUSH_MAX   17
> >
> > +/*
> > + * NOUVEAU_GETPARAM_VRAM_BAR_SIZE - query bar size
> > + *
> > + * Query the VRAM BAR size.
> > + */
> > +#define NOUVEAU_GETPARAM_VRAM_BAR_SIZE 18
> > +
> > +/*
> > + * NOUVEAU_GETPARAM_VRAM_USED
> > + *
> > + * Get remaining VRAM size.
> > + */
> > +#define NOUVEAU_GETPARAM_VRAM_USED 19
> > +
> >  struct drm_nouveau_getparam {
> >	__u64 param;
> >	__u64 value;
> > @@ -238,34 +252,32 @@ struct drm_nouveau_vm_init {
> >  struct drm_nouveau_vm_bind_op {
> >	/**
> >	 * @op: the operation type
> > +	 *
> > +	 * Supported values:
> > +	 *
> > +	 * %DRM_NOUVEAU_VM_BIND_OP_MAP - Map a GEM object to the GPU's VA
> > +	 * space. Optionally, the &DRM_NOUVEAU_VM_BIND_SPARSE flag can be
> > +	 * passed to instruct the kernel to create sparse mappings for the
> > +	 * given range.
> > +	 *
> > +	 * %DRM_NOUVEAU_VM_BIND_OP_UNMAP - Unmap an existing mapping in the
> > +	 * GPU's VA space. If the region the mapping is located in is a
> > +	 * sparse region, new sparse mappings are created where the unmapped
> > +	 * (memory backed) mapping was mapped previously. To remove a sparse
> > +	 * region the &DRM_NOUVEAU_VM_BIND_SPARSE must be set.
> >	 */
> >	__u32 op;
> > -/**
> > - * @DRM_NOUVEAU_VM_BIND_OP_MAP:
> > - *
> > - * Map a GEM object to the GPU's VA space. Optionally, the
> > - * &DRM_NOUVEAU_VM_BIND_SPARSE flag can be passed to instruct the kernel to
> > - * create sparse mappings for the given range.
> > - */
> >  #define DRM_NOUVEAU_VM_BIND_OP_MAP 0x0
> > -/**
> > - * @DRM_NOUVEAU_VM_BIND_OP_UNMAP:
> > - *
> > - * Unmap an existing mapping in the GPU's VA space. If the region the mapping
> > - * is located in is a sparse region, new sparse mappings are created where the
> > - * unmapped (memory backed) mapping was mapped previously. To remove a sparse
> > - * region the &DRM_NOUVEAU_VM_BIND_SPARSE must be set.
> > - */
> >  #define DRM_NOUVEAU_VM_BIND_OP_UNMAP 0x1
> >	/**
> >	 * @flags: the flags for a &drm_nouveau_vm_bind_op
> > +	 *
> > +	 * Supported values:
> > +	 *
> > +	 * %DRM_NOUVEAU_VM_BIND_SPARSE - Indicates that an allocated VA
> > +	 * space region should be sparse.
> >	 */
> >	__u32 flags;
> > -/**
> > - * @DRM_NOUVEAU_VM_BIND_SPARSE:
> > - *
> > - * Indicates that an allocated VA space region should be sparse.
> > - */
> >  #define DRM_NOUVEAU_VM_BIND_SPARSE (1 << 8)
> >	/**
> >	 * @handle: the handle of the DRM GEM object to map
> > @@ -301,17 +313,17 @@ struct drm_nouveau_vm_bind {
> >	__u32 op_count;
> >	/**
> >	 * @flags: the flags for a &drm_nouveau_vm_bind ioctl
> > +	 *
> > +	 * Supported values:
> > +	 *
> > +	 * %DRM_NOUVEAU_VM_BIND_RUN_ASYNC - Indicates that the given VM_BIND
> > +	 * operation should be executed asynchronously by the kernel.
> > +	 *
> > +	 * If this flag is not supplied the kernel executes the associated
> > +	 * operations synchronously and doesn't accept any &drm_nouveau_sync
> > +	 * objects.
> >	 */
> >	__u32 flags;
> > -/**
> > - * @DRM_NOUVEAU_VM_BIND_RUN_ASYNC:
> > - *
> > - * Indicates that the given VM_BIND operation should be executed asynchronously
> > - * by the kernel.
> > - *
> > - * If this flag is not supplied the kernel executes the associated operations
> > - * synchronously and doesn't accept any &drm_nouveau_sync objects.
> > - */
> >  #define DRM_NOUVEAU_VM_BIND_RUN_ASYNC 0x1
> >	/**
> >	 * @wait_count: the number of wait &drm_nouveau_syncs
> > diff --git a/include/drm-uapi/xe_drm.h b/include/drm-uapi/xe_drm.h
> > index 2417a9654d..0d2ff6efd1 100644
> > --- a/include/drm-uapi/xe_drm.h
> > +++ b/include/drm-uapi/xe_drm.h
> > @@ -574,6 +574,36 @@ struct drm_xe_query_engine_cycles {
> >	__u64 cpu_delta;
> >  };
> >
> > +/**
> > + * struct drm_xe_query_uc_fw_version - query a micro-controller firmware version
> > + *
> > + * Given a uc_type this will return the branch, major, minor and patch version
> > + * of the micro-controller firmware.
> > + */
> > +struct drm_xe_query_uc_fw_version {
> > +	/** @uc_type: The micro-controller type to query firmware version */
> > +#define XE_QUERY_UC_TYPE_GUC_SUBMISSION 0
> > +	__u16 uc_type;
> > +
> > +	/** @pad: MBZ */
> > +	__u16 pad;
> > +
> > +	/** @branch_ver: branch uc fw version */
> > +	__u32 branch_ver;
> > +	/** @major_ver: major uc fw version */
> > +	__u32 major_ver;
> > +	/** @minor_ver: minor uc fw version */
> > +	__u32 minor_ver;
> > +	/** @patch_ver: patch uc fw version */
> > +	__u32 patch_ver;
> > +
> > +	/** @pad2: MBZ */
> > +	__u32 pad2;
> > +
> > +	/** @reserved: Reserved */
> > +	__u64 reserved;
> > +};
> > +
> >  /**
> >   * struct drm_xe_device_query - Input of &DRM_IOCTL_XE_DEVICE_QUERY - main
> >   * structure to query device information
> > @@ -643,6 +673,7 @@ struct drm_xe_device_query {
> >  #define DRM_XE_DEVICE_QUERY_HWCONFIG		4
> >  #define DRM_XE_DEVICE_QUERY_GT_TOPOLOGY		5
> >  #define DRM_XE_DEVICE_QUERY_ENGINE_CYCLES	6
> > +#define DRM_XE_DEVICE_QUERY_UC_FW_VERSION	7
> >	/** @query: The type of data to query */
> >	__u32 query;
> >
> > @@ -831,6 +862,10 @@ struct drm_xe_vm_destroy {
> >   *  - %DRM_XE_VM_BIND_OP_PREFETCH
> >   *
> >   * and the @flags can be:
> > + *  - %DRM_XE_VM_BIND_FLAG_READONLY
> > + *  - %DRM_XE_VM_BIND_FLAG_IMMEDIATE - Valid on a faulting VM only, do the
> > + *    MAP operation immediately rather than deferring the MAP to the page
> > + *    fault handler.
> >   *  - %DRM_XE_VM_BIND_FLAG_NULL - When the NULL flag is set, the page
> >   *    tables are setup with a special bit which indicates writes are
> >   *    dropped and all reads return zero. In the future, the NULL flags
> > @@ -923,7 +958,10 @@ struct drm_xe_vm_bind_op {
> >	/** @op: Bind operation to perform */
> >	__u32 op;
> >
> > +#define DRM_XE_VM_BIND_FLAG_READONLY	(1 << 0)
> > +#define DRM_XE_VM_BIND_FLAG_IMMEDIATE	(1 << 1)
> >  #define DRM_XE_VM_BIND_FLAG_NULL	(1 << 2)
> > +#define DRM_XE_VM_BIND_FLAG_DUMPABLE	(1 << 3)
> >	/** @flags: Bind flags */
> >	__u32 flags;
> >
> > @@ -1038,6 +1076,19 @@ struct drm_xe_exec_queue_create {
> >  #define DRM_XE_EXEC_QUEUE_EXTENSION_SET_PROPERTY		0
> >  #define   DRM_XE_EXEC_QUEUE_SET_PROPERTY_PRIORITY		0
> >  #define   DRM_XE_EXEC_QUEUE_SET_PROPERTY_TIMESLICE		1
> > +#define   DRM_XE_EXEC_QUEUE_SET_PROPERTY_PREEMPTION_TIMEOUT	2
> > +#define   DRM_XE_EXEC_QUEUE_SET_PROPERTY_JOB_TIMEOUT		4
> > +#define   DRM_XE_EXEC_QUEUE_SET_PROPERTY_ACC_TRIGGER		5
> > +#define   DRM_XE_EXEC_QUEUE_SET_PROPERTY_ACC_NOTIFY		6
> > +#define   DRM_XE_EXEC_QUEUE_SET_PROPERTY_ACC_GRANULARITY	7
> > +/* Monitor 128KB contiguous region with 4K sub-granularity */
> > +#define     DRM_XE_ACC_GRANULARITY_128K				0
> > +/* Monitor 2MB contiguous region with 64KB sub-granularity */
> > +#define     DRM_XE_ACC_GRANULARITY_2M				1
> > +/* Monitor 16MB contiguous region with 512KB sub-granularity */
> > +#define     DRM_XE_ACC_GRANULARITY_16M				2
> > +/* Monitor 64MB contiguous region with 2M sub-granularity */
> > +#define     DRM_XE_ACC_GRANULARITY_64M				3
> >
> >	/** @extensions: Pointer to the first extension struct, if any */
> >	__u64 extensions;
> > --
> > 2.41.0
> >