drm/vram: fix Kconfig

select isn't recursive, so we can't turn on DRM_TTM + DRM_TTM_HELPER
in config DRM_VRAM_HELPER, we have to select them on the vram users
instead.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Link: http://patchwork.freedesktop.org/patch/msgid/20190904054740.20817-8-kraxel@redhat.com

diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index 1be8ad3..cd11a3b 100644 (file)
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -168,8 +168,6 @@ config DRM_TTM
 config DRM_VRAM_HELPER
        tristate
        depends on DRM
-       select DRM_TTM
-       select DRM_TTM_HELPER
        help
          Helpers for VRAM memory management
 

diff --git a/drivers/gpu/drm/ast/Kconfig b/drivers/gpu/drm/ast/Kconfig
index 829620d..fbcf2f4 100644 (file)
--- a/drivers/gpu/drm/ast/Kconfig
+++ b/drivers/gpu/drm/ast/Kconfig
@@ -4,6 +4,8 @@ config DRM_AST
        depends on DRM && PCI && MMU
        select DRM_KMS_HELPER
        select DRM_VRAM_HELPER
+       select DRM_TTM
+       select DRM_TTM_HELPER
        help
         Say yes for experimental AST GPU driver. Do not enable
         this driver without having a working -modesetting,

diff --git a/drivers/gpu/drm/bochs/Kconfig b/drivers/gpu/drm/bochs/Kconfig
index 32b043a..7bcdf29 100644 (file)
--- a/drivers/gpu/drm/bochs/Kconfig
+++ b/drivers/gpu/drm/bochs/Kconfig
@@ -4,6 +4,8 @@ config DRM_BOCHS
        depends on DRM && PCI && MMU
        select DRM_KMS_HELPER
        select DRM_VRAM_HELPER
+       select DRM_TTM
+       select DRM_TTM_HELPER
        help
          Choose this option for qemu.
          If M is selected the module will be called bochs-drm.

diff --git a/drivers/gpu/drm/hisilicon/hibmc/Kconfig b/drivers/gpu/drm/hisilicon/hibmc/Kconfig
index f20eedf..8ad9a5b 100644 (file)
--- a/drivers/gpu/drm/hisilicon/hibmc/Kconfig
+++ b/drivers/gpu/drm/hisilicon/hibmc/Kconfig
@@ -4,7 +4,8 @@ config DRM_HISI_HIBMC
        depends on DRM && PCI && MMU
        select DRM_KMS_HELPER
        select DRM_VRAM_HELPER
-
+       select DRM_TTM
+       select DRM_TTM_HELPER
        help
          Choose this option if you have a Hisilicon Hibmc soc chipset.
          If M is selected the module will be called hibmc-drm.

diff --git a/drivers/gpu/drm/mgag200/Kconfig b/drivers/gpu/drm/mgag200/Kconfig
index 76fee0f..aed11f4 100644 (file)
--- a/drivers/gpu/drm/mgag200/Kconfig
+++ b/drivers/gpu/drm/mgag200/Kconfig
@@ -4,6 +4,8 @@ config DRM_MGAG200
        depends on DRM && PCI && MMU
        select DRM_KMS_HELPER
        select DRM_VRAM_HELPER
+       select DRM_TTM
+       select DRM_TTM_HELPER
        help
         This is a KMS driver for the MGA G200 server chips, it
          does not support the original MGA G200 or any of the desktop

diff --git a/drivers/gpu/drm/vboxvideo/Kconfig b/drivers/gpu/drm/vboxvideo/Kconfig
index 56ba510..45fe135 100644 (file)
--- a/drivers/gpu/drm/vboxvideo/Kconfig
+++ b/drivers/gpu/drm/vboxvideo/Kconfig
@@ -4,6 +4,8 @@ config DRM_VBOXVIDEO
        depends on DRM && X86 && PCI
        select DRM_KMS_HELPER
        select DRM_VRAM_HELPER
+       select DRM_TTM
+       select DRM_TTM_HELPER
        select GENERIC_ALLOCATOR
        help
          This is a KMS driver for the virtual Graphics Card used in