[PATCH] drm: msm: fix building without CONFIG_COMMON_CLK

[Dmitry Baryshkov]

On 13/10/2021 17:42, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd at arndb.de>
> 
> When CONFIG_COMMON_CLOCK is disabled, the 8996 specific
> phy code is left out, which results in a link failure:
> 
> ld: drivers/gpu/drm/msm/hdmi/hdmi_phy.o:(.rodata+0x3f0): undefined reference to `msm_hdmi_phy_8996_cfg'
> 
> This was only exposed after it became possible to build
> test the driver without the clock interfaces.
> 
> Make COMMON_CLK a hard dependency for compile testing,
> and simplify it a little based on that.
> 
> Fixes: b3ed524f84f5 ("drm/msm: allow compile_test on !ARM")
> Reported-by: Randy Dunlap <rdunlap at infradead.org>
> Suggested-by: Geert Uytterhoeven <geert at linux-m68k.org>
> Signed-off-by: Arnd Bergmann <arnd at arndb.de>

This drops dependency on CONFIG_OF. While ARM64 selects OF, pure ARM 
does not.

With that fixed:
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov at linaro.org>

> ---
>   drivers/gpu/drm/msm/Kconfig  | 2 +-
>   drivers/gpu/drm/msm/Makefile | 6 +++---
>   2 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/gpu/drm/msm/Kconfig b/drivers/gpu/drm/msm/Kconfig
> index f5107b6ded7b..cb204912e0f4 100644
> --- a/drivers/gpu/drm/msm/Kconfig
> +++ b/drivers/gpu/drm/msm/Kconfig
> @@ -4,8 +4,8 @@ config DRM_MSM
>   	tristate "MSM DRM"
>   	depends on DRM
>   	depends on ARCH_QCOM || SOC_IMX5 || COMPILE_TEST
> +	depends on COMMON_CLK
>   	depends on IOMMU_SUPPORT
> -	depends on (OF && COMMON_CLK) || COMPILE_TEST
>   	depends on QCOM_OCMEM || QCOM_OCMEM=n
>   	depends on QCOM_LLCC || QCOM_LLCC=n
>   	depends on QCOM_COMMAND_DB || QCOM_COMMAND_DB=n
> diff --git a/drivers/gpu/drm/msm/Makefile b/drivers/gpu/drm/msm/Makefile
> index 904535eda0c4..bbee22b54b0c 100644
> --- a/drivers/gpu/drm/msm/Makefile
> +++ b/drivers/gpu/drm/msm/Makefile
> @@ -23,8 +23,10 @@ msm-y := \
>   	hdmi/hdmi_i2c.o \
>   	hdmi/hdmi_phy.o \
>   	hdmi/hdmi_phy_8960.o \
> +	hdmi/hdmi_phy_8996.o \
>   	hdmi/hdmi_phy_8x60.o \
>   	hdmi/hdmi_phy_8x74.o \
> +	hdmi/hdmi_pll_8960.o \
>   	edp/edp.o \
>   	edp/edp_aux.o \
>   	edp/edp_bridge.o \
> @@ -37,6 +39,7 @@ msm-y := \
>   	disp/mdp4/mdp4_dtv_encoder.o \
>   	disp/mdp4/mdp4_lcdc_encoder.o \
>   	disp/mdp4/mdp4_lvds_connector.o \
> +	disp/mdp4/mdp4_lvds_pll.o \
>   	disp/mdp4/mdp4_irq.o \
>   	disp/mdp4/mdp4_kms.o \
>   	disp/mdp4/mdp4_plane.o \
> @@ -117,9 +120,6 @@ msm-$(CONFIG_DRM_MSM_DP)+= dp/dp_aux.o \
>   	dp/dp_audio.o
>   
>   msm-$(CONFIG_DRM_FBDEV_EMULATION) += msm_fbdev.o
> -msm-$(CONFIG_COMMON_CLK) += disp/mdp4/mdp4_lvds_pll.o
> -msm-$(CONFIG_COMMON_CLK) += hdmi/hdmi_pll_8960.o
> -msm-$(CONFIG_COMMON_CLK) += hdmi/hdmi_phy_8996.o
>   
>   msm-$(CONFIG_DRM_MSM_HDMI_HDCP) += hdmi/hdmi_hdcp.o
>   
> 


-- 
With best wishes
Dmitry