msm: add msm drm uapi header
Subsystems (2)
PATCH 1/1 msm: add msm drm uapi header
file derived from msm-next kernel uapi header.
Change-Id: Idcaa1ad6fc13e0c1d2d0a2e619121d2c5450f7da
--- Makefile.sources | 1 + include/drm/msm_drm.h | 308 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 309 insertions(+) create mode 100644 include/drm/msm_drm.h
Makefile.sources +1 -0
@@ -25,6 +25,7 @@ LIBDRM_INCLUDE_H_FILES := \ include/drm/i915_drm.h \ include/drm/mach64_drm.h \ include/drm/mga_drm.h \ + include/drm/msm_drm.h \ include/drm/nouveau_drm.h \ include/drm/qxl_drm.h \ include/drm/r128_drm.h \
include/drm/msm_drm.h new file +308 -0
308 lines not on this page · raw message
Signature · 7 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 377 lines · Tanmay Shah
file derived from msm-next kernel uapi header.
Change-Id: Idcaa1ad6fc13e0c1d2d0a2e619121d2c5450f7da
--- Makefile.sources | 1 + include/drm/msm_drm.h | 308 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 309 insertions(+) create mode 100644 include/drm/msm_drm.hMakefile.sources +1
-0@@ -25,6 +25,7 @@ LIBDRM_INCLUDE_H_FILES := \ include/drm/i915_drm.h \ include/drm/mach64_drm.h \ include/drm/mga_drm.h \ + include/drm/msm_drm.h \ include/drm/nouveau_drm.h \ include/drm/qxl_drm.h \ include/drm/r128_drm.h \include/drm/msm_drm.h new file +5
-0@@ -0,0 +1,308 @@ +/* +* Copyright (C) 2013 Red Hat +* Author: Rob Clark <[email protected]> +* +* Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */include/drm/msm_drm.h new file +30
-0+ +#ifndef __MSM_DRM_H__ +#define __MSM_DRM_H__ + +#include "drm.h" + +#if defined(__cplusplus) +extern "C" { +#endif + +/* Please note that modifications to all structs defined here are + * subject to backwards-compatibility constraints: + * 1) Do not use pointers, use __u64 instead for 32 bit / 64 bit + * user/kernel compatibility + * 2) Keep fields aligned to their size + * 3) Because of how drm_ioctl() works, we can add new fields at + * the end of an ioctl if some care is taken: drm_ioctl() will + * zero out the new fields at the tail of the ioctl, so a zero + * value should have a backwards compatible meaning. And for + * output params, userspace won't see the newly added output + * fields.. so that has to be somehow ok. + */ + +#define MSM_PIPE_NONE 0x00 +#define MSM_PIPE_2D0 0x01 +#define MSM_PIPE_2D1 0x02 +#define MSM_PIPE_3D0 0x10 + +/* The pipe-id just uses the lower bits, so can be OR'd with flags in + * the upper 16 bits (which could be extended further, if needed,maybe
+ * we extend/overload the pipe-id some day to deal with multiple rings,
+ * but even then I don't think we need the full lower 16 bits).
+ */include/drm/msm_drm.h new file +5
-0+#define MSM_PIPE_ID_MASK 0xffff +#define MSM_PIPE_ID (x) ((x) & MSM_PIPE_ID_MASK) +#define MSM_PIPE_FLAGS (x) ((x) & ~MSM_PIPE_ID_MASK) + +/* timeouts are specified in clock-monotonic absolute times (to simplify
+ * restarting interrupted ioctls). The following struct is logically the
+ * same as 'struct timespec' but 32/64b ABI safe.
+ */include/drm/msm_drm.h new file +58
-0+struct drm_msm_timespec { +__s64 tv_sec;/* seconds */ +__s64 tv_nsec;/* nanoseconds */ +}; + +#define MSM_PARAM_GPU_ID 0x01 +#define MSM_PARAM_GMEM_SIZE 0x02 +#define MSM_PARAM_CHIP_ID 0x03 +#define MSM_PARAM_MAX_FREQ 0x04 +#define MSM_PARAM_TIMESTAMP 0x05 +#define MSM_PARAM_GMEM_BASE 0x06 +#define MSM_PARAM_NR_RINGS 0x07 + +struct drm_msm_param { +__u32 pipe;/* in, MSM_PIPE_x */ +__u32 param;/* in, MSM_PARAM_x */ +__u64 value;/* out (get_param) or in (set_param) */ +}; + +/* +* GEM buffers: +*/ + +#define MSM_BO_SCANOUT 0x00000001/* scanout capable */ +#define MSM_BO_GPU_READONLY 0x00000002 +#define MSM_BO_CACHE_MASK 0x000f0000 +/* cache modes */ +#define MSM_BO_CACHED 0x00010000 +#define MSM_BO_WC 0x00020000 +#define MSM_BO_UNCACHED 0x00040000 + +#define MSM_BO_FLAGS (MSM_BO_SCANOUT | \ + MSM_BO_GPU_READONLY | \ + MSM_BO_CACHED | \ + MSM_BO_WC | \ + MSM_BO_UNCACHED) + +struct drm_msm_gem_new { +__u64 size;/* in */ +__u32 flags;/* in, mask of MSM_BO_x */ +__u32 handle;/* out */ +}; + +#define MSM_INFO_IOVA 0x01 + +#define MSM_INFO_FLAGS (MSM_INFO_IOVA) + +struct drm_msm_gem_info { +__u32 handle;/* in */ +__u32 flags;/* in - combination of MSM_INFO_* flags */ +__u64 offset;/* out, mmap() offset or iova */ +}; + +#define MSM_PREP_READ 0x01 +#define MSM_PREP_WRITE 0x02 +#define MSM_PREP_NOSYNC 0x04 + +#define MSM_PREP_FLAGS (MSM_PREP_READ | MSM_PREP_WRITE |
MSM_PREP_NOSYNC)include/drm/msm_drm.h new file +24
-0+ +struct drm_msm_gem_cpu_prep { +__u32 handle;/* in */ +__u32 op;/* in, mask of MSM_PREP_x */ +struct drm_msm_timespec timeout;/* in */ +}; + +struct drm_msm_gem_cpu_fini { +__u32 handle;/* in */ +}; + +/* +* Cmdstream Submission: +*/ + +/* The value written into the cmdstream is logically: +* +* ((relocbuf->gpuaddr + reloc_offset) << shift) | or +* +* When we have GPU's w/ >32bit ptrs, it should be possible to deal +* with this by emit'ing two reloc entries with appropriate shift +* values. Or a new MSM_SUBMIT_CMD_x type would also be an option. +* +* NOTE that reloc's must be sorted by order of increasing
submit_offset,
+ * otherwise EINVAL.
+ */include/drm/msm_drm.h new file +4
-0+struct drm_msm_gem_submit_reloc { +__u32 submit_offset;/* in, offset from submit_bo */ +__u32 or;/* in, value OR'd with result */ +__s32 shift;/* in, amount of left shift (can be negative) */
include/drm/msm_drm.h new file +31
-0+__u32 reloc_idx;/* in, index of reloc_bo buffer */ +__u64 reloc_offset;/* in, offset from start of reloc_bo */ +}; + +/* submit-types: +* BUF - this cmd buffer is executed normally. +* IB_TARGET_BUF - this cmd buffer is an IB target. Reloc's are +* processed normally, but the kernel does not setup an IB to +* this buffer in the first-level ringbuffer +* CTX_RESTORE_BUF - only executed if there has been a GPU context +* switch since the last SUBMIT ioctl +*/ +#define MSM_SUBMIT_CMD_BUF 0x0001 +#define MSM_SUBMIT_CMD_IB_TARGET_BUF 0x0002 +#define MSM_SUBMIT_CMD_CTX_RESTORE_BUF 0x0003 +struct drm_msm_gem_submit_cmd { +__u32 type;/* in, one of MSM_SUBMIT_CMD_x */ +__u32 submit_idx;/* in, index of submit_bo cmdstream buffer */ +__u32 submit_offset;/* in, offset into submit_bo */ +__u32 size;/* in, cmdstream size */ +__u32 pad; +__u32 nr_relocs;/* in, number of submit_reloc's */ +__u64 relocs;/* in, ptr to array of submit_reloc's */ +}; + +/* Each buffer referenced elsewhere in the cmdstream submit (ie. the +* cmdstream buffer(s) themselves or reloc entries) has one (and only +* one) entry in the submit->bos[] table. +* +* As a optimization, the current buffer (gpu virtual address) can be +* passed back through the 'presumed' field. If on a subsequent reloc,
+ * userspace passes back a 'presumed' address that is still valid,
+ * then patching the cmdstream for this entry is skipped. This can
+ * avoid kernel needing to map/access the cmdstream bo in the common
+ * case.
+ */include/drm/msm_drm.h new file +4
-0+#define MSM_SUBMIT_BO_READ 0x0001 +#define MSM_SUBMIT_BO_WRITE 0x0002 + +#define MSM_SUBMIT_BO_FLAGS (MSM_SUBMIT_BO_READ |
MSM_SUBMIT_BO_WRITE)include/drm/msm_drm.h new file +9
-0+ +struct drm_msm_gem_submit_bo { +__u32 flags;/* in, mask of MSM_SUBMIT_BO_x */ +__u32 handle;/* in, GEM handle */ +__u64 presumed;/* in/out, presumed buffer address */ +}; + +/* Valid submit ioctl flags: */ +#define MSM_SUBMIT_NO_IMPLICIT 0x80000000/* disable implicit sync */
+#defineMSM_SUBMIT_FENCE_FD_IN0x40000000/* enable inputfence_fd
*/
+#defineMSM_SUBMIT_FENCE_FD_OUT0x20000000/* enable outputfence_fd*/
+#defineMSM_SUBMIT_SUDO0x10000000/* run submitted cmds from
RB */include/drm/msm_drm.h new file +9
-0+#define MSM_SUBMIT_FLAGS ( \ + MSM_SUBMIT_NO_IMPLICIT | \ + MSM_SUBMIT_FENCE_FD_IN | \ + MSM_SUBMIT_FENCE_FD_OUT | \ + MSM_SUBMIT_SUDO | \ + 0) + +/* Each cmdstream submit consists of a table of buffers involved, and +* one or more cmdstream buffers. This allows for conditional execution
+ * (context-restore), and IB buffers needed for per tile/bin draw cmds.
+ */include/drm/msm_drm.h new file +8
-0+struct drm_msm_gem_submit { +__u32 flags;/* MSM_PIPE_x | MSM_SUBMIT_x */ +__u32 fence;/* out */ +__u32 nr_bos;/* in, number of submit_bo's */ +__u32 nr_cmds;/* in, number of submit_cmd's */ +__u64 bos;/* in, ptr to array of submit_bo's */ +__u64 cmds;/* in, ptr to array of submit_cmd's */ +__s32 fence_fd;/* in/out fence fd (see MSM_SUBMIT_FENCE_FD_IN/OUT) */
include/drm/msm_drm.h new file +18
-0+__u32 queueid;/* in, submitqueue id */ +}; + +/* The normal way to synchronize with the GPU is just to CPU_PREP on +* a buffer if you need to access it from the CPU (other cmdstream +* submission from same or other contexts, PAGE_FLIP ioctl, etc, all +* handle the required synchronization under the hood). This ioctl +* mainly just exists as a way to implement the gallium pipe_fence +* APIs without requiring a dummy bo to synchronize on. +*/ +struct drm_msm_wait_fence { +__u32 fence;/* in */ +__u32 pad; +struct drm_msm_timespec timeout;/* in */ +__u32 queueid;/* in, submitqueue id */ +}; + +/* madvise provides a way to tell the kernel in case a buffers contents
+ * can be discarded under memory pressure, which is useful for userspace
+ * bo cache where we want to optimistically hold on to buffer allocate
+ * and potential mmap, but allow the pages to be discarded under memory
+ * pressure.
+ *
+ * Typical usage would involve madvise(DONTNEED) when buffer enters BO
+ * cache, and madvise(WILLNEED) if trying to recycle buffer from BO cache.
+ * In the WILLNEED case, 'retained' indicates to userspace whether the
+ * backing pages still exist.
+ */
+#defineMSM_MADV_WILLNEED0 /* backing pages are needed, status
returned in 'retained' */include/drm/msm_drm.h new file +11
-0+#define MSM_MADV_DONTNEED 1/* backing pages not needed */ +#define __MSM_MADV_PURGED 2/* internal state */ + +struct drm_msm_gem_madvise { +__u32 handle;/* in, GEM handle */ +__u32 madv;/* in, MSM_MADV_x */ +__u32 retained;/* out, whether backing store still exists */ +}; + +/* +* Draw queues allow the user to set specific submission parameter. Command
+ * submissions specify a specific submitqueue to use. ID 0 is reserved for
+ * backwards compatibility as a "default" submitqueue
+ */include/drm/msm_drm.h new file +27
-0+ +#define MSM_SUBMITQUEUE_FLAGS (0) + +struct drm_msm_submitqueue { +__u32 flags;/* in, MSM_SUBMITQUEUE_x */ +__u32 prio;/* in, Priority level */ +__u32 id;/* out, identifier */ +}; + +#define DRM_MSM_GET_PARAM 0x00 +/* placeholder: +#define DRM_MSM_SET_PARAM 0x01 +*/ +#define DRM_MSM_GEM_NEW 0x02 +#define DRM_MSM_GEM_INFO 0x03 +#define DRM_MSM_GEM_CPU_PREP 0x04 +#define DRM_MSM_GEM_CPU_FINI 0x05 +#define DRM_MSM_GEM_SUBMIT 0x06 +#define DRM_MSM_WAIT_FENCE 0x07 +#define DRM_MSM_GEM_MADVISE 0x08 +/* placeholder: +#define DRM_MSM_GEM_SVM_NEW 0x09 +*/ +#define DRM_MSM_SUBMITQUEUE_NEW 0x0A +#define DRM_MSM_SUBMITQUEUE_CLOSE 0x0B + +#define DRM_IOCTL_MSM_GET_PARAM DRM_IOWR(DRM_COMMAND_BASE +
DRM_MSM_GET_PARAM, structdrm_msm_param)
+#defineDRM_IOCTL_MSM_GEM_NEWDRM_IOWR(DRM_COMMAND_BASE +DRM_MSM_GEM_NEW, structdrm_msm_gem_new)
+#defineDRM_IOCTL_MSM_GEM_INFODRM_IOWR(DRM_COMMAND_BASE +DRM_MSM_GEM_INFO, structdrm_msm_gem_info)
+#defineDRM_IOCTL_MSM_GEM_CPU_PREPDRM_IOW(DRM_COMMAND_BASE+DRM_MSM_GEM_CPU_PREP, structdrm_msm_gem_cpu_prep)
+#defineDRM_IOCTL_MSM_GEM_CPU_FINIDRM_IOW(DRM_COMMAND_BASE+DRM_MSM_GEM_CPU_FINI, structdrm_msm_gem_cpu_fini)
+#defineDRM_IOCTL_MSM_GEM_SUBMITDRM_IOWR(DRM_COMMAND_BASE +DRM_MSM_GEM_SUBMIT, structdrm_msm_gem_submit)
+#defineDRM_IOCTL_MSM_WAIT_FENCEDRM_IOW(DRM_COMMAND_BASE+DRM_MSM_WAIT_FENCE, structdrm_msm_wait_fence)
+#defineDRM_IOCTL_MSM_GEM_MADVISEDRM_IOWR(DRM_COMMAND_BASE +DRM_MSM_GEM_MADVISE, structdrm_msm_gem_madvise)
+#defineDRM_IOCTL_MSM_SUBMITQUEUE_NEWDRM_IOWR(DRM_COMMAND_BASE +DRM_MSM_SUBMITQUEUE_NEW, structdrm_msm_submitqueue) +#defineDRM_IOCTL_MSM_SUBMITQUEUE_CLOSEDRM_IOW(DRM_COMMAND_BASE+DRM_MSM_SUBMITQUEUE_CLOSE,__u32)
include/drm/msm_drm.h line 308
Quoted 6 lines
include/drm/msm_drm.h new file +6
-0+ +#if defined(__cplusplus) +} +#endif + +#endif /* __MSM_DRM_H__ */
Please ignore this patch. This patch is for userspace libdrm so, I will send new patch with subject-prefix [PATCH libdrm] instead of [PATCH].
Signature · 5 lines
Tanmay Shah _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel