diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-04-05 10:13:08 +0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-04-05 10:13:08 +0400 |
| commit | 82c68b6ccd54117a87cb2d9b91c2ee6e1280cf9d (patch) | |
| tree | f7835f0e4a1884253cbd46bfdb7cbc4fa920b6cc /drivers/gpu/host1x | |
| parent | 243b930f8b228428c2a14ebbb09045041ed0bc70 (diff) | |
| parent | d105a6c97e43e35fd4f852928bb8a19df235c6e7 (diff) | |
| download | linux-82c68b6ccd54117a87cb2d9b91c2ee6e1280cf9d.tar.xz | |
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/host1x')
| -rw-r--r-- | drivers/gpu/host1x/syncpt.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/host1x/syncpt.c b/drivers/gpu/host1x/syncpt.c index bfb09d802abd..b10550ee1d89 100644 --- a/drivers/gpu/host1x/syncpt.c +++ b/drivers/gpu/host1x/syncpt.c @@ -102,6 +102,7 @@ u32 host1x_syncpt_incr_max(struct host1x_syncpt *sp, u32 incrs) { return (u32)atomic_add_return(incrs, &sp->max_val); } +EXPORT_SYMBOL(host1x_syncpt_incr_max); /* * Write cached syncpoint and waitbase values to hardware. |