diff options
author | John Stultz | 2018-04-13 18:31:33 -0500 |
---|---|---|
committer | John Stultz | 2018-04-13 18:31:33 -0500 |
commit | 84f838d71a75125b14d361f0ed7d23a0ac521edf (patch) | |
tree | a7694dfdab2ca2b1d32e25071589c7ea0a992bd6 /include/drm/tegra_drm.h | |
parent | 2f9aea0661550a43c3d2ac33a5bc286870edd34e (diff) | |
parent | 35affe89d5f617a972b1cfee00c51cbe9e7c64a2 (diff) | |
download | external-libgbm-84f838d71a75125b14d361f0ed7d23a0ac521edf.tar.gz external-libgbm-84f838d71a75125b14d361f0ed7d23a0ac521edf.tar.xz external-libgbm-84f838d71a75125b14d361f0ed7d23a0ac521edf.zip |
Merge remote-tracking branch 'freedesktop/master' into aosp/master
This merges the freedesktop/master branch into aosp/master
Change-Id: I3104d45924f67d37808154d04c15518394204478
Signed-off-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'include/drm/tegra_drm.h')
-rw-r--r-- | include/drm/tegra_drm.h | 38 |
1 files changed, 26 insertions, 12 deletions
diff --git a/include/drm/tegra_drm.h b/include/drm/tegra_drm.h index 1be09c4b..f01f7a11 100644 --- a/include/drm/tegra_drm.h +++ b/include/drm/tegra_drm.h | |||
@@ -1,23 +1,33 @@ | |||
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 | * This program is free software; you can redistribute it and/or modify it | 4 | * Permission is hereby granted, free of charge, to any person obtaining a |
5 | * under the terms and conditions of the GNU General Public License, | 5 | * copy of this software and associated documentation files (the "Software"), |
6 | * version 2, as published by the Free Software Foundation. | 6 | * to deal in the Software without restriction, including without limitation |
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: | ||
7 | * | 10 | * |
8 | * This program is distributed in the hope it will be useful, but WITHOUT | 11 | * The above copyright notice and this permission notice shall be included in |
9 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | 12 | * all copies or substantial portions of the Software. |
10 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for | ||
11 | * more details. | ||
12 | * | 13 | * |
13 | * You should have received a copy of the GNU General Public License | 14 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 15 | * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
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. | ||
15 | */ | 21 | */ |
16 | 22 | ||
17 | #ifndef _UAPI_TEGRA_DRM_H_ | 23 | #ifndef _TEGRA_DRM_H_ |
18 | #define _UAPI_TEGRA_DRM_H_ | 24 | #define _TEGRA_DRM_H_ |
19 | 25 | ||
20 | #include <drm/drm.h> | 26 | #include "drm.h" |
27 | |||
28 | #if defined(__cplusplus) | ||
29 | extern "C" { | ||
30 | #endif | ||
21 | 31 | ||
22 | #define DRM_TEGRA_GEM_CREATE_TILED (1 << 0) | 32 | #define DRM_TEGRA_GEM_CREATE_TILED (1 << 0) |
23 | #define DRM_TEGRA_GEM_CREATE_BOTTOM_UP (1 << 1) | 33 | #define DRM_TEGRA_GEM_CREATE_BOTTOM_UP (1 << 1) |
@@ -229,4 +239,8 @@ struct drm_tegra_keepon { | |||
229 | #define DRM_IOCTL_TEGRA_START_KEEPON DRM_IOWR(DRM_COMMAND_BASE + DRM_TEGRA_START_KEEPON, struct drm_tegra_keepon) | 239 | #define DRM_IOCTL_TEGRA_START_KEEPON DRM_IOWR(DRM_COMMAND_BASE + DRM_TEGRA_START_KEEPON, struct drm_tegra_keepon) |
230 | #define DRM_IOCTL_TEGRA_STOP_KEEPON DRM_IOWR(DRM_COMMAND_BASE + DRM_TEGRA_STOP_KEEPON, struct drm_tegra_keepon) | 240 | #define DRM_IOCTL_TEGRA_STOP_KEEPON DRM_IOWR(DRM_COMMAND_BASE + DRM_TEGRA_STOP_KEEPON, struct drm_tegra_keepon) |
231 | 241 | ||
242 | #if defined(__cplusplus) | ||
243 | } | ||
244 | #endif | ||
245 | |||
232 | #endif | 246 | #endif |