[git pull] drm tegra for 4.12-rc1
From: Dave Airlie
Date: Thu May 04 2017 - 21:52:32 EST
Hi Linus,
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.
Dave.
The following changes since commit 8b03d1ed2c43a2ba5ef3381322ee4515b97381bf:
Merge branch 'linux-4.12' of git://github.com/skeggsb/linux into
drm-next (2017-05-02 04:46:01 +1000)
are available in the git repository at:
git://people.freedesktop.org/~airlied/linux
tags/drm-forgot-about-tegra-for-v4.12-rc1
for you to fetch changes up to 644b4930bf7e2adeffbe842e1097f7933c6a9158:
Merge tag 'drm/tegra/for-4.12-rc1' of
git://anongit.freedesktop.org/tegra/linux into drm-next (2017-05-05
11:47:01 +1000)
----------------------------------------------------------------
extra pull request because I missed tegra.
----------------------------------------------------------------
Alexandre Courbot (1):
drm/tegra: Add tiling FB modifiers
Arto Merilainen (2):
drm/tegra: Add falcon helper library
drm/tegra: Add VIC support
Dave Airlie (1):
Merge tag 'drm/tegra/for-4.12-rc1' of
git://anongit.freedesktop.org/tegra/linux into drm-next
Joerg Roedel (1):
iommu/iova: Fix compile error with CONFIG_IOMMU_IOVA=m
Marek Szyprowski (1):
iommu/iova: Consolidate code for adding new node to iovad domain rbtree
Mikko Perttunen (3):
gpu: host1x: Add IOMMU support
drm/tegra: Add Tegra DRM allocation API
dt-bindings: Add bindings for the Tegra VIC
Thierry Reding (10):
MAINTAINERS: Add related headers to IOMMU section
iommu: Add dummy implementations for !IOMMU_IOVA
Merge branch 'core' of git://git.kernel.org/.../joro/iommu into
drm/tegra/for-next
gpu: host1x: Fix potential out-of-bounds access
drm/tegra: Enable IOVA API when IOMMU support is enabled
drm/tegra: Protect IOMMU operations by mutex
drm/tegra: Don't leak kernel pointer to userspace
gpu: host1x: Sort includes alphabetically
gpu: host1x: Support module reset
gpu: host1x: Fix host1x driver shutdown
.../display/tegra/nvidia,tegra20-host1x.txt | 13 +
MAINTAINERS | 2 +
drivers/gpu/drm/tegra/Kconfig | 1 +
drivers/gpu/drm/tegra/Makefile | 4 +-
drivers/gpu/drm/tegra/drm.c | 283 ++++++++++++---
drivers/gpu/drm/tegra/drm.h | 15 +-
drivers/gpu/drm/tegra/falcon.c | 259 ++++++++++++++
drivers/gpu/drm/tegra/falcon.h | 127 +++++++
drivers/gpu/drm/tegra/fb.c | 23 +-
drivers/gpu/drm/tegra/gem.c | 12 +-
drivers/gpu/drm/tegra/vic.c | 396 +++++++++++++++++++++
drivers/gpu/drm/tegra/vic.h | 31 ++
drivers/gpu/host1x/bus.c | 68 ++--
drivers/gpu/host1x/cdma.c | 74 +++-
drivers/gpu/host1x/cdma.h | 6 +-
drivers/gpu/host1x/dev.c | 76 +++-
drivers/gpu/host1x/dev.h | 14 +-
drivers/gpu/host1x/hw/cdma_hw.c | 16 +-
drivers/gpu/host1x/job.c | 72 +++-
drivers/gpu/host1x/job.h | 1 +
drivers/gpu/host1x/syncpt.c | 2 +-
drivers/iommu/iova.c | 87 ++---
include/linux/host1x.h | 1 +
include/linux/iova.h | 91 +++++
include/uapi/drm/drm_fourcc.h | 45 +++
25 files changed, 1517 insertions(+), 202 deletions(-)
create mode 100644 drivers/gpu/drm/tegra/falcon.c
create mode 100644 drivers/gpu/drm/tegra/falcon.h
create mode 100644 drivers/gpu/drm/tegra/vic.c
create mode 100644 drivers/gpu/drm/tegra/vic.h