drm: fix compilations issues introduced by "drm: allow to use mmuless SoC"

Removing MMU configuration flag from DRM make few automatic
build failed when they answer yes to all flags.

Add asm/vga.h file on Blackfin architecture to not broke compilation.

Signed-off-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>
Fixes: 62a0d98a188c ("drm: allow to use mmuless SoC")
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1483789151-6603-1-git-send-email-benjamin.gaignard@linaro.org

diff --git a/arch/blackfin/include/asm/vga.h b/arch/blackfin/include/asm/vga.h
new file mode 100644 (file)
index 0000000..89d82fd
--- /dev/null
+++ b/arch/blackfin/include/asm/vga.h
@@ -0,0 +1 @@
+#include <asm-generic/vga.h>

diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index 505ca1d262ee1364021ae097cb50757a00e8f650..6f3f9e68c21840089fd32fc4fc46c681a6986eac 100644 (file)
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -146,7 +146,7 @@ source "drivers/gpu/drm/arm/Kconfig"
 
 config DRM_RADEON
        tristate "ATI Radeon"
-       depends on DRM && PCI
+       depends on DRM && PCI && MMU
        select FW_LOADER
         select DRM_KMS_HELPER
         select DRM_TTM
@@ -166,7 +166,7 @@ source "drivers/gpu/drm/radeon/Kconfig"
 
 config DRM_AMDGPU
        tristate "AMD GPU"
-       depends on DRM && PCI
+       depends on DRM && PCI && MMU
        select FW_LOADER
         select DRM_KMS_HELPER
         select DRM_TTM

diff --git a/drivers/gpu/drm/ast/Kconfig b/drivers/gpu/drm/ast/Kconfig
index 15f6ce7acb2a21400b0d39765b90241a839f525a..9647e1f07088dcbe47e05547c934ae52caa2432c 100644 (file)
--- a/drivers/gpu/drm/ast/Kconfig
+++ b/drivers/gpu/drm/ast/Kconfig
@@ -1,6 +1,6 @@
 config DRM_AST
        tristate "AST server chips"
-       depends on DRM && PCI
+       depends on DRM && PCI && MMU
        select DRM_TTM
        select DRM_KMS_HELPER
        select DRM_TTM

diff --git a/drivers/gpu/drm/bochs/Kconfig b/drivers/gpu/drm/bochs/Kconfig
index f739763f47ce8cedd91205002e6f3fca02126739..bd2718015cdb2cb4ed3f8fc261eb95a57348a45d 100644 (file)
--- a/drivers/gpu/drm/bochs/Kconfig
+++ b/drivers/gpu/drm/bochs/Kconfig
@@ -1,6 +1,6 @@
 config DRM_BOCHS
        tristate "DRM Support for bochs dispi vga interface (qemu stdvga)"
-       depends on DRM && PCI
+       depends on DRM && PCI && MMU
        select DRM_KMS_HELPER
        select DRM_TTM
        help

diff --git a/drivers/gpu/drm/cirrus/Kconfig b/drivers/gpu/drm/cirrus/Kconfig
index 04b3c161dfae6fc9c643229f2a312eb44abca62a..ca3809851377ff92593e9c50cca327e76e143385 100644 (file)
--- a/drivers/gpu/drm/cirrus/Kconfig
+++ b/drivers/gpu/drm/cirrus/Kconfig
@@ -1,6 +1,6 @@
 config DRM_CIRRUS_QEMU
        tristate "Cirrus driver for QEMU emulated device"
-       depends on DRM && PCI
+       depends on DRM && PCI && MMU
        select DRM_KMS_HELPER
        select DRM_TTM
        help

diff --git a/drivers/gpu/drm/gma500/Kconfig b/drivers/gpu/drm/gma500/Kconfig
index 8906d67494fc47d165ec33714ffa62c5b29294d5..df11582f1efc5b92918e62807b0ce28987acf731 100644 (file)
--- a/drivers/gpu/drm/gma500/Kconfig
+++ b/drivers/gpu/drm/gma500/Kconfig
@@ -1,6 +1,6 @@
 config DRM_GMA500
        tristate "Intel GMA5/600 KMS Framebuffer"
-       depends on DRM && PCI && X86
+       depends on DRM && PCI && X86 && MMU
        select DRM_KMS_HELPER
        select DRM_TTM
        # GMA500 depends on ACPI_VIDEO when ACPI is enabled, just like i915

diff --git a/drivers/gpu/drm/hisilicon/hibmc/Kconfig b/drivers/gpu/drm/hisilicon/hibmc/Kconfig
index 380622a0da35c9fb9be4d735e85a357d96227d47..c7129dc3bdfc571a947a42aece91026e356ff3bf 100644 (file)
--- a/drivers/gpu/drm/hisilicon/hibmc/Kconfig
+++ b/drivers/gpu/drm/hisilicon/hibmc/Kconfig
@@ -1,6 +1,6 @@
 config DRM_HISI_HIBMC
        tristate "DRM Support for Hisilicon Hibmc"
-       depends on DRM && PCI
+       depends on DRM && PCI && MMU
        select DRM_KMS_HELPER
        select DRM_TTM
 

diff --git a/drivers/gpu/drm/mgag200/Kconfig b/drivers/gpu/drm/mgag200/Kconfig
index 520e5e668d6cefd1a6204c9b7626704ccf5f27bf..db58578719d23cd807e9a36125a5239b17094b71 100644 (file)
--- a/drivers/gpu/drm/mgag200/Kconfig
+++ b/drivers/gpu/drm/mgag200/Kconfig
@@ -1,6 +1,6 @@
 config DRM_MGAG200
        tristate "Kernel modesetting driver for MGA G200 server engines"
-       depends on DRM && PCI
+       depends on DRM && PCI && MMU
        select DRM_KMS_HELPER
        select DRM_TTM
        help

diff --git a/drivers/gpu/drm/nouveau/Kconfig b/drivers/gpu/drm/nouveau/Kconfig
index 0f2f0afc8f67e69311fabe1fabf6b4b04e7dd575..c02a13406a816e02e71cc61a5efcc89a143f3a63 100644 (file)
--- a/drivers/gpu/drm/nouveau/Kconfig
+++ b/drivers/gpu/drm/nouveau/Kconfig
@@ -1,6 +1,6 @@
 config DRM_NOUVEAU
        tristate "Nouveau (NVIDIA) cards"
-       depends on DRM && PCI
+       depends on DRM && PCI && MMU
         select FW_LOADER
        select DRM_KMS_HELPER
        select DRM_TTM

diff --git a/drivers/gpu/drm/qxl/Kconfig b/drivers/gpu/drm/qxl/Kconfig
index da45b11b66b8b075fb3e9e34fb64d92588383470..378da5918e6c14f77dfc8ae7914c7168bc7d0f94 100644 (file)
--- a/drivers/gpu/drm/qxl/Kconfig
+++ b/drivers/gpu/drm/qxl/Kconfig
@@ -1,6 +1,6 @@
 config DRM_QXL
        tristate "QXL virtual GPU"
-       depends on DRM && PCI
+       depends on DRM && PCI && MMU
        select DRM_KMS_HELPER
        select DRM_TTM
        select CRC32

diff --git a/drivers/gpu/drm/virtio/Kconfig b/drivers/gpu/drm/virtio/Kconfig
index 81d1807ac22816887101747952c35609a00f0765..0c384d9a2b75e3e47b5c064ef76ee64f6afbaaeb 100644 (file)
--- a/drivers/gpu/drm/virtio/Kconfig
+++ b/drivers/gpu/drm/virtio/Kconfig
@@ -1,6 +1,6 @@
 config DRM_VIRTIO_GPU
        tristate "Virtio GPU driver"
-       depends on DRM && VIRTIO
+       depends on DRM && VIRTIO && MMU
        select DRM_KMS_HELPER
        select DRM_TTM
        help

diff --git a/drivers/gpu/drm/vmwgfx/Kconfig b/drivers/gpu/drm/vmwgfx/Kconfig
index fb7b82aad763c4ae1b4f9cb954ecba2bc7344e6a..8c308dac99c5064e850c906d500ec87a8bf14ead 100644 (file)
--- a/drivers/gpu/drm/vmwgfx/Kconfig
+++ b/drivers/gpu/drm/vmwgfx/Kconfig
@@ -1,6 +1,6 @@
 config DRM_VMWGFX
        tristate "DRM driver for VMware Virtual GPU"
-       depends on DRM && PCI && X86
+       depends on DRM && PCI && X86 && MMU
        select FB_DEFERRED_IO
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA