History

Merge tag 'drm/tegra/for-3.15-rc1' of git://anongit.freedesktop.org/tegra/linux into drm-next

drm/tegra: Changes for v3.15-rc1 Implement eDP support for Tegra124 and support the PRIME vmap()/vunmap() operations. A symbol that is required for upcoming V4L2 support is now exported by the host1x driver. Relicense drivers under the GPL v2 for consistency. One exception is the public header file, which is relicensed under MIT to abide by the common rule. * tag 'drm/tegra/for-3.15-rc1' of git://anongit.freedesktop.org/tegra/linux: drm/tegra: Use standard GPL v2 license text drm/tegra: Relicense under GPL v2 drm/tegra: Relicense public header under MIT drm/tegra: Add eDP support gpu: host1x: export host1x_syncpt_incr_max() function drm/tegra: prime: Add vmap support

Dave Airlie committed 12 years ago

Commit 82c68b62 parents 243b930 d105a6c20 files · +2129 −109Browse files

Showing the changes to include/uapi (1 of 20 files). Show all

Unified · Split

include/uapi/drm/tegra_drm.h+15−9
@@ -1,17 +1,23 @@
11 /*
22 * Copyright (c) 2012-2013, NVIDIA CORPORATION. All rights reserved.
33 *
4− * This program is free software; you can redistribute it and/or modify it
5− * under the terms and conditions of the GNU General Public License,
6− * version 2, as published by the Free Software Foundation.
4+ * Permission is hereby granted, free of charge, to any person obtaining a
5+ * copy of this software and associated documentation files (the "Software"),
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:
710 *
8− * This program is distributed in the hope it will be useful, but WITHOUT
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.
11+ * The above copyright notice and this permission notice shall be included in
12+ * all copies or substantial portions of the Software.
1213 *
13− * You should have received a copy of the GNU General Public License
14− * along with this program. If not, see <http://www.gnu.org/licenses/>.
14+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
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.
1521 */
1622
1723 #ifndef _UAPI_TEGRA_DRM_H_