mirror of
https://github.com/torvalds/linux.git
synced 2024-11-18 01:51:53 +00:00
cbfbbabb89
The version of the drm_tegra_submit structure that was merged all the
way back in 3.10 contains a pad field that was originally intended to
properly pad the following __u64 field. Unfortunately it seems like a
different field was dropped during review that caused this padding to
become unnecessary, but the pad field wasn't removed at that time.
One possible side-effect of this is that since the __u64 following the
pad is now no longer properly aligned, the compiler may (or may not)
introduce padding itself, which results in no predictable ABI.
Rectify this by removing the pad field so that all fields are again
naturally aligned. Technically this is breaking existing userspace ABI,
but given that there aren't any (released) userspace drivers that make
use of this yet, the fallout should be minimal.
Fixes: d43f81cbaf ("drm/tegra: Add gr2d device")
Cc: <stable@vger.kernel.org> # 3.10
Signed-off-by: Thierry Reding <treding@nvidia.com>
155 lines
4.1 KiB
C
155 lines
4.1 KiB
C
/*
|
|
* Copyright (c) 2012-2013, NVIDIA CORPORATION. All rights reserved.
|
|
*
|
|
* 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 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 COPYRIGHT HOLDER(S) OR AUTHOR(S) 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 _UAPI_TEGRA_DRM_H_
|
|
#define _UAPI_TEGRA_DRM_H_
|
|
|
|
#include <drm/drm.h>
|
|
|
|
#define DRM_TEGRA_GEM_CREATE_TILED (1 << 0)
|
|
#define DRM_TEGRA_GEM_CREATE_BOTTOM_UP (1 << 1)
|
|
|
|
struct drm_tegra_gem_create {
|
|
__u64 size;
|
|
__u32 flags;
|
|
__u32 handle;
|
|
};
|
|
|
|
struct drm_tegra_gem_mmap {
|
|
__u32 handle;
|
|
__u32 offset;
|
|
};
|
|
|
|
struct drm_tegra_syncpt_read {
|
|
__u32 id;
|
|
__u32 value;
|
|
};
|
|
|
|
struct drm_tegra_syncpt_incr {
|
|
__u32 id;
|
|
__u32 pad;
|
|
};
|
|
|
|
struct drm_tegra_syncpt_wait {
|
|
__u32 id;
|
|
__u32 thresh;
|
|
__u32 timeout;
|
|
__u32 value;
|
|
};
|
|
|
|
#define DRM_TEGRA_NO_TIMEOUT (0xffffffff)
|
|
|
|
struct drm_tegra_open_channel {
|
|
__u32 client;
|
|
__u32 pad;
|
|
__u64 context;
|
|
};
|
|
|
|
struct drm_tegra_close_channel {
|
|
__u64 context;
|
|
};
|
|
|
|
struct drm_tegra_get_syncpt {
|
|
__u64 context;
|
|
__u32 index;
|
|
__u32 id;
|
|
};
|
|
|
|
struct drm_tegra_get_syncpt_base {
|
|
__u64 context;
|
|
__u32 syncpt;
|
|
__u32 id;
|
|
};
|
|
|
|
struct drm_tegra_syncpt {
|
|
__u32 id;
|
|
__u32 incrs;
|
|
};
|
|
|
|
struct drm_tegra_cmdbuf {
|
|
__u32 handle;
|
|
__u32 offset;
|
|
__u32 words;
|
|
__u32 pad;
|
|
};
|
|
|
|
struct drm_tegra_reloc {
|
|
struct {
|
|
__u32 handle;
|
|
__u32 offset;
|
|
} cmdbuf;
|
|
struct {
|
|
__u32 handle;
|
|
__u32 offset;
|
|
} target;
|
|
__u32 shift;
|
|
__u32 pad;
|
|
};
|
|
|
|
struct drm_tegra_waitchk {
|
|
__u32 handle;
|
|
__u32 offset;
|
|
__u32 syncpt;
|
|
__u32 thresh;
|
|
};
|
|
|
|
struct drm_tegra_submit {
|
|
__u64 context;
|
|
__u32 num_syncpts;
|
|
__u32 num_cmdbufs;
|
|
__u32 num_relocs;
|
|
__u32 num_waitchks;
|
|
__u32 waitchk_mask;
|
|
__u32 timeout;
|
|
__u64 syncpts;
|
|
__u64 cmdbufs;
|
|
__u64 relocs;
|
|
__u64 waitchks;
|
|
__u32 fence; /* Return value */
|
|
|
|
__u32 reserved[5]; /* future expansion */
|
|
};
|
|
|
|
#define DRM_TEGRA_GEM_CREATE 0x00
|
|
#define DRM_TEGRA_GEM_MMAP 0x01
|
|
#define DRM_TEGRA_SYNCPT_READ 0x02
|
|
#define DRM_TEGRA_SYNCPT_INCR 0x03
|
|
#define DRM_TEGRA_SYNCPT_WAIT 0x04
|
|
#define DRM_TEGRA_OPEN_CHANNEL 0x05
|
|
#define DRM_TEGRA_CLOSE_CHANNEL 0x06
|
|
#define DRM_TEGRA_GET_SYNCPT 0x07
|
|
#define DRM_TEGRA_SUBMIT 0x08
|
|
#define DRM_TEGRA_GET_SYNCPT_BASE 0x09
|
|
|
|
#define DRM_IOCTL_TEGRA_GEM_CREATE DRM_IOWR(DRM_COMMAND_BASE + DRM_TEGRA_GEM_CREATE, struct drm_tegra_gem_create)
|
|
#define DRM_IOCTL_TEGRA_GEM_MMAP DRM_IOWR(DRM_COMMAND_BASE + DRM_TEGRA_GEM_MMAP, struct drm_tegra_gem_mmap)
|
|
#define DRM_IOCTL_TEGRA_SYNCPT_READ DRM_IOWR(DRM_COMMAND_BASE + DRM_TEGRA_SYNCPT_READ, struct drm_tegra_syncpt_read)
|
|
#define DRM_IOCTL_TEGRA_SYNCPT_INCR DRM_IOWR(DRM_COMMAND_BASE + DRM_TEGRA_SYNCPT_INCR, struct drm_tegra_syncpt_incr)
|
|
#define DRM_IOCTL_TEGRA_SYNCPT_WAIT DRM_IOWR(DRM_COMMAND_BASE + DRM_TEGRA_SYNCPT_WAIT, struct drm_tegra_syncpt_wait)
|
|
#define DRM_IOCTL_TEGRA_OPEN_CHANNEL DRM_IOWR(DRM_COMMAND_BASE + DRM_TEGRA_OPEN_CHANNEL, struct drm_tegra_open_channel)
|
|
#define DRM_IOCTL_TEGRA_CLOSE_CHANNEL DRM_IOWR(DRM_COMMAND_BASE + DRM_TEGRA_CLOSE_CHANNEL, struct drm_tegra_open_channel)
|
|
#define DRM_IOCTL_TEGRA_GET_SYNCPT DRM_IOWR(DRM_COMMAND_BASE + DRM_TEGRA_GET_SYNCPT, struct drm_tegra_get_syncpt)
|
|
#define DRM_IOCTL_TEGRA_SUBMIT DRM_IOWR(DRM_COMMAND_BASE + DRM_TEGRA_SUBMIT, struct drm_tegra_submit)
|
|
#define DRM_IOCTL_TEGRA_GET_SYNCPT_BASE DRM_IOWR(DRM_COMMAND_BASE + DRM_TEGRA_GET_SYNCPT_BASE, struct drm_tegra_get_syncpt_base)
|
|
|
|
#endif
|