mirror of
				https://github.com/torvalds/linux.git
				synced 2025-11-04 10:40:15 +02:00 
			
		
		
		
	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: 62a0d98a18 ("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
			
			
This commit is contained in:
		
							parent
							
								
									11b3c20bdd
								
							
						
					
					
						commit
						011cda5899
					
				
					 12 changed files with 13 additions and 12 deletions
				
			
		
							
								
								
									
										1
									
								
								arch/blackfin/include/asm/vga.h
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								arch/blackfin/include/asm/vga.h
									
									
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1 @@
 | 
			
		|||
#include <asm-generic/vga.h>
 | 
			
		||||
| 
						 | 
				
			
			@ -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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in a new issue