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 <cgmeiner@igalia.com> Reviewed-by: Maíra Canal <mcanal@igalia.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31751>
This commit is contained in:

committed by
Marge Bot

parent
f456642501
commit
27fb3c549a
@@ -43,6 +43,7 @@ extern "C" {
|
|||||||
#define DRM_V3D_PERFMON_GET_VALUES 0x0a
|
#define DRM_V3D_PERFMON_GET_VALUES 0x0a
|
||||||
#define DRM_V3D_SUBMIT_CPU 0x0b
|
#define DRM_V3D_SUBMIT_CPU 0x0b
|
||||||
#define DRM_V3D_PERFMON_GET_COUNTER 0x0c
|
#define DRM_V3D_PERFMON_GET_COUNTER 0x0c
|
||||||
|
#define DRM_V3D_PERFMON_SET_GLOBAL 0x0d
|
||||||
|
|
||||||
#define DRM_IOCTL_V3D_SUBMIT_CL DRM_IOWR(DRM_COMMAND_BASE + DRM_V3D_SUBMIT_CL, struct drm_v3d_submit_cl)
|
#define DRM_IOCTL_V3D_SUBMIT_CL DRM_IOWR(DRM_COMMAND_BASE + DRM_V3D_SUBMIT_CL, struct drm_v3d_submit_cl)
|
||||||
#define DRM_IOCTL_V3D_WAIT_BO DRM_IOWR(DRM_COMMAND_BASE + DRM_V3D_WAIT_BO, struct drm_v3d_wait_bo)
|
#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" {
|
|||||||
#define DRM_IOCTL_V3D_SUBMIT_CPU DRM_IOW(DRM_COMMAND_BASE + DRM_V3D_SUBMIT_CPU, struct drm_v3d_submit_cpu)
|
#define DRM_IOCTL_V3D_SUBMIT_CPU DRM_IOW(DRM_COMMAND_BASE + DRM_V3D_SUBMIT_CPU, struct drm_v3d_submit_cpu)
|
||||||
#define DRM_IOCTL_V3D_PERFMON_GET_COUNTER DRM_IOWR(DRM_COMMAND_BASE + DRM_V3D_PERFMON_GET_COUNTER, \
|
#define DRM_IOCTL_V3D_PERFMON_GET_COUNTER DRM_IOWR(DRM_COMMAND_BASE + DRM_V3D_PERFMON_GET_COUNTER, \
|
||||||
struct drm_v3d_perfmon_get_counter)
|
struct drm_v3d_perfmon_get_counter)
|
||||||
|
#define DRM_IOCTL_V3D_PERFMON_SET_GLOBAL DRM_IOW(DRM_COMMAND_BASE + DRM_V3D_PERFMON_SET_GLOBAL, \
|
||||||
|
struct drm_v3d_perfmon_set_global)
|
||||||
|
|
||||||
#define DRM_V3D_SUBMIT_CL_FLUSH_CACHE 0x01
|
#define DRM_V3D_SUBMIT_CL_FLUSH_CACHE 0x01
|
||||||
#define DRM_V3D_SUBMIT_EXTENSION 0x02
|
#define DRM_V3D_SUBMIT_EXTENSION 0x02
|
||||||
@@ -290,6 +293,7 @@ enum drm_v3d_param {
|
|||||||
DRM_V3D_PARAM_SUPPORTS_MULTISYNC_EXT,
|
DRM_V3D_PARAM_SUPPORTS_MULTISYNC_EXT,
|
||||||
DRM_V3D_PARAM_SUPPORTS_CPU_QUEUE,
|
DRM_V3D_PARAM_SUPPORTS_CPU_QUEUE,
|
||||||
DRM_V3D_PARAM_MAX_PERF_COUNTERS,
|
DRM_V3D_PARAM_MAX_PERF_COUNTERS,
|
||||||
|
DRM_V3D_PARAM_SUPPORTS_SUPER_PAGES,
|
||||||
};
|
};
|
||||||
|
|
||||||
struct drm_v3d_get_param {
|
struct drm_v3d_get_param {
|
||||||
@@ -765,6 +769,21 @@ struct drm_v3d_perfmon_get_counter {
|
|||||||
__u8 reserved[7];
|
__u8 reserved[7];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#define DRM_V3D_PERFMON_CLEAR_GLOBAL 0x0001
|
||||||
|
|
||||||
|
/**
|
||||||
|
* struct drm_v3d_perfmon_set_global - ioctl to define a global performance
|
||||||
|
* monitor
|
||||||
|
*
|
||||||
|
* The global performance monitor will be used for all jobs. If a global
|
||||||
|
* performance monitor is defined, jobs with a self-defined performance
|
||||||
|
* monitor won't be allowed.
|
||||||
|
*/
|
||||||
|
struct drm_v3d_perfmon_set_global {
|
||||||
|
__u32 flags;
|
||||||
|
__u32 id;
|
||||||
|
};
|
||||||
|
|
||||||
#if defined(__cplusplus)
|
#if defined(__cplusplus)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
Reference in New Issue
Block a user