diff options
| author |   Dave Airlie <airlied@redhat.com> | 2020-05-01 10:41:59 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2020-05-01 10:42:09 +1000 |
| commit | c62098c991a835903a31b5e135fe4f08b86bd603 (patch) | |
| tree | 3b51a40309a0e192c755f0932d82216df132aacf /include/uapi | |
| parent | Linux 5.7-rc3 (diff) | |
| parent | dma-buf: fix documentation build warnings (diff) | |
| download | wireguard-linux-c62098c991a835903a31b5e135fe4f08b86bd603.tar.xz wireguard-linux-c62098c991a835903a31b5e135fe4f08b86bd603.zip | |
Merge tag 'drm-misc-fixes-2020-04-30' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes
A few resources-related fixes for qxl, some doc build warnings and ioctl
fixes for dma-buf, an off-by-one fix in edid, and a return code fix in
DP-MST
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20200430153201.wx6of2b2gsoip7bk@gilmour.lan
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/linux/dma-buf.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/uapi/linux/dma-buf.h b/include/uapi/linux/dma-buf.h index dbc7092e04b5..7f30393b92c3 100644 --- a/include/uapi/linux/dma-buf.h +++ b/include/uapi/linux/dma-buf.h @@ -39,6 +39,12 @@ struct dma_buf_sync { #define DMA_BUF_BASE 'b' #define DMA_BUF_IOCTL_SYNC _IOW(DMA_BUF_BASE, 0, struct dma_buf_sync) + +/* 32/64bitness of this uapi was botched in android, there's no difference + * between them in actual uapi, they're just different numbers. + */ #define DMA_BUF_SET_NAME _IOW(DMA_BUF_BASE, 1, const char *) +#define DMA_BUF_SET_NAME_A _IOW(DMA_BUF_BASE, 1, u32) +#define DMA_BUF_SET_NAME_B _IOW(DMA_BUF_BASE, 1, u64) #endif |