Skip to content

Commit 27fb3c5

Browse files
Christian GmeinerMarge Bot
Christian Gmeiner
authored and
Marge Bot
committed
v3d: Sync v3d_drm.h with drm-misc-next
This pulls in changes based on 8a4b913df427 ("drm/log: Add integer scaling support") and brings support for the perfmon set global ioctl(..). Signed-off-by: Christian Gmeiner <[email protected]> Reviewed-by: Maíra Canal <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31751>
1 parent f456642 commit 27fb3c5

File tree

1 file changed

+19
-0
lines changed

1 file changed

+19
-0
lines changed

include/drm-uapi/v3d_drm.h

+19
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ extern "C" {
4343
#define DRM_V3D_PERFMON_GET_VALUES 0x0a
4444
#define DRM_V3D_SUBMIT_CPU 0x0b
4545
#define DRM_V3D_PERFMON_GET_COUNTER 0x0c
46+
#define DRM_V3D_PERFMON_SET_GLOBAL 0x0d
4647

4748
#define DRM_IOCTL_V3D_SUBMIT_CL DRM_IOWR(DRM_COMMAND_BASE + DRM_V3D_SUBMIT_CL, struct drm_v3d_submit_cl)
4849
#define DRM_IOCTL_V3D_WAIT_BO DRM_IOWR(DRM_COMMAND_BASE + DRM_V3D_WAIT_BO, struct drm_v3d_wait_bo)
@@ -61,6 +62,8 @@ extern "C" {
6162
#define DRM_IOCTL_V3D_SUBMIT_CPU DRM_IOW(DRM_COMMAND_BASE + DRM_V3D_SUBMIT_CPU, struct drm_v3d_submit_cpu)
6263
#define DRM_IOCTL_V3D_PERFMON_GET_COUNTER DRM_IOWR(DRM_COMMAND_BASE + DRM_V3D_PERFMON_GET_COUNTER, \
6364
struct drm_v3d_perfmon_get_counter)
65+
#define DRM_IOCTL_V3D_PERFMON_SET_GLOBAL DRM_IOW(DRM_COMMAND_BASE + DRM_V3D_PERFMON_SET_GLOBAL, \
66+
struct drm_v3d_perfmon_set_global)
6467

6568
#define DRM_V3D_SUBMIT_CL_FLUSH_CACHE 0x01
6669
#define DRM_V3D_SUBMIT_EXTENSION 0x02
@@ -290,6 +293,7 @@ enum drm_v3d_param {
290293
DRM_V3D_PARAM_SUPPORTS_MULTISYNC_EXT,
291294
DRM_V3D_PARAM_SUPPORTS_CPU_QUEUE,
292295
DRM_V3D_PARAM_MAX_PERF_COUNTERS,
296+
DRM_V3D_PARAM_SUPPORTS_SUPER_PAGES,
293297
};
294298

295299
struct drm_v3d_get_param {
@@ -765,6 +769,21 @@ struct drm_v3d_perfmon_get_counter {
765769
__u8 reserved[7];
766770
};
767771

772+
#define DRM_V3D_PERFMON_CLEAR_GLOBAL 0x0001
773+
774+
/**
775+
* struct drm_v3d_perfmon_set_global - ioctl to define a global performance
776+
* monitor
777+
*
778+
* The global performance monitor will be used for all jobs. If a global
779+
* performance monitor is defined, jobs with a self-defined performance
780+
* monitor won't be allowed.
781+
*/
782+
struct drm_v3d_perfmon_set_global {
783+
__u32 flags;
784+
__u32 id;
785+
};
786+
768787
#if defined(__cplusplus)
769788
}
770789
#endif

0 commit comments

Comments
 (0)