drm-misc-next for v5.3: UAPI Changes: - Give each dma-buf their own inode, add DMA_BUF_SET_NAME ioctl and a show_fdinfo handler. Cross-subsystem Changes: - Pull in the topic/remove-fbcon-notifiers branch: * remove fbdev notifier usage for fbcon, as prep work to clean up the fbcon locking * assorted locking checks in vt/console code * assorted notifier and cleanups in fbdev and backlight code Core Changes: - Make drm_debugfs_create_files() never fail. - add debug print to update_vblank_count. - Add DP_DPCD_QUIRK_NO_SINK_COUNT quirk. - Add todo item for drm_gem_objects. - Unexport drm_gem_(un)pin/v(un)map. - Document struct drm_cmdline_mode. - Rewrite the command handler for mode names, and add support to specify rotation, reflection and overscan. With a new selftest! :) - Fixes to drm/client for improving rotation support, and fixing variable scope. - Small fixes to self refresh helper. Driver Changes: - Add rockchip RK3328 support. - Assorted driver fixes to rockchip, vc4, rcar-du, vkms. - Expose panfrost performance counters through unstable ioctl's, hidden behind a module parameter. - Enumerate CRC sources list in vkms. - Add a basic kms driver for the Ingenic JZ47xx SoC, which will be expanded soon with more advanced features. - Suspend/resume fix for stm. Signed-off-by: Dave Airlie <airlied@redhat.com>
Showing the changes to include/uapi (3 of 82 files). Show all
Unified · Split
| @@ -18,6 +18,8 @@ extern "C" { · 17 unmodified lines | ||
| 18 | 18 | #define DRM_PANFROST_MMAP_BO 0x03 |
| 19 | 19 | #define DRM_PANFROST_GET_PARAM 0x04 |
| 20 | 20 | #define DRM_PANFROST_GET_BO_OFFSET 0x05 |
| 21 | +#define DRM_PANFROST_PERFCNT_ENABLE 0x06 | |
| 22 | +#define DRM_PANFROST_PERFCNT_DUMP 0x07 | |
| 21 | 23 | |
| 22 | 24 | #define DRM_IOCTL_PANFROST_SUBMIT DRM_IOW(DRM_COMMAND_BASE + DRM_PANFROST_SUBMIT, struct drm_panfrost_submit) |
| 23 | 25 | #define DRM_IOCTL_PANFROST_WAIT_BO DRM_IOW(DRM_COMMAND_BASE + DRM_PANFROST_WAIT_BO, struct drm_panfrost_wait_bo) |
| @@ -26,6 +28,15 @@ extern "C" { · 2 unmodified lines | ||
| 26 | 28 | #define DRM_IOCTL_PANFROST_GET_PARAM DRM_IOWR(DRM_COMMAND_BASE + DRM_PANFROST_GET_PARAM, struct drm_panfrost_get_param) |
| 27 | 29 | #define DRM_IOCTL_PANFROST_GET_BO_OFFSET DRM_IOWR(DRM_COMMAND_BASE + DRM_PANFROST_GET_BO_OFFSET, struct drm_panfrost_get_bo_offset) |
| 28 | 30 | |
| 31 | +/* | |
| 32 | + * Unstable ioctl(s): only exposed when the unsafe unstable_ioctls module | |
| 33 | + * param is set to true. | |
| 34 | + * All these ioctl(s) are subject to deprecation, so please don't rely on | |
| 35 | + * them for anything but debugging purpose. | |
| 36 | + */ | |
| 37 | +#define DRM_IOCTL_PANFROST_PERFCNT_ENABLE DRM_IOW(DRM_COMMAND_BASE + DRM_PANFROST_PERFCNT_ENABLE, struct drm_panfrost_perfcnt_enable) | |
| 38 | +#define DRM_IOCTL_PANFROST_PERFCNT_DUMP DRM_IOW(DRM_COMMAND_BASE + DRM_PANFROST_PERFCNT_DUMP, struct drm_panfrost_perfcnt_dump) | |
| 39 | + | |
| 29 | 40 | #define PANFROST_JD_REQ_FS (1 << 0) |
| 30 | 41 | /** |
| 31 | 42 | * struct drm_panfrost_submit - ioctl argument for submitting commands to the 3D |
| @@ -135,6 +146,19 @@ struct drm_panfrost_get_bo_offset { · 103 unmodified lines | ||
| 135 | 146 | __u64 offset; |
| 136 | 147 | }; |
| 137 | 148 | |
| 149 | +struct drm_panfrost_perfcnt_enable { | |
| 150 | + __u32 enable; | |
| 151 | + /* | |
| 152 | + * On bifrost we have 2 sets of counters, this parameter defines the | |
| 153 | + * one to track. | |
| 154 | + */ | |
| 155 | + __u32 counterset; | |
| 156 | +}; | |
| 157 | + | |
| 158 | +struct drm_panfrost_perfcnt_dump { | |
| 159 | + __u64 buf_ptr; | |
| 160 | +}; | |
| 161 | + | |
| 138 | 162 | #if defined(__cplusplus) |
| 139 | 163 | } |
| 140 | 164 | #endif |
| @@ -35,7 +35,10 @@ struct dma_buf_sync { · 34 unmodified lines | ||
| 35 | 35 | #define DMA_BUF_SYNC_VALID_FLAGS_MASK \ |
| 36 | 36 | (DMA_BUF_SYNC_RW | DMA_BUF_SYNC_END) |
| 37 | 37 | |
| 38 | +#define DMA_BUF_NAME_LEN 32 | |
| 39 | + | |
| 38 | 40 | #define DMA_BUF_BASE 'b' |
| 39 | 41 | #define DMA_BUF_IOCTL_SYNC _IOW(DMA_BUF_BASE, 0, struct dma_buf_sync) |
| 42 | +#define DMA_BUF_SET_NAME _IOW(DMA_BUF_BASE, 1, const char *) | |
| 40 | 43 | |
| 41 | 44 | #endif |
| @@ -91,5 +91,6 @@ · 90 unmodified lines | ||
| 91 | 91 | #define UDF_SUPER_MAGIC 0x15013346 |
| 92 | 92 | #define BALLOON_KVM_MAGIC 0x13661366 |
| 93 | 93 | #define ZSMALLOC_MAGIC 0x58295829 |
| 94 | +#define DMA_BUF_MAGIC 0x444d4142 /* "DMAB" */ | |
| 94 | 95 | |
| 95 | 96 | #endif /* __LINUX_MAGIC_H__ */ |