On Thu, Oct 7, 2021 at 11:51 AM Geert Uytterhoeven geert@linux-m68k.org wrote:
On Wed, Oct 6, 2021 at 9:28 AM Christian König christian.koenig@amd.com wrote:
Am 06.10.21 um 09:20 schrieb Stephen Rothwell:
On Tue, 5 Oct 2021 22:48:03 -0700 Randy Dunlap rdunlap@infradead.org wrote:
on i386:
ld: drivers/gpu/drm/msm/hdmi/hdmi_phy.o:(.rodata+0x3f0): undefined reference to `msm_hdmi_phy_8996_cfg'
I ran into the same thing now as well. E_TEST) && COMMON_CLK
I'd make that:
- depends on DRM + depends on COMMON_CLK && DRM && IOMMU_SUPPORT depends on ARCH_QCOM || SOC_IMX5 || COMPILE_TEST - depends on IOMMU_SUPPORT - depends on (OF && COMMON_CLK) || COMPILE_TEST + depends on OF || COMPILE_TESTto keep a better separation between hard and soft dependencies.
Note that the "depends on OF || COMPILE_TEST" can even be deleted, as the dependency on ARCH_QCOM || SOC_IMX5 implies OF.
Looks good to me, I would also drop that last line in this case, and maybe add this change as building without COMMON_CLK is no longer possible:
diff --git a/drivers/gpu/drm/msm/Makefile b/drivers/gpu/drm/msm/Makefile index 904535eda0c4..a5d87e03812f 100644 --- a/drivers/gpu/drm/msm/Makefile +++ b/drivers/gpu/drm/msm/Makefile @@ -116,10 +116,10 @@ msm-$(CONFIG_DRM_MSM_DP)+= dp/dp_aux.o \ dp/dp_power.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_FBDEV_EMULATION) += msm_fbdev.o \ + disp/mdp4/mdp4_lvds_pll.o \ + hdmi/hdmi_pll_8960.o \ + hdmi/hdmi_phy_8996.o
msm-$(CONFIG_DRM_MSM_HDMI_HDCP) += hdmi/hdmi_hdcp.o
Has anyone submitted a patch already, or should I send the version that I am using locally now?
Arnd