Commit afece15a authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Rob Clark
Browse files

drm: msm: fix building without CONFIG_COMMON_CLK 



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: b3ed524f ("drm/msm: allow compile_test on !ARM")
Reported-by: default avatarRandy Dunlap <rdunlap@infradead.org>
Suggested-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Reviewed-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20211013144308.2248978-1-arnd@kernel.org


Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
parent e4840d53

drivers/gpu/drm/msm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/gpu/drm/msm/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -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 \
@@ -116,9 +119,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