drm/msm: rearrange symbol selection

Move symbol selection to be more fine grained: select DP helpers only if
DP driver is also enabled, move KMS and display helpers to the newly
introduced DRM_MSM_KMS.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Patchwork: https://patchwork.freedesktop.org/patch/662589/
Signed-off-by: Rob Clark <robin.clark@oss.qualcomm.com>

diff --git a/drivers/gpu/drm/msm/Kconfig b/drivers/gpu/drm/msm/Kconfig
index 3a0a69f41153c5f32670e07f9728d9b9e947be92..250246f81ea94f01a016e8938f08e1aa4ce02442 100644 (file)
--- a/drivers/gpu/drm/msm/Kconfig
+++ b/drivers/gpu/drm/msm/Kconfig
@@ -15,19 +15,9 @@ config DRM_MSM
        select IOMMU_IO_PGTABLE
        select QCOM_MDT_LOADER if ARCH_QCOM
        select REGULATOR
-       select DRM_CLIENT_SELECTION
-       select DRM_DISPLAY_DP_AUX_BUS
-       select DRM_DISPLAY_DP_HELPER
-       select DRM_DISPLAY_HELPER
-       select DRM_BRIDGE_CONNECTOR
        select DRM_EXEC
        select DRM_GPUVM
-       select DRM_KMS_HELPER
-       select DRM_PANEL
-       select DRM_BRIDGE
-       select DRM_PANEL_BRIDGE
        select DRM_SCHED
-       select FB_SYSMEM_HELPERS if DRM_FBDEV_EMULATION
        select SHMEM
        select TMPFS
        select QCOM_SCM
@@ -71,10 +61,18 @@ config DRM_MSM_VALIDATE_XML
 config DRM_MSM_KMS
        def_bool n
        depends on DRM_MSM
+       select DRM_BRIDGE
+       select DRM_BRIDGE_CONNECTOR
+       select DRM_CLIENT_SELECTION
+       select DRM_DISPLAY_HELPER
+       select DRM_KMS_HELPER
+       select DRM_PANEL
+       select DRM_PANEL_BRIDGE
 
 config DRM_MSM_KMS_FBDEV
        def_bool DRM_FBDEV_EMULATION
        depends on DRM_MSM_KMS
+       select FB_SYSMEM_HELPERS
 
 config DRM_MSM_MDSS
        bool
@@ -120,6 +118,8 @@ config DRM_MSM_DP
        depends on DRM_MSM_KMS
        select DRM_DISPLAY_HDMI_AUDIO_HELPER
        select RATIONAL
+       select DRM_DISPLAY_DP_AUX_BUS
+       select DRM_DISPLAY_DP_HELPER
        default y
        help
          Compile in support for DP driver in MSM DRM driver. DP external