aboutsummaryrefslogtreecommitdiff
path: root/drivers/gpu/Makefile
diff options
context:
space:
mode:
authorThierry Reding <treding@nvidia.com>2014-12-18 15:29:14 +0100
committerThierry Reding <treding@nvidia.com>2015-01-27 10:09:14 +0100
commitf4c5cf88fbd50e4779042268947b2e2f90c20484 (patch)
tree79a50b0a3ed21314f1893a7c9bea685df976b6d2 /drivers/gpu/Makefile
parent99d2cd81d7261e6ddd325189134faf752206bfe7 (diff)
downloadlinux-stericsson-f4c5cf88fbd50e4779042268947b2e2f90c20484.tar.gz
gpu: host1x: Provide a proper struct bus_type
Previously the struct bus_type exported by the host1x infrastructure was only a very basic skeleton. Turn that implementation into a more full- fledged bus to support proper probe ordering and power management. Note that the bus infrastructure needs to be available before any of the drivers can be registered. This is automatically ensured if all drivers are built as loadable modules (via symbol dependencies). If all drivers are built-in there are no such guarantees and the link order determines the initcall ordering. Adjust drivers/gpu/Makefile to make sure that the host1x bus infrastructure is initialized prior to any of its users (only drm/tegra currently). v2: Fix building host1x and tegra-drm as modules Reported-by: Dave Airlie <airlied@gmail.com> Reviewed-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Mark Zhang <markz@nvidia.com> Signed-off-by: Thierry Reding <treding@nvidia.com>
Diffstat (limited to 'drivers/gpu/Makefile')
-rw-r--r--drivers/gpu/Makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/Makefile b/drivers/gpu/Makefile
index 70da9eb52a42..e9ed439a5b65 100644
--- a/drivers/gpu/Makefile
+++ b/drivers/gpu/Makefile
@@ -1,3 +1,6 @@
-obj-y += drm/ vga/
+# drm/tegra depends on host1x, so if both drivers are built-in care must be
+# taken to initialize them in the correct order. Link order is the only way
+# to ensure this currently.
obj-$(CONFIG_TEGRA_HOST1X) += host1x/
+obj-y += drm/ vga/
obj-$(CONFIG_IMX_IPUV3_CORE) += ipu-v3/