* [PATCH libdrm] msm: add msm drm uapi header
@ 2018-07-24 18:55 Tanmay Shah
2018-07-24 19:19 ` Eric Anholt
0 siblings, 1 reply; 9+ messages in thread
From: Tanmay Shah @ 2018-07-24 18:55 UTC (permalink / raw)
To: dri-devel; +Cc: ryadav, seanpaul, manojavm, Tanmay Shah, hoegsberg, chandanu
file derived from msm-next kernel uapi header.
Signed-off-by: Tanmay Shah <tanmay@codeaurora.org>
---
Makefile.sources | 1 +
include/drm/msm_drm.h | 308 ++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 309 insertions(+)
create mode 100644 include/drm/msm_drm.h
diff --git a/Makefile.sources b/Makefile.sources
index 1f8372b..55290fe 100644
--- a/Makefile.sources
+++ b/Makefile.sources
@@ -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 \
diff --git a/include/drm/msm_drm.h b/include/drm/msm_drm.h
new file mode 100644
index 0000000..c06d0a5
--- /dev/null
+++ b/include/drm/msm_drm.h
@@ -0,0 +1,308 @@
+/*
+ * Copyright (C) 2013 Red Hat
+ * Author: Rob Clark <robdclark@gmail.com>
+ *
+ * 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.
+ */
+
+#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).
+ */
+#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.
+ */
+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)
+
+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.
+ */
+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) */
+ __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.
+ */
+#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)
+
+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 */
+#define MSM_SUBMIT_FENCE_FD_IN 0x40000000 /* enable input fence_fd */
+#define MSM_SUBMIT_FENCE_FD_OUT 0x20000000 /* enable output fence_fd */
+#define MSM_SUBMIT_SUDO 0x10000000 /* run submitted cmds from RB */
+#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.
+ */
+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) */
+ __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.
+ */
+#define MSM_MADV_WILLNEED 0 /* backing pages are needed, status returned in 'retained' */
+#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
+ */
+
+#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, struct drm_msm_param)
+#define DRM_IOCTL_MSM_GEM_NEW DRM_IOWR(DRM_COMMAND_BASE + DRM_MSM_GEM_NEW, struct drm_msm_gem_new)
+#define DRM_IOCTL_MSM_GEM_INFO DRM_IOWR(DRM_COMMAND_BASE + DRM_MSM_GEM_INFO, struct drm_msm_gem_info)
+#define DRM_IOCTL_MSM_GEM_CPU_PREP DRM_IOW (DRM_COMMAND_BASE + DRM_MSM_GEM_CPU_PREP, struct drm_msm_gem_cpu_prep)
+#define DRM_IOCTL_MSM_GEM_CPU_FINI DRM_IOW (DRM_COMMAND_BASE + DRM_MSM_GEM_CPU_FINI, struct drm_msm_gem_cpu_fini)
+#define DRM_IOCTL_MSM_GEM_SUBMIT DRM_IOWR(DRM_COMMAND_BASE + DRM_MSM_GEM_SUBMIT, struct drm_msm_gem_submit)
+#define DRM_IOCTL_MSM_WAIT_FENCE DRM_IOW (DRM_COMMAND_BASE + DRM_MSM_WAIT_FENCE, struct drm_msm_wait_fence)
+#define DRM_IOCTL_MSM_GEM_MADVISE DRM_IOWR(DRM_COMMAND_BASE + DRM_MSM_GEM_MADVISE, struct drm_msm_gem_madvise)
+#define DRM_IOCTL_MSM_SUBMITQUEUE_NEW DRM_IOWR(DRM_COMMAND_BASE + DRM_MSM_SUBMITQUEUE_NEW, struct drm_msm_submitqueue)
+#define DRM_IOCTL_MSM_SUBMITQUEUE_CLOSE DRM_IOW (DRM_COMMAND_BASE + DRM_MSM_SUBMITQUEUE_CLOSE, __u32)
+
+#if defined(__cplusplus)
+}
+#endif
+
+#endif /* __MSM_DRM_H__ */
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH libdrm] msm: add msm drm uapi header
2018-07-24 18:55 [PATCH libdrm] msm: add msm drm uapi header Tanmay Shah
@ 2018-07-24 19:19 ` Eric Anholt
2018-07-24 21:11 ` Tanmay Shah
0 siblings, 1 reply; 9+ messages in thread
From: Eric Anholt @ 2018-07-24 19:19 UTC (permalink / raw)
To: dri-devel; +Cc: ryadav, seanpaul, manojavm, Tanmay Shah, hoegsberg, chandanu
[-- Attachment #1.1: Type: text/plain, Size: 284 bytes --]
Tanmay Shah <tanmay@codeaurora.org> writes:
> file derived from msm-next kernel uapi header.
Unless there's an exception from Dave, I believe uapi headers in libdrm
and Mesa should be direct copies from "make headers_install" on the
drm-next branch. How does this compare to that?
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH libdrm] msm: add msm drm uapi header
2018-07-24 19:19 ` Eric Anholt
@ 2018-07-24 21:11 ` Tanmay Shah
2018-07-24 22:21 ` Eric Anholt
0 siblings, 1 reply; 9+ messages in thread
From: Tanmay Shah @ 2018-07-24 21:11 UTC (permalink / raw)
To: Eric Anholt; +Cc: ryadav, seanpaul, manojavm, dri-devel, hoegsberg, chandanu
On 2018-07-24 12:19, Eric Anholt wrote:
> Tanmay Shah <tanmay@codeaurora.org> writes:
>
>> file derived from msm-next kernel uapi header.
>
> Unless there's an exception from Dave, I believe uapi headers in libdrm
> and Mesa should be direct copies from "make headers_install" on the
> drm-next branch. How does this compare to that?
The header file is identical as in drm-next kernel.
--
Tanmay Shah
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH libdrm] msm: add msm drm uapi header
2018-07-24 21:11 ` Tanmay Shah
@ 2018-07-24 22:21 ` Eric Anholt
2018-07-26 0:33 ` Tanmay Shah
0 siblings, 1 reply; 9+ messages in thread
From: Eric Anholt @ 2018-07-24 22:21 UTC (permalink / raw)
To: Tanmay Shah; +Cc: ryadav, seanpaul, manojavm, dri-devel, hoegsberg, chandanu
[-- Attachment #1.1: Type: text/plain, Size: 608 bytes --]
Tanmay Shah <tanmay@codeaurora.org> writes:
> On 2018-07-24 12:19, Eric Anholt wrote:
>> Tanmay Shah <tanmay@codeaurora.org> writes:
>>
>>> file derived from msm-next kernel uapi header.
>>
>> Unless there's an exception from Dave, I believe uapi headers in libdrm
>> and Mesa should be direct copies from "make headers_install" on the
>> drm-next branch. How does this compare to that?
>
> The header file is identical as in drm-next kernel.
Great, let's say "drm-next" instead to make that clear. Also, looks
like freedreno/msm/msm_drm.h should probably get removed in favor of
this?
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH libdrm] msm: add msm drm uapi header
2018-07-24 22:21 ` Eric Anholt
@ 2018-07-26 0:33 ` Tanmay Shah
[not found] ` <d778744ff473a941da1570241575fc38@codeaurora.org>
0 siblings, 1 reply; 9+ messages in thread
From: Tanmay Shah @ 2018-07-26 0:33 UTC (permalink / raw)
To: Eric Anholt; +Cc: ryadav, seanpaul, manojavm, dri-devel, hoegsberg, chandanu
On 2018-07-24 15:21, Eric Anholt wrote:
> Tanmay Shah <tanmay@codeaurora.org> writes:
>
>> On 2018-07-24 12:19, Eric Anholt wrote:
>>> Tanmay Shah <tanmay@codeaurora.org> writes:
>>>
>>>> file derived from msm-next kernel uapi header.
>>>
>>> Unless there's an exception from Dave, I believe uapi headers in
>>> libdrm
>>> and Mesa should be direct copies from "make headers_install" on the
>>> drm-next branch. How does this compare to that?
>>
>> The header file is identical as in drm-next kernel.
>
> Great, let's say "drm-next" instead to make that clear. Also, looks
> like freedreno/msm/msm_drm.h should probably get removed in favor of
> this?
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
+Rob Clark
Thanks Eric, I will send v2 with suggested changes.
freedreno/msm/msm_drm.h is owned by Rob, I am not sure if we need it
there
or not. I would let Rob comment on this.
We require msm_drm.h in include/drm/ directory to export GEM ioctls so
other modules
such as gbm can use it. Other platforms have similar strategy.
--
Tanmay Shah
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH libdrm] msm: add msm drm uapi header
[not found] ` <CAF6AEGtz48hJbav6h0tJembxT-R0G4QMBuAwtU=Mb4RWTouhbA@mail.gmail.com>
@ 2018-07-26 1:05 ` Tanmay Shah
2018-08-09 23:29 ` [PATCH libdrm v2] libdrm: " Tanmay Shah
0 siblings, 1 reply; 9+ messages in thread
From: Tanmay Shah @ 2018-07-26 1:05 UTC (permalink / raw)
To: Rob Clark; +Cc: ryadav, seanpaul, manojavm, dri-devel, hoegsberg, chandanu
On 2018-07-25 17:56, Rob Clark wrote:
> On Wed, Jul 25, 2018 at 8:43 PM, Tanmay Shah <tanmay@codeaurora.org>
> wrote:
>> On 2018-07-25 17:33, Tanmay Shah wrote:
>>>
>>> On 2018-07-24 15:21, Eric Anholt wrote:
>>>>
>>>> Tanmay Shah <tanmay@codeaurora.org> writes:
>>>>
>>>>> On 2018-07-24 12:19, Eric Anholt wrote:
>>>>>>
>>>>>> Tanmay Shah <tanmay@codeaurora.org> writes:
>>>>>>
>>>>>>> file derived from msm-next kernel uapi header.
>>>>>>
>>>>>>
>>>>>> Unless there's an exception from Dave, I believe uapi headers in
>>>>>> libdrm
>>>>>> and Mesa should be direct copies from "make headers_install" on
>>>>>> the
>>>>>> drm-next branch. How does this compare to that?
>>>>>
>>>>>
>>>>> The header file is identical as in drm-next kernel.
>>>>
>>>>
>>>> Great, let's say "drm-next" instead to make that clear. Also, looks
>>>> like freedreno/msm/msm_drm.h should probably get removed in favor of
>>>> this?
>>>>
>>>> _______________________________________________
>>>> dri-devel mailing list
>>>> dri-devel@lists.freedesktop.org
>>>> https://lists.freedesktop.org/mailman/listinfo/dri-devel
>>>
>>>
>>> +Rob Clark
>>>
>>> Thanks Eric, I will send v2 with suggested changes.
>>>
>>> freedreno/msm/msm_drm.h is owned by Rob, I am not sure if we need it
>>> there
>>> or not. I would let Rob comment on this.
>>>
>>> We require msm_drm.h in include/drm/ directory to export GEM ioctls
>>> so
>>> other modules
>>> such as gbm can use it. Other platforms have similar strategy.
>>
>>
>> Sorry, Actually +Rob Clark
>
> yeah, we should remove the duplicate header in libdrm.. so far it
> hasn't been exported outside of libdrm_freedreno since it was
> unneeded.. but as long as libdrm_freedreno still compiles properly
> with the moved header, I'm fine with it. There might be some include
> path tweaking required, not sure..
>
> (and PS. "ownership" is not a thing upstream.. if it lives in the same
> git tree and changing it doesn't break the build, it is not off-limits
> ;-))
>
> BR,
> -R
Thanks, Rob.
--
Tanmay Shah
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH libdrm v2] libdrm: add msm drm uapi header
2018-07-26 1:05 ` Tanmay Shah
@ 2018-08-09 23:29 ` Tanmay Shah
[not found] ` <1533857366-13080-1-git-send-email-tanmay-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
0 siblings, 1 reply; 9+ messages in thread
From: Tanmay Shah @ 2018-08-09 23:29 UTC (permalink / raw)
To: dri-devel, freedreno
Cc: ryadav, seanpaul, manojavm, Tanmay Shah, hoegsberg, chandanu
msm_drm.h file derived from drm-next kernel uapi header.
Remove freedreno/msm/msm_drm.h to maintain only
one copy of msm_drm.h and change freedreno Makefile
accordingly.
Signed-off-by: Tanmay Shah <tanmay@codeaurora.org>
---
Makefile.sources | 1 +
freedreno/Makefile.sources | 1 -
{freedreno/msm => include/drm}/msm_drm.h | 3 ++-
3 files changed, 3 insertions(+), 2 deletions(-)
rename {freedreno/msm => include/drm}/msm_drm.h (99%)
diff --git a/Makefile.sources b/Makefile.sources
index 1f8372bc..55290fe9 100644
--- a/Makefile.sources
+++ b/Makefile.sources
@@ -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 \
diff --git a/freedreno/Makefile.sources b/freedreno/Makefile.sources
index 68a679bf..ca89511a 100644
--- a/freedreno/Makefile.sources
+++ b/freedreno/Makefile.sources
@@ -7,7 +7,6 @@ LIBDRM_FREEDRENO_FILES := \
freedreno_bo_cache.c \
msm/msm_bo.c \
msm/msm_device.c \
- msm/msm_drm.h \
msm/msm_pipe.c \
msm/msm_priv.h \
msm/msm_ringbuffer.c
diff --git a/freedreno/msm/msm_drm.h b/include/drm/msm_drm.h
similarity index 99%
rename from freedreno/msm/msm_drm.h
rename to include/drm/msm_drm.h
index dac49e59..c06d0a5b 100644
--- a/freedreno/msm/msm_drm.h
+++ b/include/drm/msm_drm.h
@@ -25,7 +25,6 @@
#ifndef __MSM_DRM_H__
#define __MSM_DRM_H__
-#include <stddef.h>
#include "drm.h"
#if defined(__cplusplus)
@@ -202,10 +201,12 @@ struct drm_msm_gem_submit_bo {
#define MSM_SUBMIT_NO_IMPLICIT 0x80000000 /* disable implicit sync */
#define MSM_SUBMIT_FENCE_FD_IN 0x40000000 /* enable input fence_fd */
#define MSM_SUBMIT_FENCE_FD_OUT 0x20000000 /* enable output fence_fd */
+#define MSM_SUBMIT_SUDO 0x10000000 /* run submitted cmds from RB */
#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
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH libdrm v2] libdrm: add msm drm uapi header
[not found] ` <1533857366-13080-1-git-send-email-tanmay-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
@ 2018-08-10 22:02 ` Eric Anholt
2018-08-14 0:29 ` [PATCH libdrm v3] " Tanmay Shah
0 siblings, 1 reply; 9+ messages in thread
From: Eric Anholt @ 2018-08-10 22:02 UTC (permalink / raw)
To: dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
freedreno-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Cc: ryadav-sgV2jX0FEOL9JmXXK+q4OQ, seanpaul-hpIqsD4AKlfQT0dZR+AlfA,
manojavm-sgV2jX0FEOL9JmXXK+q4OQ, Tanmay Shah,
robdclark-Re5JQEeQqe8AvxtiuMwx3w,
hoegsberg-hpIqsD4AKlfQT0dZR+AlfA, jsanka-sgV2jX0FEOL9JmXXK+q4OQ,
chandanu-sgV2jX0FEOL9JmXXK+q4OQ
[-- Attachment #1.1: Type: text/plain, Size: 429 bytes --]
Tanmay Shah <tanmay-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org> writes:
> msm_drm.h file derived from drm-next kernel uapi header.
>
> Remove freedreno/msm/msm_drm.h to maintain only
> one copy of msm_drm.h and change freedreno Makefile
> accordingly.
>
> Signed-off-by: Tanmay Shah <tanmay-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
Looks like this is missing the meson.build update, and leaves a stale
note in include/drm/README.
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
Freedreno mailing list
Freedreno@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/freedreno
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH libdrm v3] libdrm: add msm drm uapi header
2018-08-10 22:02 ` Eric Anholt
@ 2018-08-14 0:29 ` Tanmay Shah
0 siblings, 0 replies; 9+ messages in thread
From: Tanmay Shah @ 2018-08-14 0:29 UTC (permalink / raw)
To: dri-devel; +Cc: ryadav, seanpaul, manojavm, Tanmay Shah, hoegsberg, chandanu
msm_drm.h file Generated using make headers_install.
Generated from
tree - git://people.freedesktop.org/~airlied/linux
branch - drm-next
commit - 6d08b06e67cd117f6992c46611dfb4ce267cd71e
Remove freedreno/msm/msm_drm.h to maintain only
one copy of msm_drm.h and change freedreno Makefile
and meson.build file accordingly.
Signed-off-by: Tanmay Shah <tanmay@codeaurora.org>
---
Makefile.sources | 1 +
freedreno/Makefile.sources | 1 -
{freedreno/msm => include/drm}/msm_drm.h | 3 ++-
meson.build | 9 +++++----
4 files changed, 8 insertions(+), 6 deletions(-)
rename {freedreno/msm => include/drm}/msm_drm.h (99%)
diff --git a/Makefile.sources b/Makefile.sources
index 1f8372bc..55290fe9 100644
--- a/Makefile.sources
+++ b/Makefile.sources
@@ -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 \
diff --git a/freedreno/Makefile.sources b/freedreno/Makefile.sources
index 68a679bf..ca89511a 100644
--- a/freedreno/Makefile.sources
+++ b/freedreno/Makefile.sources
@@ -7,7 +7,6 @@ LIBDRM_FREEDRENO_FILES := \
freedreno_bo_cache.c \
msm/msm_bo.c \
msm/msm_device.c \
- msm/msm_drm.h \
msm/msm_pipe.c \
msm/msm_priv.h \
msm/msm_ringbuffer.c
diff --git a/freedreno/msm/msm_drm.h b/include/drm/msm_drm.h
similarity index 99%
rename from freedreno/msm/msm_drm.h
rename to include/drm/msm_drm.h
index dac49e59..c06d0a5b 100644
--- a/freedreno/msm/msm_drm.h
+++ b/include/drm/msm_drm.h
@@ -25,7 +25,6 @@
#ifndef __MSM_DRM_H__
#define __MSM_DRM_H__
-#include <stddef.h>
#include "drm.h"
#if defined(__cplusplus)
@@ -202,10 +201,12 @@ struct drm_msm_gem_submit_bo {
#define MSM_SUBMIT_NO_IMPLICIT 0x80000000 /* disable implicit sync */
#define MSM_SUBMIT_FENCE_FD_IN 0x40000000 /* enable input fence_fd */
#define MSM_SUBMIT_FENCE_FD_OUT 0x20000000 /* enable output fence_fd */
+#define MSM_SUBMIT_SUDO 0x10000000 /* run submitted cmds from RB */
#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
diff --git a/meson.build b/meson.build
index b2f9a290..56d1f151 100644
--- a/meson.build
+++ b/meson.build
@@ -303,10 +303,11 @@ install_headers(
'include/drm/drm.h', 'include/drm/drm_fourcc.h', 'include/drm/drm_mode.h',
'include/drm/drm_sarea.h', 'include/drm/i915_drm.h',
'include/drm/mach64_drm.h', 'include/drm/mga_drm.h',
- 'include/drm/nouveau_drm.h', 'include/drm/qxl_drm.h',
- 'include/drm/r128_drm.h', 'include/drm/radeon_drm.h',
- 'include/drm/amdgpu_drm.h', 'include/drm/savage_drm.h',
- 'include/drm/sis_drm.h', 'include/drm/tegra_drm.h', 'include/drm/vc4_drm.h',
+ 'include/drm/msm_drm.h', 'include/drm/nouveau_drm.h',
+ 'include/drm/qxl_drm.h', 'include/drm/r128_drm.h',
+ 'include/drm/radeon_drm.h', 'include/drm/amdgpu_drm.h',
+ 'include/drm/savage_drm.h', 'include/drm/sis_drm.h',
+ 'include/drm/tegra_drm.h', 'include/drm/vc4_drm.h',
'include/drm/via_drm.h', 'include/drm/virtgpu_drm.h',
subdir : 'libdrm',
)
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2018-08-14 0:29 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-07-24 18:55 [PATCH libdrm] msm: add msm drm uapi header Tanmay Shah
2018-07-24 19:19 ` Eric Anholt
2018-07-24 21:11 ` Tanmay Shah
2018-07-24 22:21 ` Eric Anholt
2018-07-26 0:33 ` Tanmay Shah
[not found] ` <d778744ff473a941da1570241575fc38@codeaurora.org>
[not found] ` <CAF6AEGtz48hJbav6h0tJembxT-R0G4QMBuAwtU=Mb4RWTouhbA@mail.gmail.com>
2018-07-26 1:05 ` Tanmay Shah
2018-08-09 23:29 ` [PATCH libdrm v2] libdrm: " Tanmay Shah
[not found] ` <1533857366-13080-1-git-send-email-tanmay-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
2018-08-10 22:02 ` Eric Anholt
2018-08-14 0:29 ` [PATCH libdrm v3] " Tanmay Shah
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).