| Message ID | 3fd262cf-1db6-4335-320c-af92f9014502@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Maarten Lankhorst <maarten.lankhorst@linux.intel.com> writes: > This fixes the following depmod error when building drm as a module: > depmod: ERROR: Found 6 modules in dependency cycles! > depmod: ERROR: Cycle detected: drm -> drm_kms_helper -> drm > > Fixes: 13dfc0540a57 ("drm/bridge: Refactor out the panel wrapper from the lvds-encoder bridge.") > Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Looks plausible to me. Given how much trouble I've had getting the kbuild right, anyone else want to chime in?
Thanks Maarten now I can build the kernel again. /Marta > -----Original Message----- > From: dri-devel [mailto:dri-devel-bounces@lists.freedesktop.org] On Behalf > Of Maarten Lankhorst > Sent: Tuesday, June 6, 2017 5:32 PM > To: Archit Taneja <architt@codeaurora.org>; Eric Anholt <eric@anholt.net>; > Andrzej Hajda <a.hajda@samsung.com>; Laurent Pinchart > <Laurent.pinchart@ideasonboard.com>; Thierry Reding > <thierry.reding@gmail.com> > Cc: linux-kernel@vger.kernel.org; dri-devel@lists.freedesktop.org > Subject: [PATCH v3] drm/bridge: Build the panel wrapper in drm_kms_helper > > This fixes the following depmod error when building drm as a module: > depmod: ERROR: Found 6 modules in dependency cycles! > depmod: ERROR: Cycle detected: drm -> drm_kms_helper -> drm > > Fixes: 13dfc0540a57 ("drm/bridge: Refactor out the panel wrapper from the > lvds-encoder bridge.") > Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> > --- > diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile index > dc69175255b1..3999dffcd9ef 100644 > --- a/drivers/gpu/drm/Makefile > +++ b/drivers/gpu/drm/Makefile > @@ -24,7 +24,6 @@ drm-$(CONFIG_COMPAT) += drm_ioc32.o > drm-$(CONFIG_DRM_GEM_CMA_HELPER) += drm_gem_cma_helper.o > drm-$(CONFIG_PCI) += ati_pcigart.o > drm-$(CONFIG_DRM_PANEL) += drm_panel.o > -drm-$(CONFIG_DRM_PANEL_BRIDGE) += bridge/panel.o > drm-$(CONFIG_OF) += drm_of.o > drm-$(CONFIG_AGP) += drm_agpsupport.o > drm-$(CONFIG_DEBUG_FS) += drm_debugfs.o drm_debugfs_crc.o @@ - > 35,6 +34,7 @@ drm_kms_helper-y := drm_crtc_helper.o drm_dp_helper.o > drm_probe_helper.o \ > drm_simple_kms_helper.o > drm_modeset_helper.o \ > drm_scdc_helper.o > > +drm_kms_helper-$(CONFIG_DRM_PANEL_BRIDGE) += bridge/panel.o > drm_kms_helper-$(CONFIG_DRM_LOAD_EDID_FIRMWARE) += > drm_edid_load.o > drm_kms_helper-$(CONFIG_DRM_FBDEV_EMULATION) += > drm_fb_helper.o > drm_kms_helper-$(CONFIG_DRM_KMS_CMA_HELPER) += > drm_fb_cma_helper.o > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
On 06/06/2017 11:22 PM, Eric Anholt wrote: > Maarten Lankhorst <maarten.lankhorst@linux.intel.com> writes: > >> This fixes the following depmod error when building drm as a module: >> depmod: ERROR: Found 6 modules in dependency cycles! >> depmod: ERROR: Cycle detected: drm -> drm_kms_helper -> drm >> >> Fixes: 13dfc0540a57 ("drm/bridge: Refactor out the panel wrapper from the lvds-encoder bridge.") >> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> > > Looks plausible to me. Given how much trouble I've had getting the > kbuild right, anyone else want to chime in? > The fix looks good to me too. depmod doesn't complain after this patch. I can queue it to drm-misc-next if no one else has any comments on it in the next few hours or so. I'll make sure I check with 'make module_install' before pushing, I didn't know depmod wasn't called otherwise. Thanks, Archit
diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile index dc69175255b1..3999dffcd9ef 100644 --- a/drivers/gpu/drm/Makefile +++ b/drivers/gpu/drm/Makefile @@ -24,7 +24,6 @@ drm-$(CONFIG_COMPAT) += drm_ioc32.o drm-$(CONFIG_DRM_GEM_CMA_HELPER) += drm_gem_cma_helper.o drm-$(CONFIG_PCI) += ati_pcigart.o drm-$(CONFIG_DRM_PANEL) += drm_panel.o -drm-$(CONFIG_DRM_PANEL_BRIDGE) += bridge/panel.o drm-$(CONFIG_OF) += drm_of.o drm-$(CONFIG_AGP) += drm_agpsupport.o drm-$(CONFIG_DEBUG_FS) += drm_debugfs.o drm_debugfs_crc.o @@ -35,6 +34,7 @@ drm_kms_helper-y := drm_crtc_helper.o drm_dp_helper.o drm_probe_helper.o \ drm_simple_kms_helper.o drm_modeset_helper.o \ drm_scdc_helper.o +drm_kms_helper-$(CONFIG_DRM_PANEL_BRIDGE) += bridge/panel.o drm_kms_helper-$(CONFIG_DRM_LOAD_EDID_FIRMWARE) += drm_edid_load.o drm_kms_helper-$(CONFIG_DRM_FBDEV_EMULATION) += drm_fb_helper.o drm_kms_helper-$(CONFIG_DRM_KMS_CMA_HELPER) += drm_fb_cma_helper.o
This fixes the following depmod error when building drm as a module: depmod: ERROR: Found 6 modules in dependency cycles! depmod: ERROR: Cycle detected: drm -> drm_kms_helper -> drm Fixes: 13dfc0540a57 ("drm/bridge: Refactor out the panel wrapper from the lvds-encoder bridge.") Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> ---