diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-12-13 14:27:41 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-12-13 14:27:41 +1000 |
| commit | a77a1ad11ef3dc6dd0ae6601eb055495374bdce5 (patch) | |
| tree | 29cf8ae34fa31bf42e3a17723d04a23d472ead8e /drivers/gpu/host1x/dev.h | |
| parent | bdda9dd67445707a39ebb6d2be84dfb89ef0dea1 (diff) | |
| parent | 585ee0f27ef7b8db46807b960388b7e58b60766d (diff) | |
| download | linux-a77a1ad11ef3dc6dd0ae6601eb055495374bdce5.tar.bz2 | |
Merge tag 'drm/tegra/for-4.10-rc1' of git://anongit.freedesktop.org/tegra/linux into drm-next
drm/tegra: Changes for v4.10-rc1
This has a couple of fixes for IOMMU support and some fixes for error
handling.
* tag 'drm/tegra/for-4.10-rc1' of git://anongit.freedesktop.org/tegra/linux:
drm/tegra: Set sgt pointer in BO pin
drm/tegra: Support kernel mappings with IOMMU
gpu: host1x: Add locking to syncpt
gpu: host1x: Store device address to all bufs
drm/tegra: gem: Remove some dead code
drm/tegra: sor: No need to free devm_ allocated memory
drm/tegra: Fix error handling
drm/tegra: dpaux: Fix error handling
Diffstat (limited to 'drivers/gpu/host1x/dev.h')
| -rw-r--r-- | drivers/gpu/host1x/dev.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/host1x/dev.h b/drivers/gpu/host1x/dev.h index 5220510f39da..06dd4f85125f 100644 --- a/drivers/gpu/host1x/dev.h +++ b/drivers/gpu/host1x/dev.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2013, NVIDIA Corporation. + * Copyright (c) 2012-2015, NVIDIA Corporation. * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License, @@ -120,6 +120,7 @@ struct host1x { struct host1x_syncpt *nop_sp; + struct mutex syncpt_mutex; struct mutex chlist_mutex; struct host1x_channel chlist; unsigned long allocated_channels; |