diff options
author | Dave Airlie <airlied@redhat.com> | 2013-04-22 06:49:07 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2013-04-22 06:49:07 -0400 |
commit | f9df7ea33c87291365d943828bec852874f15c2f (patch) | |
tree | 53afb4d74f0af01555a13d440d978dff3318c6f3 /drivers/gpu/host1x/hw/host1x01.h | |
parent | ce83adf78bbbe6bdcd99f0b97212337ce6b84940 (diff) | |
parent | e1041ca41670dc5502deee1fa3517dbaf9c0a09e (diff) |
Merge tag 'drm/tegra/for-3.10' of git://anongit.freedesktop.org/tegra/linux into drm-next
drm/tegra: Changes for v3.10-rc1
The bulk of this pull-request is the host1x series that has been in the
works for a few months. The current implementation looks good and has
been tested by several independent parties. So far no issues have been
found. To be on the safe side, the new Tegra-specific DRM IOCTLs depend
on staging in order to give some amount of flexibility to change them
just in case. The plan is to remove that dependency once more userspace
exists to verify the adequacy of the IOCTLs.
Currently only the 2D engine is supported, but patches are in the works
to enable 3D support on top of this framework as well. Various bits of
open-source userspace exist to test the 2D and 3D support[0]. This is
still a bit immature but it allows to verify that the kernel interfaces
work properly.
To round things off there are two smaller cleanup patches, one of them
adding a new pixel format and the other removing a redundent Kconfig
dependency.
[0]: https://github.com/grate-driver
* tag 'drm/tegra/for-3.10' of git://anongit.freedesktop.org/tegra/linux:
drm/tegra: don't depend on OF
drm/tegra: Support the XBGR8888 pixelformat
drm/tegra: Add gr2d device
gpu: host1x: drm: Add memory manager and fb
gpu: host1x: Remove second host1x driver
gpu: host1x: drm: Rename host1x to host1x_drm
drm/tegra: Move drm to live under host1x
gpu: host1x: Add debug support
gpu: host1x: Add channel support
gpu: host1x: Add syncpoint wait and interrupts
gpu: host1x: Add host1x driver
Diffstat (limited to 'drivers/gpu/host1x/hw/host1x01.h')
-rw-r--r-- | drivers/gpu/host1x/hw/host1x01.h | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/drivers/gpu/host1x/hw/host1x01.h b/drivers/gpu/host1x/hw/host1x01.h new file mode 100644 index 000000000000..2706b6743250 --- /dev/null +++ b/drivers/gpu/host1x/hw/host1x01.h | |||
@@ -0,0 +1,25 @@ | |||
1 | /* | ||
2 | * Host1x init for T20 and T30 Architecture Chips | ||
3 | * | ||
4 | * Copyright (c) 2011-2013, NVIDIA Corporation. | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or modify it | ||
7 | * under the terms and conditions of the GNU General Public License, | ||
8 | * version 2, as published by the Free Software Foundation. | ||
9 | * | ||
10 | * This program is distributed in the hope it will be useful, but WITHOUT | ||
11 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
12 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for | ||
13 | * more details. | ||
14 | * | ||
15 | * You should have received a copy of the GNU General Public License | ||
16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
17 | */ | ||
18 | #ifndef HOST1X_HOST1X01_H | ||
19 | #define HOST1X_HOST1X01_H | ||
20 | |||
21 | struct host1x; | ||
22 | |||
23 | int host1x01_init(struct host1x *host); | ||
24 | |||
25 | #endif /* HOST1X_HOST1X01_H_ */ | ||