aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSean Paul2015-01-16 00:24:14 -0600
committerSean Paul2015-01-30 14:13:13 -0600
commit3880eeda7dd7b24fb075f97a0dc59f357e68c345 (patch)
tree7edde087fac64d3852c3f72717fde89f07620974 /include/drm/tegra_drm.h
parent9c250926052800060768771faba2f47fd9ef746b (diff)
downloadexternal-libgbm-3880eeda7dd7b24fb075f97a0dc59f357e68c345.tar.gz
external-libgbm-3880eeda7dd7b24fb075f97a0dc59f357e68c345.tar.xz
external-libgbm-3880eeda7dd7b24fb075f97a0dc59f357e68c345.zip
libdrm: Update drm/tegra_drm.h kernel header
Signed-off-by: Sean Paul <seanpaul@chromium.org> Change-Id: I65a9c294be1d303f47924a4fc9e65c1a1ad75fdf
Diffstat (limited to 'include/drm/tegra_drm.h')
-rw-r--r--include/drm/tegra_drm.h30
1 files changed, 13 insertions, 17 deletions
diff --git a/include/drm/tegra_drm.h b/include/drm/tegra_drm.h
index 8dae8f33..f97e82d7 100644
--- a/include/drm/tegra_drm.h
+++ b/include/drm/tegra_drm.h
@@ -1,29 +1,23 @@
1/* 1/*
2 * Copyright (c) 2012-2013, NVIDIA CORPORATION. All rights reserved. 2 * Copyright (c) 2012-2013, NVIDIA CORPORATION. All rights reserved.
3 * 3 *
4 * Permission is hereby granted, free of charge, to any person obtaining a 4 * This program is free software; you can redistribute it and/or modify it
5 * copy of this software and associated documentation files (the "Software"), 5 * under the terms and conditions of the GNU General Public License,
6 * to deal in the Software without restriction, including without limitation 6 * version 2, as published by the Free Software Foundation.
7 * the rights to use, copy, modify, merge, publish, distribute, sublicense,
8 * and/or sell copies of the Software, and to permit persons to whom the
9 * Software is furnished to do so, subject to the following conditions:
10 * 7 *
11 * The above copyright notice and this permission notice shall be included in 8 * This program is distributed in the hope it will be useful, but WITHOUT
12 * all copies or substantial portions of the Software. 9 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
10 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
11 * more details.
13 * 12 *
14 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 13 * You should have received a copy of the GNU General Public License
15 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
16 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
17 * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
18 * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
19 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
20 * OTHER DEALINGS IN THE SOFTWARE.
21 */ 15 */
22 16
23#ifndef _UAPI_TEGRA_DRM_H_ 17#ifndef _UAPI_TEGRA_DRM_H_
24#define _UAPI_TEGRA_DRM_H_ 18#define _UAPI_TEGRA_DRM_H_
25 19
26#include <drm.h> 20#include <drm/drm.h>
27 21
28#define DRM_TEGRA_GEM_CREATE_TILED (1 << 0) 22#define DRM_TEGRA_GEM_CREATE_TILED (1 << 0)
29#define DRM_TEGRA_GEM_CREATE_BOTTOM_UP (1 << 1) 23#define DRM_TEGRA_GEM_CREATE_BOTTOM_UP (1 << 1)
@@ -36,7 +30,8 @@ struct drm_tegra_gem_create {
36 30
37struct drm_tegra_gem_mmap { 31struct drm_tegra_gem_mmap {
38 __u32 handle; 32 __u32 handle;
39 __u32 offset; 33 __u32 pad;
34 __u64 offset;
40}; 35};
41 36
42struct drm_tegra_syncpt_read { 37struct drm_tegra_syncpt_read {
@@ -120,6 +115,7 @@ struct drm_tegra_submit {
120 __u32 num_waitchks; 115 __u32 num_waitchks;
121 __u32 waitchk_mask; 116 __u32 waitchk_mask;
122 __u32 timeout; 117 __u32 timeout;
118 __u32 pad;
123 __u64 syncpts; 119 __u64 syncpts;
124 __u64 cmdbufs; 120 __u64 cmdbufs;
125 __u64 relocs; 121 __u64 relocs;