[PATCH 1/3] drm/msm/hdmi: fix build without CONFIG_COMMON_CLK

[PATCH 1/3] drm/msm/hdmi: fix build without CONFIG_COMMON_CLK

[Jackie Liu]

From: Jackie Liu <liuyun01@kylinos.cn>

HDMI 8996 PHY/PLL support need common clk. avoid like:

[...]
x86_64-linux-gnu-ld: drivers/gpu/drm/msm/hdmi/hdmi_phy.o:(.rodata+0x3e0): undefined reference to `msm_hdmi_phy_8996_cfg'

Fixes: e17afdceb4f2 ("drm/msm/hdmi: HDMI 8996 PHY/PLL support")
Reported-by: kernelbot <kernel-bot@kylinos.cn>
Signed-off-by: Jackie Liu <liuyun01@kylinos.cn>
---
 drivers/gpu/drm/msm/hdmi/hdmi_phy.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/gpu/drm/msm/hdmi/hdmi_phy.c b/drivers/gpu/drm/msm/hdmi/hdmi_phy.c
index 16b0e8836d27..84d7f79f1aa8 100644
--- a/drivers/gpu/drm/msm/hdmi/hdmi_phy.c
+++ b/drivers/gpu/drm/msm/hdmi/hdmi_phy.c
@@ -192,8 +192,10 @@ static const struct of_device_id msm_hdmi_phy_dt_match[] = {
 	  .data = &msm_hdmi_phy_8x74_cfg },
 	{ .compatible = "qcom,hdmi-phy-8084",
 	  .data = &msm_hdmi_phy_8x74_cfg },
+#ifdef CONFIG_COMMON_CLK
 	{ .compatible = "qcom,hdmi-phy-8996",
 	  .data = &msm_hdmi_phy_8996_cfg },
+#endif
 	{}
 };
 
-- 
2.25.1

[PATCH 2/3] drm/msm/dp: displayPort driver need algorithm rational

[Jackie Liu]

From: Jackie Liu <liuyun01@kylinos.cn>

Let's select RATIONAL with dp driver. avoid like:

[...]
x86_64-linux-gnu-ld: drivers/gpu/drm/msm/dp/dp_catalog.o: in function `dp_catalog_ctrl_config_msa':
dp_catalog.c:(.text+0x57e): undefined reference to `rational_best_approximation'

Fixes: c943b4948b58 ("drm/msm/dp: add displayPort driver support")
Reported-by: kernelbot <kernel-bot@kylinos.cn>
Signed-off-by: Jackie Liu <liuyun01@kylinos.cn>
---
 drivers/gpu/drm/msm/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/msm/Kconfig b/drivers/gpu/drm/msm/Kconfig
index ae11061727ff..617dcb799156 100644
--- a/drivers/gpu/drm/msm/Kconfig
+++ b/drivers/gpu/drm/msm/Kconfig
@@ -65,6 +65,7 @@ config DRM_MSM_HDMI_HDCP
 config DRM_MSM_DP
 	bool "Enable DisplayPort support in MSM DRM driver"
 	depends on DRM_MSM
+	select RATIONAL
 	default y
 	help
 	  Compile in support for DP driver in MSM DRM driver. DP external
-- 
2.25.1

[PATCH 3/3] drm/msm: some features need to be forced to rely on COMMON_CLK

[Jackie Liu]

From: Jackie Liu <liuyun01@kylinos.cn>

In fact, this will not cause any problems, but when COMPILE_TEST is
enabled, COMMON_CLK may not be selected, The CI system will report
some compilation errors. even if that is not issue, but we better fix
him.

[...]
x86_64-linux-gnu-ld: drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm.o: in function `pll_28nm_register':
dsi_phy_28nm.c:(.text+0x868): undefined reference to `devm_clk_hw_register'
x86_64-linux-gnu-ld: dsi_phy_28nm.c:(.text+0x90c): undefined reference to `__devm_clk_hw_register_divider'
x86_64-linux-gnu-ld: dsi_phy_28nm.c:(.text+0x979): undefined reference to `devm_clk_hw_register_fixed_factor'
x86_64-linux-gnu-ld: dsi_phy_28nm.c:(.text+0x9f8): undefined reference to `__devm_clk_hw_register_divider'
x86_64-linux-gnu-ld: dsi_phy_28nm.c:(.text+0xab5): undefined reference to `__devm_clk_hw_register_mux'
x86_64-linux-gnu-ld: dsi_phy_28nm.c:(.text+0xb1e): undefined reference to `devm_clk_hw_register_fixed_factor'
x86_64-linux-gnu-ld: drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm.o: in function `dsi_28nm_pll_save_state':
dsi_phy_28nm.c:(.text+0x1234): undefined reference to `clk_hw_get_rate'
x86_64-linux-gnu-ld: drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.o: in function `dsi_28nm_pll_save_state':
dsi_phy_28nm_8960.c:(.text+0x408): undefined reference to `clk_hw_get_rate'
x86_64-linux-gnu-ld: drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.o: in function `clk_bytediv_round_rate':
dsi_phy_28nm_8960.c:(.text+0x483): undefined reference to `clk_hw_get_parent'
x86_64-linux-gnu-ld: dsi_phy_28nm_8960.c:(.text+0x48e): undefined reference to `clk_hw_round_rate'
x86_64-linux-gnu-ld: drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.o: in function `pll_28nm_register':
dsi_phy_28nm_8960.c:(.text+0x681): undefined reference to `devm_clk_hw_register'
x86_64-linux-gnu-ld: dsi_phy_28nm_8960.c:(.text+0x735): undefined reference to `devm_clk_hw_register'
x86_64-linux-gnu-ld: dsi_phy_28nm_8960.c:(.text+0x796): undefined reference to `__devm_clk_hw_register_divider'
x86_64-linux-gnu-ld: drivers/gpu/drm/msm/dsi/phy/dsi_phy_10nm.o: in function `pll_10nm_register':
dsi_phy_10nm.c:(.text+0x705): undefined reference to `devm_clk_hw_register'
x86_64-linux-gnu-ld: dsi_phy_10nm.c:(.text+0x7b0): undefined reference to `__devm_clk_hw_register_divider'
x86_64-linux-gnu-ld: dsi_phy_10nm.c:(.text+0x83a): undefined reference to `__devm_clk_hw_register_divider'
x86_64-linux-gnu-ld: dsi_phy_10nm.c:(.text+0x8ad): undefined reference to `devm_clk_hw_register_fixed_factor'
x86_64-linux-gnu-ld: dsi_phy_10nm.c:(.text+0x91d): undefined reference to `devm_clk_hw_register_fixed_factor'
x86_64-linux-gnu-ld: dsi_phy_10nm.c:(.text+0x989): undefined reference to `devm_clk_hw_register_fixed_factor'
x86_64-linux-gnu-ld: dsi_phy_10nm.c:(.text+0xaa4): undefined reference to `__devm_clk_hw_register_mux'
x86_64-linux-gnu-ld: dsi_phy_10nm.c:(.text+0xb2a): undefined reference to `__devm_clk_hw_register_divider'
x86_64-linux-gnu-ld: drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.o: in function `pll_7nm_register':
dsi_phy_7nm.c:(.text+0xa45): undefined reference to `devm_clk_hw_register'
x86_64-linux-gnu-ld: dsi_phy_7nm.c:(.text+0xaf0): undefined reference to `__devm_clk_hw_register_divider'
x86_64-linux-gnu-ld: dsi_phy_7nm.c:(.text+0xb7a): undefined reference to `__devm_clk_hw_register_divider'
x86_64-linux-gnu-ld: dsi_phy_7nm.c:(.text+0xbfd): undefined reference to `devm_clk_hw_register_fixed_factor'
x86_64-linux-gnu-ld: dsi_phy_7nm.c:(.text+0xc6d): undefined reference to `devm_clk_hw_register_fixed_factor'
x86_64-linux-gnu-ld: dsi_phy_7nm.c:(.text+0xcea): undefined reference to `devm_clk_hw_register_fixed_factor'
x86_64-linux-gnu-ld: dsi_phy_7nm.c:(.text+0xda0): undefined reference to `__devm_clk_hw_register_divider'
x86_64-linux-gnu-ld: dsi_phy_7nm.c:(.text+0xed9): undefined reference to `__devm_clk_hw_register_mux'
[...]

Fixes: b3ed524f84f5 ("drm/msm: allow compile_test on !ARM")
Reported-by: kernelbot <kernel-bot@kylinos.cn>
Signed-off-by: Jackie Liu <liuyun01@kylinos.cn>
---
 drivers/gpu/drm/msm/Kconfig | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/gpu/drm/msm/Kconfig b/drivers/gpu/drm/msm/Kconfig
index 617dcb799156..db5909ecca8e 100644
--- a/drivers/gpu/drm/msm/Kconfig
+++ b/drivers/gpu/drm/msm/Kconfig
@@ -85,6 +85,7 @@ config DRM_MSM_DSI
 config DRM_MSM_DSI_28NM_PHY
 	bool "Enable DSI 28nm PHY driver in MSM DRM"
 	depends on DRM_MSM_DSI
+	depends on COMMON_CLK
 	default y
 	help
 	  Choose this option if the 28nm DSI PHY is used on the platform.
@@ -92,6 +93,7 @@ config DRM_MSM_DSI_28NM_PHY
 config DRM_MSM_DSI_20NM_PHY
 	bool "Enable DSI 20nm PHY driver in MSM DRM"
 	depends on DRM_MSM_DSI
+	depends on COMMON_CLK
 	default y
 	help
 	  Choose this option if the 20nm DSI PHY is used on the platform.
@@ -99,6 +101,7 @@ config DRM_MSM_DSI_20NM_PHY
 config DRM_MSM_DSI_28NM_8960_PHY
 	bool "Enable DSI 28nm 8960 PHY driver in MSM DRM"
 	depends on DRM_MSM_DSI
+	depends on COMMON_CLK
 	default y
 	help
 	  Choose this option if the 28nm DSI PHY 8960 variant is used on the
@@ -107,6 +110,7 @@ config DRM_MSM_DSI_28NM_8960_PHY
 config DRM_MSM_DSI_14NM_PHY
 	bool "Enable DSI 14nm PHY driver in MSM DRM (used by MSM8996/APQ8096)"
 	depends on DRM_MSM_DSI
+	depends on COMMON_CLK
 	default y
 	help
 	  Choose this option if DSI PHY on 8996 is used on the platform.
@@ -114,6 +118,7 @@ config DRM_MSM_DSI_14NM_PHY
 config DRM_MSM_DSI_10NM_PHY
 	bool "Enable DSI 10nm PHY driver in MSM DRM (used by SDM845)"
 	depends on DRM_MSM_DSI
+	depends on COMMON_CLK
 	default y
 	help
 	  Choose this option if DSI PHY on SDM845 is used on the platform.
@@ -121,6 +126,7 @@ config DRM_MSM_DSI_10NM_PHY
 config DRM_MSM_DSI_7NM_PHY
 	bool "Enable DSI 7nm PHY driver in MSM DRM"
 	depends on DRM_MSM_DSI
+	depends on COMMON_CLK
 	default y
 	help
 	  Choose this option if DSI PHY on SM8150/SM8250/SC7280 is used on
-- 
2.25.1

Re: [PATCH 1/3] drm/msm/hdmi: fix build without CONFIG_COMMON_CLK

[Christian König]

Am 10.11.21 um 08:09 schrieb Jackie Liu:
> From: Jackie Liu <liuyun01@kylinos.cn>
>
> HDMI 8996 PHY/PLL support need common clk. avoid like:
>
> [...]
> x86_64-linux-gnu-ld: drivers/gpu/drm/msm/hdmi/hdmi_phy.o:(.rodata+0x3e0): undefined reference to `msm_hdmi_phy_8996_cfg'
>
> Fixes: e17afdceb4f2 ("drm/msm/hdmi: HDMI 8996 PHY/PLL support")
> Reported-by: kernelbot <kernel-bot@kylinos.cn>
> Signed-off-by: Jackie Liu <liuyun01@kylinos.cn>

Since it is probably my fault that you stumbled over all that stuff here 
is an "Acked-by: Christian König <christian.koenig@amd.com>" for the 
full series.

But you certainly also need to maintainers or Dave/Daniel take a look.

Regards,
Christian.

> ---
>   drivers/gpu/drm/msm/hdmi/hdmi_phy.c | 2 ++
>   1 file changed, 2 insertions(+)
>
> diff --git a/drivers/gpu/drm/msm/hdmi/hdmi_phy.c b/drivers/gpu/drm/msm/hdmi/hdmi_phy.c
> index 16b0e8836d27..84d7f79f1aa8 100644
> --- a/drivers/gpu/drm/msm/hdmi/hdmi_phy.c
> +++ b/drivers/gpu/drm/msm/hdmi/hdmi_phy.c
> @@ -192,8 +192,10 @@ static const struct of_device_id msm_hdmi_phy_dt_match[] = {
>   	  .data = &msm_hdmi_phy_8x74_cfg },
>   	{ .compatible = "qcom,hdmi-phy-8084",
>   	  .data = &msm_hdmi_phy_8x74_cfg },
> +#ifdef CONFIG_COMMON_CLK
>   	{ .compatible = "qcom,hdmi-phy-8996",
>   	  .data = &msm_hdmi_phy_8996_cfg },
> +#endif
>   	{}
>   };
>