| Message ID | 1483789151-6603-1-git-send-email-benjamin.gaignard@linaro.org |
|---|---|
| State | Accepted |
| Commit | 011cda589938e56eb93685dee8ead0bb0506f9e2 |
| Headers | show |
On Sat, Jan 07, 2017 at 12:39:11PM +0100, Benjamin Gaignard wrote: > 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> Applied with the Fixes: tag, as discussed on irc. Thanks, Daniel > --- > arch/blackfin/include/asm/vga.h | 1 + > drivers/gpu/drm/Kconfig | 4 ++-- > drivers/gpu/drm/ast/Kconfig | 2 +- > drivers/gpu/drm/bochs/Kconfig | 2 +- > drivers/gpu/drm/cirrus/Kconfig | 2 +- > drivers/gpu/drm/gma500/Kconfig | 2 +- > drivers/gpu/drm/hisilicon/hibmc/Kconfig | 2 +- > drivers/gpu/drm/mgag200/Kconfig | 2 +- > drivers/gpu/drm/nouveau/Kconfig | 2 +- > drivers/gpu/drm/qxl/Kconfig | 2 +- > drivers/gpu/drm/virtio/Kconfig | 2 +- > drivers/gpu/drm/vmwgfx/Kconfig | 2 +- > 12 files changed, 13 insertions(+), 12 deletions(-) > create mode 100644 arch/blackfin/include/asm/vga.h > > diff --git a/arch/blackfin/include/asm/vga.h b/arch/blackfin/include/asm/vga.h > new file mode 100644 > 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 505ca1d..6f3f9e6 100644 > --- 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 15f6ce7..9647e1f 100644 > --- 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 f739763..bd27180 100644 > --- 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 04b3c16..ca38098 100644 > --- 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 8906d67..df11582 100644 > --- 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 380622a..c7129dc 100644 > --- 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 520e5e6..db58578 100644 > --- 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 0f2f0af..c02a134 100644 > --- 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 da45b11..378da59 100644 > --- 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 81d1807..0c384d9 100644 > --- 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 fb7b82a..8c308da 100644 > --- 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 > -- > 1.9.1 >
diff --git a/arch/blackfin/include/asm/vga.h b/arch/blackfin/include/asm/vga.h new file mode 100644 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 505ca1d..6f3f9e6 100644 --- 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 15f6ce7..9647e1f 100644 --- 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 f739763..bd27180 100644 --- 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 04b3c16..ca38098 100644 --- 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 8906d67..df11582 100644 --- 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 380622a..c7129dc 100644 --- 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 520e5e6..db58578 100644 --- 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 0f2f0af..c02a134 100644 --- 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 da45b11..378da59 100644 --- 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 81d1807..0c384d9 100644 --- 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 fb7b82a..8c308da 100644 --- 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
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> --- arch/blackfin/include/asm/vga.h | 1 + drivers/gpu/drm/Kconfig | 4 ++-- drivers/gpu/drm/ast/Kconfig | 2 +- drivers/gpu/drm/bochs/Kconfig | 2 +- drivers/gpu/drm/cirrus/Kconfig | 2 +- drivers/gpu/drm/gma500/Kconfig | 2 +- drivers/gpu/drm/hisilicon/hibmc/Kconfig | 2 +- drivers/gpu/drm/mgag200/Kconfig | 2 +- drivers/gpu/drm/nouveau/Kconfig | 2 +- drivers/gpu/drm/qxl/Kconfig | 2 +- drivers/gpu/drm/virtio/Kconfig | 2 +- drivers/gpu/drm/vmwgfx/Kconfig | 2 +- 12 files changed, 13 insertions(+), 12 deletions(-) create mode 100644 arch/blackfin/include/asm/vga.h