tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

authored by

Benjamin Gaignard and committed by
Daniel Vetter 011cda58 11b3c20b

+13 -12
+1
arch/blackfin/include/asm/vga.h
··· 1 + #include <asm-generic/vga.h>
+2 -2
drivers/gpu/drm/Kconfig
··· 146 146 147 147 config DRM_RADEON 148 148 tristate "ATI Radeon" 149 - depends on DRM && PCI 149 + depends on DRM && PCI && MMU 150 150 select FW_LOADER 151 151 select DRM_KMS_HELPER 152 152 select DRM_TTM ··· 166 166 167 167 config DRM_AMDGPU 168 168 tristate "AMD GPU" 169 - depends on DRM && PCI 169 + depends on DRM && PCI && MMU 170 170 select FW_LOADER 171 171 select DRM_KMS_HELPER 172 172 select DRM_TTM
+1 -1
drivers/gpu/drm/ast/Kconfig
··· 1 1 config DRM_AST 2 2 tristate "AST server chips" 3 - depends on DRM && PCI 3 + depends on DRM && PCI && MMU 4 4 select DRM_TTM 5 5 select DRM_KMS_HELPER 6 6 select DRM_TTM
+1 -1
drivers/gpu/drm/bochs/Kconfig
··· 1 1 config DRM_BOCHS 2 2 tristate "DRM Support for bochs dispi vga interface (qemu stdvga)" 3 - depends on DRM && PCI 3 + depends on DRM && PCI && MMU 4 4 select DRM_KMS_HELPER 5 5 select DRM_TTM 6 6 help
+1 -1
drivers/gpu/drm/cirrus/Kconfig
··· 1 1 config DRM_CIRRUS_QEMU 2 2 tristate "Cirrus driver for QEMU emulated device" 3 - depends on DRM && PCI 3 + depends on DRM && PCI && MMU 4 4 select DRM_KMS_HELPER 5 5 select DRM_TTM 6 6 help
+1 -1
drivers/gpu/drm/gma500/Kconfig
··· 1 1 config DRM_GMA500 2 2 tristate "Intel GMA5/600 KMS Framebuffer" 3 - depends on DRM && PCI && X86 3 + depends on DRM && PCI && X86 && MMU 4 4 select DRM_KMS_HELPER 5 5 select DRM_TTM 6 6 # GMA500 depends on ACPI_VIDEO when ACPI is enabled, just like i915
+1 -1
drivers/gpu/drm/hisilicon/hibmc/Kconfig
··· 1 1 config DRM_HISI_HIBMC 2 2 tristate "DRM Support for Hisilicon Hibmc" 3 - depends on DRM && PCI 3 + depends on DRM && PCI && MMU 4 4 select DRM_KMS_HELPER 5 5 select DRM_TTM 6 6
+1 -1
drivers/gpu/drm/mgag200/Kconfig
··· 1 1 config DRM_MGAG200 2 2 tristate "Kernel modesetting driver for MGA G200 server engines" 3 - depends on DRM && PCI 3 + depends on DRM && PCI && MMU 4 4 select DRM_KMS_HELPER 5 5 select DRM_TTM 6 6 help
+1 -1
drivers/gpu/drm/nouveau/Kconfig
··· 1 1 config DRM_NOUVEAU 2 2 tristate "Nouveau (NVIDIA) cards" 3 - depends on DRM && PCI 3 + depends on DRM && PCI && MMU 4 4 select FW_LOADER 5 5 select DRM_KMS_HELPER 6 6 select DRM_TTM
+1 -1
drivers/gpu/drm/qxl/Kconfig
··· 1 1 config DRM_QXL 2 2 tristate "QXL virtual GPU" 3 - depends on DRM && PCI 3 + depends on DRM && PCI && MMU 4 4 select DRM_KMS_HELPER 5 5 select DRM_TTM 6 6 select CRC32
+1 -1
drivers/gpu/drm/virtio/Kconfig
··· 1 1 config DRM_VIRTIO_GPU 2 2 tristate "Virtio GPU driver" 3 - depends on DRM && VIRTIO 3 + depends on DRM && VIRTIO && MMU 4 4 select DRM_KMS_HELPER 5 5 select DRM_TTM 6 6 help
+1 -1
drivers/gpu/drm/vmwgfx/Kconfig
··· 1 1 config DRM_VMWGFX 2 2 tristate "DRM driver for VMware Virtual GPU" 3 - depends on DRM && PCI && X86 3 + depends on DRM && PCI && X86 && MMU 4 4 select FB_DEFERRED_IO 5 5 select FB_CFB_FILLRECT 6 6 select FB_CFB_COPYAREA