Commit f8950b47 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

tools headers UAPI: Update tools's copy of drm.h to pick DRM_IOCTL_GEM_CHANGE_HANDLE 



Picking the changes from:

  08641973 ("drm: Move drm_gem ioctl kerneldoc to uapi file")
  53096728 ("drm: Add DRM prime interface to reassign GEM handle")

Addressing these perf build warnings:

  Warning: Kernel ABI header differences:

Now 'perf trace' and other code that might use the tools/perf/trace/beauty
autogenerated tables will be able to translate this new ioctl command into
a string:

  $ tools/perf/trace/beauty/drm_ioctl.sh > before
  $ cp include/uapi/drm/drm.h tools/include/uapi/drm/drm.h
  $ tools/perf/trace/beauty/drm_ioctl.sh > after
  $ diff -u before after
  --- before	2025-11-03 09:57:34.832553174 -0300
  +++ after	2025-11-03 09:57:47.969409428 -0300
  @@ -111,6 +111,7 @@
   	[0xCF] = "SYNCOBJ_EVENTFD",
   	[0xD0] = "MODE_CLOSEFB",
   	[0xD1] = "SET_CLIENT_NAME",
  +	[0xD2] = "GEM_CHANGE_HANDLE",
   	[DRM_COMMAND_BASE + 0x00] = "I915_INIT",
   	[DRM_COMMAND_BASE + 0x01] = "I915_FLUSH",
   	[DRM_COMMAND_BASE + 0x02] = "I915_FLIP",
  $

Please see tools/include/uapi/README for further details.

Cc: Christian König <christian.koenig@amd.com>
Cc: David Francis <David.Francis@amd.com>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent ccaba800

tools/include/uapi/drm/drm.h

+51 −12
Original line number Diff line number Diff line
@@ -597,34 +597,65 @@ struct drm_set_version { 
	int drm_dd_minor;

};



/* DRM_IOCTL_GEM_CLOSE ioctl argument type */

/**

 * struct drm_gem_close - Argument for &DRM_IOCTL_GEM_CLOSE ioctl.

 * @handle: Handle of the object to be closed.

 * @pad: Padding.

 *

 * Releases the handle to an mm object.

 */

struct drm_gem_close {

	/** Handle of the object to be closed. */

	__u32 handle;

	__u32 pad;

};



/* DRM_IOCTL_GEM_FLINK ioctl argument type */

/**

 * struct drm_gem_flink - Argument for &DRM_IOCTL_GEM_FLINK ioctl.

 * @handle: Handle for the object being named.

 * @name: Returned global name.

 *

 * Create a global name for an object, returning the name.

 *

 * Note that the name does not hold a reference; when the object

 * is freed, the name goes away.

 */

struct drm_gem_flink {

	/** Handle for the object being named */

	__u32 handle;



	/** Returned global name */

	__u32 name;

};



/* DRM_IOCTL_GEM_OPEN ioctl argument type */

/**

 * struct drm_gem_open - Argument for &DRM_IOCTL_GEM_OPEN ioctl.

 * @name: Name of object being opened.

 * @handle: Returned handle for the object.

 * @size: Returned size of the object

 *

 * Open an object using the global name, returning a handle and the size.

 *

 * This handle (of course) holds a reference to the object, so the object

 * will not go away until the handle is deleted.

 */

struct drm_gem_open {

	/** Name of object being opened */

	__u32 name;



	/** Returned handle for the object */

	__u32 handle;



	/** Returned size of the object */

	__u64 size;

};



/**

 * struct drm_gem_change_handle - Argument for &DRM_IOCTL_GEM_CHANGE_HANDLE ioctl.

 * @handle: The handle of a gem object.

 * @new_handle: An available gem handle.

 *

 * This ioctl changes the handle of a GEM object to the specified one.

 * The new handle must be unused. On success the old handle is closed

 * and all further IOCTL should refer to the new handle only.

 * Calls to DRM_IOCTL_PRIME_FD_TO_HANDLE will return the new handle.

 */

struct drm_gem_change_handle {

	__u32 handle;

	__u32 new_handle;

};



/**

 * DRM_CAP_DUMB_BUFFER

 *
@@ -1309,6 +1340,14 @@ extern "C" { 
 */

#define DRM_IOCTL_SET_CLIENT_NAME	DRM_IOWR(0xD1, struct drm_set_client_name)



/**

 * DRM_IOCTL_GEM_CHANGE_HANDLE - Move an object to a different handle

 *

 * Some applications (notably CRIU) need objects to have specific gem handles.

 * This ioctl changes the object at one gem handle to use a new gem handle.

 */

#define DRM_IOCTL_GEM_CHANGE_HANDLE    DRM_IOWR(0xD2, struct drm_gem_change_handle)



/*

 * Device specific ioctls should only be in their respective headers

 * The device specific ioctl range is from 0x40 to 0x9f.