On 10/5/21 7:53 PM, akpm@linux-foundation.org wrote:
The mm-of-the-moment snapshot 2021-10-05-19-53 has been uploaded to
https://www.ozlabs.org/~akpm/mmotm/mmotm-readme.txt says
README for mm-of-the-moment:
https://www.ozlabs.org/~akpm/mmotm/
This is a snapshot of my -mm patch queue. Uploaded at random hopefully more than once a week.
You will need quilt to apply these patches to the latest Linus release (5.x or 5.x-rcY). The series file is in broken-out.tar.gz and is duplicated in https://ozlabs.org/~akpm/mmotm/series
The file broken-out.tar.gz contains two datestamp files: .DATE and .DATE-yyyy-mm-dd-hh-mm-ss. Both contain the string yyyy-mm-dd-hh-mm-ss, followed by the base kernel version against which this patch series is to be applied.
This tree is partially included in linux-next. To see which patches are included in linux-next, consult the `series' file. Only the patches within the #NEXT_PATCHES_START/#NEXT_PATCHES_END markers are included in linux-next.
A full copy of the full kernel tree with the linux-next and mmotm patches already applied is available through git within an hour of the mmotm release. Individual mmotm releases are tagged. The master branch always points to the latest release, so it's constantly rebasing.
on i386:
ld: drivers/gpu/drm/msm/hdmi/hdmi_phy.o:(.rodata+0x3f0): undefined reference to `msm_hdmi_phy_8996_cfg'
Full randconfig fle is attached.
Hi Randy,
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'
Full randconfig fle is attached.
This would be because CONFIG_DRM_MSM is set but CONFIG_COMMON_CLOCK is not and has been exposed by commit
b3ed524f84f5 ("drm/msm: allow compile_test on !ARM")
from the drm-misc tree.
Am 06.10.21 um 09:20 schrieb Stephen Rothwell:
Hi Randy,
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'
Full randconfig fle is attached.
This would be because CONFIG_DRM_MSM is set but CONFIG_COMMON_CLOCK is not and has been exposed by commit
b3ed524f84f5 ("drm/msm: allow compile_test on !ARM")
from the drm-misc tree.
Good point, how about this change:
diff --git a/drivers/gpu/drm/msm/Kconfig b/drivers/gpu/drm/msm/Kconfig index 5879f67bc88c..d9879b011fb0 100644 --- a/drivers/gpu/drm/msm/Kconfig +++ b/drivers/gpu/drm/msm/Kconfig @@ -5,7 +5,7 @@ config DRM_MSM depends on DRM depends on ARCH_QCOM || SOC_IMX5 || COMPILE_TEST depends on IOMMU_SUPPORT - depends on (OF && COMMON_CLK) || COMPILE_TEST + depends on (OF || COMPILE_TEST) && COMMON_CLK depends on QCOM_OCMEM || QCOM_OCMEM=n depends on QCOM_LLCC || QCOM_LLCC=n depends on QCOM_COMMAND_DB || QCOM_COMMAND_DB=n
Regards, Christian.
On 10/6/21 12:24 AM, Christian König wrote:
Am 06.10.21 um 09:20 schrieb Stephen Rothwell:
Hi Randy,
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'
Full randconfig fle is attached.
This would be because CONFIG_DRM_MSM is set but CONFIG_COMMON_CLOCK is not and has been exposed by commit
b3ed524f84f5 ("drm/msm: allow compile_test on !ARM")
from the drm-misc tree.
Good point, how about this change:
diff --git a/drivers/gpu/drm/msm/Kconfig b/drivers/gpu/drm/msm/Kconfig index 5879f67bc88c..d9879b011fb0 100644 --- a/drivers/gpu/drm/msm/Kconfig +++ b/drivers/gpu/drm/msm/Kconfig @@ -5,7 +5,7 @@ config DRM_MSM depends on DRM depends on ARCH_QCOM || SOC_IMX5 || COMPILE_TEST depends on IOMMU_SUPPORT - depends on (OF && COMMON_CLK) || COMPILE_TEST + depends on (OF || COMPILE_TEST) && COMMON_CLK depends on QCOM_OCMEM || QCOM_OCMEM=n depends on QCOM_LLCC || QCOM_LLCC=n depends on QCOM_COMMAND_DB || QCOM_COMMAND_DB=n
WorksForMe. Thanks. (other than the whitespace damage)
Hi Christian,
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'
Full randconfig fle is attached.
This would be because CONFIG_DRM_MSM is set but CONFIG_COMMON_CLOCK is not and has been exposed by commit
b3ed524f84f5 ("drm/msm: allow compile_test on !ARM")
from the drm-misc tree.
Good point, how about this change:
diff --git a/drivers/gpu/drm/msm/Kconfig b/drivers/gpu/drm/msm/Kconfig index 5879f67bc88c..d9879b011fb0 100644 --- a/drivers/gpu/drm/msm/Kconfig +++ b/drivers/gpu/drm/msm/Kconfig @@ -5,7 +5,7 @@ config DRM_MSM depends on DRM depends on ARCH_QCOM || SOC_IMX5 || COMPILE_TEST depends on IOMMU_SUPPORT
depends on (OF && COMMON_CLK) || COMPILE_TEST
depends on (OF || COMPILE_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_TEST
to 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.
depends on QCOM_OCMEM || QCOM_OCMEM=n depends on QCOM_LLCC || QCOM_LLCC=n depends on QCOM_COMMAND_DB || QCOM_COMMAND_DB=n
Gr{oetje,eeting}s,
Geert
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
On Wed, Oct 13, 2021 at 12:54 PM Arnd Bergmann arnd@kernel.org wrote:
On Thu, Oct 7, 2021 at 11:51 AM Geert Uytterhoeven geert@linux-m68k.org wrote:
-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
I fixed my local copy now after noticing that these should not go after CONFIG_DRM_FBDEV_EMULATION but the top-level option:
@@ -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 \
Arnd
dri-devel@lists.freedesktop.org
-
Arnd Bergmann -
Christian König -
Geert Uytterhoeven -
Randy Dunlap -
Stephen Rothwell