diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-05 17:18:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-05 17:18:44 -0700 |
| commit | 1062ae4982cabbf60f89b4e069fbb7def7edc8f7 (patch) | |
| tree | 01f6944b55d5b69615234f8c1f52b4e721f3d8e6 /include/linux/host1x.h | |
| parent | 1a5fb64fee203f9f5a9274c67ddbb821a29f723f (diff) | |
| parent | 644b4930bf7e2adeffbe842e1097f7933c6a9158 (diff) | |
| download | lwn-1062ae4982cabbf60f89b4e069fbb7def7edc8f7.tar.gz lwn-1062ae4982cabbf60f89b4e069fbb7def7edc8f7.zip | |
Merge tag 'drm-forgot-about-tegra-for-v4.12-rc1' of git://people.freedesktop.org/~airlied/linux
Pull drm tegra updates from Dave Airlie:
"I missed a pull request from Thierry, this stuff has been in
linux-next for a while anyways.
It does contain a branch from the iommu tree, but Thierry said it
should be fine"
* tag 'drm-forgot-about-tegra-for-v4.12-rc1' of git://people.freedesktop.org/~airlied/linux:
gpu: host1x: Fix host1x driver shutdown
gpu: host1x: Support module reset
gpu: host1x: Sort includes alphabetically
drm/tegra: Add VIC support
dt-bindings: Add bindings for the Tegra VIC
drm/tegra: Add falcon helper library
drm/tegra: Add Tegra DRM allocation API
drm/tegra: Add tiling FB modifiers
drm/tegra: Don't leak kernel pointer to userspace
drm/tegra: Protect IOMMU operations by mutex
drm/tegra: Enable IOVA API when IOMMU support is enabled
gpu: host1x: Add IOMMU support
gpu: host1x: Fix potential out-of-bounds access
iommu/iova: Fix compile error with CONFIG_IOMMU_IOVA=m
iommu: Add dummy implementations for !IOMMU_IOVA
MAINTAINERS: Add related headers to IOMMU section
iommu/iova: Consolidate code for adding new node to iovad domain rbtree
Diffstat (limited to 'include/linux/host1x.h')
| -rw-r--r-- | include/linux/host1x.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/host1x.h b/include/linux/host1x.h index 1ffbf2a8cb99..3d04aa1dc83e 100644 --- a/include/linux/host1x.h +++ b/include/linux/host1x.h @@ -26,6 +26,7 @@ enum host1x_class { HOST1X_CLASS_HOST1X = 0x1, HOST1X_CLASS_GR2D = 0x51, HOST1X_CLASS_GR2D_SB = 0x52, + HOST1X_CLASS_VIC = 0x5D, HOST1X_CLASS_GR3D = 0x60, }; |