diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-04-05 02:13:08 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-04-05 02:13:08 -0400 |
| commit | 82c68b6ccd54117a87cb2d9b91c2ee6e1280cf9d (patch) | |
| tree | f7835f0e4a1884253cbd46bfdb7cbc4fa920b6cc /drivers/gpu/drm/tegra/dsi.h | |
| parent | 243b930f8b228428c2a14ebbb09045041ed0bc70 (diff) | |
| parent | d105a6c97e43e35fd4f852928bb8a19df235c6e7 (diff) | |
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
Diffstat (limited to 'drivers/gpu/drm/tegra/dsi.h')
| -rw-r--r-- | drivers/gpu/drm/tegra/dsi.h | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/drivers/gpu/drm/tegra/dsi.h b/drivers/gpu/drm/tegra/dsi.h index 00e79c1f448c..1db5cc24ea91 100644 --- a/drivers/gpu/drm/tegra/dsi.h +++ b/drivers/gpu/drm/tegra/dsi.h | |||
| @@ -1,23 +1,9 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (C) 2013 NVIDIA Corporation | 2 | * Copyright (C) 2013 NVIDIA Corporation |
| 3 | * | 3 | * |
| 4 | * Permission to use, copy, modify, distribute, and sell this software and its | 4 | * This program is free software; you can redistribute it and/or modify |
| 5 | * documentation for any purpose is hereby granted without fee, provided that | 5 | * it under the terms of the GNU General Public License version 2 as |
| 6 | * the above copyright notice appear in all copies and that both that copyright | 6 | * published by the Free Software Foundation. |
| 7 | * notice and this permission notice appear in supporting documentation, and | ||
| 8 | * that the name of the copyright holders not be used in advertising or | ||
| 9 | * publicity pertaining to distribution of the software without specific, | ||
| 10 | * written prior permission. The copyright holders make no representations | ||
| 11 | * about the suitability of this software for any purpose. It is provided "as | ||
| 12 | * is" without express or implied warranty. | ||
| 13 | * | ||
| 14 | * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, | ||
| 15 | * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO | ||
| 16 | * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR | ||
| 17 | * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, | ||
| 18 | * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER | ||
| 19 | * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE | ||
| 20 | * OF THIS SOFTWARE. | ||
| 21 | */ | 7 | */ |
| 22 | 8 | ||
| 23 | #ifndef DRM_TEGRA_DSI_H | 9 | #ifndef DRM_TEGRA_DSI_H |