* linux-next: build failure after merge of the etnaviv tree
@ 2021-12-13 15:38 broonie
0 siblings, 0 replies; 4+ messages in thread
From: broonie @ 2021-12-13 15:38 UTC (permalink / raw)
To: Fangzhi Zuo, Aurabindo Pillai, Alex Deucher
Cc: Linux Kernel Mailing List, Linux Next Mailing List
Hi all,
After merging the amdgpu tree, today's linux-next build (x86
allmodconfig) failed like this:
/tmp/next/build/drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm_debugfs.c: In function 'dp_force_sst_set':
/tmp/next/build/drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm_debugfs.c:3248:20: error: 'struct dc_debug_options' has no member named 'set_mst_en_for_sst'
3248 | adev->dm.dc->debug.set_mst_en_for_sst = val;
| ^
/tmp/next/build/drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm_debugfs.c: In function 'dp_force_sst_get':
/tmp/next/build/drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm_debugfs.c:3257:27: error: 'struct dc_debug_options' has no member named 'set_mst_en_for_sst'
3257 | *val = adev->dm.dc->debug.set_mst_en_for_sst;
| ^
Caused by commit
99e574ca64d3b6 ("drm/amd/display: Add Debugfs Entry to Force in SST Sequence")
interacting with some of the other DRM trees. Sadly this wasn't a new
version of the tree so it didn't flag up for several merges I've just
patched this out for now:
commit 0456e621ece3c28802799f3ed1f71a63af81960c
Author: Mark Brown <broonie@kernel.org>
Date: Mon Dec 13 15:26:46 2021 +0000
amdgpu: Patch out set_mst_en_for_sst
This breaks the build in -next due to issues with another tree:
/tmp/next/build/drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm_debugfs.c: In function 'dp_force_sst_set':
/tmp/next/build/drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm_debugfs.c:3248:20: error: 'struct dc_debug_options' has no member named 'set_mst_en_for_sst'
3248 | adev->dm.dc->debug.set_mst_en_for_sst = val;
| ^
/tmp/next/build/drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm_debugfs.c: In function 'dp_force_sst_get':
/tmp/next/build/drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm_debugfs.c:3257:27: error: 'struct dc_debug_options' has no member named 'set_mst_en_for_sst'
3257 | *val = adev->dm.dc->debug.set_mst_en_for_sst;
|
Signed-off-by: Mark Brown <broonie@kernel.org>
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c
index 68c379ed12383..df3c615ed7943 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c
@@ -3237,30 +3237,6 @@ static int disable_hpd_get(void *data, u64 *val)
DEFINE_DEBUGFS_ATTRIBUTE(disable_hpd_ops, disable_hpd_get,
disable_hpd_set, "%llu\n");
-/*
- * Force sst sequence in mst capable receiver.
- * Example usage: echo 1 > /sys/kernel/debug/dri/0/amdgpu_dm_dp_set_mst_en_for_sst
- */
-static int dp_force_sst_set(void *data, u64 val)
-{
- struct amdgpu_device *adev = data;
-
- adev->dm.dc->debug.set_mst_en_for_sst = val;
-
- return 0;
-}
-
-static int dp_force_sst_get(void *data, u64 *val)
-{
- struct amdgpu_device *adev = data;
-
- *val = adev->dm.dc->debug.set_mst_en_for_sst;
-
- return 0;
-}
-DEFINE_DEBUGFS_ATTRIBUTE(dp_set_mst_en_for_sst_ops, dp_force_sst_get,
- dp_force_sst_set, "%llu\n");
-
/*
* Sets the DC visual confirm debug option from the given string.
* Example usage: echo 1 > /sys/kernel/debug/dri/0/amdgpu_visual_confirm
@@ -3346,8 +3346,6 @@ void dtn_debugfs_init(struct amdgpu_device *adev)
adev, &mst_topo_fops);
debugfs_create_file("amdgpu_dm_dtn_log", 0644, root, adev,
&dtn_log_fops);
- debugfs_create_file("amdgpu_dm_dp_set_mst_en_for_sst", 0644, root, adev,
- &dp_set_mst_en_for_sst_ops);
debugfs_create_file_unsafe("amdgpu_dm_visual_confirm", 0644, root, adev,
&visual_confirm_fops);
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: linux-next: build failure after merge of the etnaviv tree
2017-11-29 23:53 ` Stephen Rothwell
@ 2017-12-01 14:33 ` Philipp Zabel
0 siblings, 0 replies; 4+ messages in thread
From: Philipp Zabel @ 2017-12-01 14:33 UTC (permalink / raw)
To: Stephen Rothwell, Lucas Stach
Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Dave Airlie, DRI
Hi Stephen, Lucas,
On Thu, 2017-11-30 at 10:53 +1100, Stephen Rothwell wrote:
> Hi Lucas,
>
> On Tue, 28 Nov 2017 11:44:46 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > After merging the etnaviv tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> >
> > drivers/gpu/drm/tve200/Kconfig:1:error: recursive dependency detected!
> > For a resolution refer to Documentation/kbuild/kconfig-language.txt
> > subsection "Kconfig recursive dependency limitations"
> > drivers/gpu/drm/tve200/Kconfig:1: symbol DRM_TVE200 depends on CMA
> > For a resolution refer to Documentation/kbuild/kconfig-language.txt
> > subsection "Kconfig recursive dependency limitations"
> > mm/Kconfig:489: symbol CMA is selected by DRM_ETNAVIV
> > For a resolution refer to Documentation/kbuild/kconfig-language.txt
> > subsection "Kconfig recursive dependency limitations"
> > drivers/gpu/drm/etnaviv/Kconfig:2: symbol DRM_ETNAVIV depends on THERMAL
> > For a resolution refer to Documentation/kbuild/kconfig-language.txt
> > subsection "Kconfig recursive dependency limitations"
> > drivers/thermal/Kconfig:5: symbol THERMAL is selected by ACPI_VIDEO
> > For a resolution refer to Documentation/kbuild/kconfig-language.txt
> > subsection "Kconfig recursive dependency limitations"
> > drivers/acpi/Kconfig:189: symbol ACPI_VIDEO is selected by BACKLIGHT_CLASS_DEVICE
> > For a resolution refer to Documentation/kbuild/kconfig-language.txt
> > subsection "Kconfig recursive dependency limitations"
> > drivers/video/backlight/Kconfig:158: symbol BACKLIGHT_CLASS_DEVICE is selected by DRM_PARADE_PS8622
> > For a resolution refer to Documentation/kbuild/kconfig-language.txt
> > subsection "Kconfig recursive dependency limitations"
> > drivers/gpu/drm/bridge/Kconfig:62: symbol DRM_PARADE_PS8622 depends on DRM_BRIDGE
> > For a resolution refer to Documentation/kbuild/kconfig-language.txt
> > subsection "Kconfig recursive dependency limitations"
> > drivers/gpu/drm/bridge/Kconfig:1: symbol DRM_BRIDGE is selected by DRM_TVE200
> > warning: (PMAC_BACKLIGHT && DRM_NOUVEAU && HT16K33 && FB_TFT) selects FB_BACKLIGHT which has unmet direct dependencies (HAS_IOMEM && FB)
I have reproduced this and first tried to break the loop at the top by
selecting CMA from DRM_TVE200 instead of depending on it:
drivers/dma/Kconfig:5:error: recursive dependency detected!
For a resolution refer to Documentation/kbuild/kconfig-language.txt
subsection "Kconfig recursive dependency limitations"
drivers/dma/Kconfig:5: symbol DMADEVICES is selected by CRYPTO_DEV_SP_CCP
For a resolution refer to Documentation/kbuild/kconfig-language.txt
subsection "Kconfig recursive dependency limitations"
drivers/crypto/ccp/Kconfig:8: symbol CRYPTO_DEV_SP_CCP depends on CRYPTO
For a resolution refer to Documentation/kbuild/kconfig-language.txt
subsection "Kconfig recursive dependency limitations"
crypto/Kconfig:16: symbol CRYPTO is selected by BIG_KEYS
For a resolution refer to Documentation/kbuild/kconfig-language.txt
subsection "Kconfig recursive dependency limitations"
security/keys/Kconfig:44: symbol BIG_KEYS depends on TMPFS
For a resolution refer to Documentation/kbuild/kconfig-language.txt
subsection "Kconfig recursive dependency limitations"
fs/Kconfig:139: symbol TMPFS is selected by DRM_ETNAVIV
For a resolution refer to Documentation/kbuild/kconfig-language.txt
subsection "Kconfig recursive dependency limitations"
drivers/gpu/drm/etnaviv/Kconfig:2: symbol DRM_ETNAVIV depends on THERMAL
For a resolution refer to Documentation/kbuild/kconfig-language.txt
subsection "Kconfig recursive dependency limitations"
drivers/thermal/Kconfig:5: symbol THERMAL is selected by ACPI_VIDEO
For a resolution refer to Documentation/kbuild/kconfig-language.txt
subsection "Kconfig recursive dependency limitations"
drivers/acpi/Kconfig:189: symbol ACPI_VIDEO is selected by BACKLIGHT_CLASS_DEVICE
For a resolution refer to Documentation/kbuild/kconfig-language.txt
subsection "Kconfig recursive dependency limitations"
drivers/video/backlight/Kconfig:158: symbol BACKLIGHT_CLASS_DEVICE is selected by FB_MX3
For a resolution refer to Documentation/kbuild/kconfig-language.txt
subsection "Kconfig recursive dependency limitations"
drivers/video/fbdev/Kconfig:2327: symbol FB_MX3 depends on MX3_IPU
For a resolution refer to Documentation/kbuild/kconfig-language.txt
subsection "Kconfig recursive dependency limitations"
drivers/dma/Kconfig:387: symbol MX3_IPU depends on DMADEVICES
I've sent a patch [1] instead to make THERMAL selectable via a Kconfig
option.
[1] https://patchwork.kernel.org/patch/10087265/
regards
Philipp
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: build failure after merge of the etnaviv tree
2017-11-28 0:44 Stephen Rothwell
@ 2017-11-29 23:53 ` Stephen Rothwell
2017-12-01 14:33 ` Philipp Zabel
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2017-11-29 23:53 UTC (permalink / raw)
To: Lucas Stach
Cc: Dave Airlie, DRI, Linux-Next Mailing List, Linux Kernel Mailing List
Hi Lucas,
On Tue, 28 Nov 2017 11:44:46 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the etnaviv tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/gpu/drm/tve200/Kconfig:1:error: recursive dependency detected!
> For a resolution refer to Documentation/kbuild/kconfig-language.txt
> subsection "Kconfig recursive dependency limitations"
> drivers/gpu/drm/tve200/Kconfig:1: symbol DRM_TVE200 depends on CMA
> For a resolution refer to Documentation/kbuild/kconfig-language.txt
> subsection "Kconfig recursive dependency limitations"
> mm/Kconfig:489: symbol CMA is selected by DRM_ETNAVIV
> For a resolution refer to Documentation/kbuild/kconfig-language.txt
> subsection "Kconfig recursive dependency limitations"
> drivers/gpu/drm/etnaviv/Kconfig:2: symbol DRM_ETNAVIV depends on THERMAL
> For a resolution refer to Documentation/kbuild/kconfig-language.txt
> subsection "Kconfig recursive dependency limitations"
> drivers/thermal/Kconfig:5: symbol THERMAL is selected by ACPI_VIDEO
> For a resolution refer to Documentation/kbuild/kconfig-language.txt
> subsection "Kconfig recursive dependency limitations"
> drivers/acpi/Kconfig:189: symbol ACPI_VIDEO is selected by BACKLIGHT_CLASS_DEVICE
> For a resolution refer to Documentation/kbuild/kconfig-language.txt
> subsection "Kconfig recursive dependency limitations"
> drivers/video/backlight/Kconfig:158: symbol BACKLIGHT_CLASS_DEVICE is selected by DRM_PARADE_PS8622
> For a resolution refer to Documentation/kbuild/kconfig-language.txt
> subsection "Kconfig recursive dependency limitations"
> drivers/gpu/drm/bridge/Kconfig:62: symbol DRM_PARADE_PS8622 depends on DRM_BRIDGE
> For a resolution refer to Documentation/kbuild/kconfig-language.txt
> subsection "Kconfig recursive dependency limitations"
> drivers/gpu/drm/bridge/Kconfig:1: symbol DRM_BRIDGE is selected by DRM_TVE200
> warning: (PMAC_BACKLIGHT && DRM_NOUVEAU && HT16K33 && FB_TFT) selects FB_BACKLIGHT which has unmet direct dependencies (HAS_IOMEM && FB)
> *
> * Restart config...
> *
> *
> * Multiplexer I2C Chip support
> *
> GPIO-based I2C arbitration (I2C_ARB_GPIO_CHALLENGE) [M/n/?] m
> GPIO-based I2C multiplexer (I2C_MUX_GPIO) [M/n/?] m
> General Purpose I2C multiplexer (I2C_MUX_GPMUX) [M/n/?] m
> LTC LTC4306/5 I2C multiplexer (I2C_MUX_LTC4306) [N/m/?] (NEW) aborted!
>
> Console input/output is redirected. Run 'make oldconfig' to update configuration.
>
> scripts/kconfig/Makefile:38: recipe for target 'silentoldconfig' failed
>
> Caused by commit
>
> dba536cd9538 ("drm/etnaviv: add THERMAL dependency")
>
> I got the abobe warnings while doing "make allmodconfig" and then the
> error when doing the actual build.
>
> I have used the etnaviv tree from next-20171127 for today.
I am still getting this failure.
--
Cheers,
Stephen Rothwell
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 4+ messages in thread
* linux-next: build failure after merge of the etnaviv tree
@ 2017-11-28 0:44 Stephen Rothwell
2017-11-29 23:53 ` Stephen Rothwell
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2017-11-28 0:44 UTC (permalink / raw)
To: Lucas Stach
Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Philipp Zabel
Hi Lucas,
After merging the etnaviv tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/gpu/drm/tve200/Kconfig:1:error: recursive dependency detected!
For a resolution refer to Documentation/kbuild/kconfig-language.txt
subsection "Kconfig recursive dependency limitations"
drivers/gpu/drm/tve200/Kconfig:1: symbol DRM_TVE200 depends on CMA
For a resolution refer to Documentation/kbuild/kconfig-language.txt
subsection "Kconfig recursive dependency limitations"
mm/Kconfig:489: symbol CMA is selected by DRM_ETNAVIV
For a resolution refer to Documentation/kbuild/kconfig-language.txt
subsection "Kconfig recursive dependency limitations"
drivers/gpu/drm/etnaviv/Kconfig:2: symbol DRM_ETNAVIV depends on THERMAL
For a resolution refer to Documentation/kbuild/kconfig-language.txt
subsection "Kconfig recursive dependency limitations"
drivers/thermal/Kconfig:5: symbol THERMAL is selected by ACPI_VIDEO
For a resolution refer to Documentation/kbuild/kconfig-language.txt
subsection "Kconfig recursive dependency limitations"
drivers/acpi/Kconfig:189: symbol ACPI_VIDEO is selected by BACKLIGHT_CLASS_DEVICE
For a resolution refer to Documentation/kbuild/kconfig-language.txt
subsection "Kconfig recursive dependency limitations"
drivers/video/backlight/Kconfig:158: symbol BACKLIGHT_CLASS_DEVICE is selected by DRM_PARADE_PS8622
For a resolution refer to Documentation/kbuild/kconfig-language.txt
subsection "Kconfig recursive dependency limitations"
drivers/gpu/drm/bridge/Kconfig:62: symbol DRM_PARADE_PS8622 depends on DRM_BRIDGE
For a resolution refer to Documentation/kbuild/kconfig-language.txt
subsection "Kconfig recursive dependency limitations"
drivers/gpu/drm/bridge/Kconfig:1: symbol DRM_BRIDGE is selected by DRM_TVE200
warning: (PMAC_BACKLIGHT && DRM_NOUVEAU && HT16K33 && FB_TFT) selects FB_BACKLIGHT which has unmet direct dependencies (HAS_IOMEM && FB)
*
* Restart config...
*
*
* Multiplexer I2C Chip support
*
GPIO-based I2C arbitration (I2C_ARB_GPIO_CHALLENGE) [M/n/?] m
GPIO-based I2C multiplexer (I2C_MUX_GPIO) [M/n/?] m
General Purpose I2C multiplexer (I2C_MUX_GPMUX) [M/n/?] m
LTC LTC4306/5 I2C multiplexer (I2C_MUX_LTC4306) [N/m/?] (NEW) aborted!
Console input/output is redirected. Run 'make oldconfig' to update configuration.
scripts/kconfig/Makefile:38: recipe for target 'silentoldconfig' failed
Caused by commit
dba536cd9538 ("drm/etnaviv: add THERMAL dependency")
I got the abobe warnings while doing "make allmodconfig" and then the
error when doing the actual build.
I have used the etnaviv tree from next-20171127 for today.
--
Cheers,
Stephen Rothwell
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-12-13 15:38 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-13 15:38 linux-next: build failure after merge of the etnaviv tree broonie
-- strict thread matches above, loose matches on Subject: below --
2017-11-28 0:44 Stephen Rothwell
2017-11-29 23:53 ` Stephen Rothwell
2017-12-01 14:33 ` Philipp Zabel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).