drm/nouveau: support for probing platform devices

Add a platform driver for Nouveau devices declared using the device tree
or platform data. This driver currently supports GK20A on Tegra
platforms and is only compiled for these platforms if Nouveau is
enabled.

Nouveau will probe the chip type itself using the BOOT0 register, so all
this driver really needs to do is to make sure the module is powered and
its clocks active before calling nouveau_drm_platform_probe().

Heavily based on work done by Thierry Reding.

Signed-off-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/Kconfig b/drivers/gpu/drm/nouveau/Kconfig
index 637c29a33127f98ad341ba6d4aa097857c5ea9c9..40afc69a3778ab7012eded8d2e9a856c8f1ee3f6 100644 (file)
--- a/drivers/gpu/drm/nouveau/Kconfig
+++ b/drivers/gpu/drm/nouveau/Kconfig
@@ -1,5 +1,5 @@
 config DRM_NOUVEAU
-       tristate "Nouveau (nVidia) cards"
+       tristate "Nouveau (NVIDIA) cards"
        depends on DRM && PCI
         select FW_LOADER
        select DRM_KMS_HELPER
@@ -23,7 +23,15 @@ config DRM_NOUVEAU
        select THERMAL if ACPI && X86
        select ACPI_VIDEO if ACPI && X86
        help
-         Choose this option for open-source nVidia support.
+         Choose this option for open-source NVIDIA support.
+
+config NOUVEAU_PLATFORM_DRIVER
+       tristate "Nouveau (NVIDIA) SoC GPUs"
+       depends on DRM_NOUVEAU && ARCH_TEGRA
+       default y
+       help
+         Support for Nouveau platform driver, used for SoC GPUs as found
+         on NVIDIA Tegra K1.
 
 config NOUVEAU_DEBUG
        int "Maximum debug level"

diff --git a/drivers/gpu/drm/nouveau/Makefile b/drivers/gpu/drm/nouveau/Makefile
index e5c9886cea51775c3ba7cc49166bd0d1151daba2..8e74ae72891d555eecd75ad45d4fea0207cd75e6 100644 (file)
--- a/drivers/gpu/drm/nouveau/Makefile
+++ b/drivers/gpu/drm/nouveau/Makefile
@@ -354,3 +354,6 @@ nouveau-$(CONFIG_DRM_NOUVEAU_BACKLIGHT) += nouveau_backlight.o
 nouveau-$(CONFIG_DEBUG_FS) += nouveau_debugfs.o
 
 obj-$(CONFIG_DRM_NOUVEAU)+= nouveau.o
+
+# platform driver
+obj-$(CONFIG_NOUVEAU_PLATFORM_DRIVER) += nouveau_platform.o

diff --cc drivers/gpu/drm/nouveau/nouveau_drm.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nouveau_drm.h
Simple merge

diff --cc drivers/gpu/drm/nouveau/nouveau_platform.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nouveau_platform.h
Simple merge