mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH] i915: Fix DRM_I915_WERROR dependencies
@ 2021-01-25 12:26 Arnd Bergmann
  2021-01-25 12:33 ` Chris Wilson
  0 siblings, 1 reply; 3+ messages in thread
From: Arnd Bergmann @ 2021-01-25 12:26 UTC (permalink / raw)
  To: Jani Nikula, Joonas Lahtinen, Rodrigo Vivi, David Airlie,
	Daniel Vetter, Mika Kuoppala, Chris Wilson
  Cc: Arnd Bergmann, intel-gfx, dri-devel, linux-kernel

From: Arnd Bergmann <arnd@arndb.de>

CONFIG_DRM_I915_DEBUG now selects CONFIG_DRM_I915_WERROR, but fails
to honor its dependencies:

WARNING: unmet direct dependencies detected for DRM_I915_WERROR
  Depends on [n]: HAS_IOMEM [=y] && DRM_I915 [=m] && EXPERT [=y] && !COMPILE_TEST [=y]
  Selected by [m]:
  - DRM_I915_DEBUG [=y] && HAS_IOMEM [=y] && EXPERT [=y] && DRM_I915 [=m]

Change the 'select' to a conditional one that doesn't trigger -Werror
warnings for allmodconfig builds and other compile tests.

Fixes: 4f86975f539d ("drm/i915: Add DEBUG_GEM to the recommended CI config")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/gpu/drm/i915/Kconfig.debug | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/Kconfig.debug b/drivers/gpu/drm/i915/Kconfig.debug
index be76054c01d8..97793b28d007 100644
--- a/drivers/gpu/drm/i915/Kconfig.debug
+++ b/drivers/gpu/drm/i915/Kconfig.debug
@@ -31,9 +31,9 @@ config DRM_I915_DEBUG
 	select DRM_DEBUG_SELFTEST
 	select DMABUF_SELFTESTS
 	select SW_SYNC # signaling validation framework (igt/syncobj*)
-	select DRM_I915_WERROR
-	select DRM_I915_DEBUG_GEM
-	select DRM_I915_DEBUG_GEM_ONCE
+	select DRM_I915_WERROR if !COMPILE_TEST
+	select DRM_I915_DEBUG_GEM if !COMPILE_TEST
+	select DRM_I915_DEBUG_GEM_ONCE if !COMPILE_TEST
 	select DRM_I915_DEBUG_MMIO
 	select DRM_I915_DEBUG_RUNTIME_PM
 	select DRM_I915_SW_FENCE_DEBUG_OBJECTS
-- 
2.29.2


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] i915: Fix DRM_I915_WERROR dependencies
  2021-01-25 12:26 [PATCH] i915: Fix DRM_I915_WERROR dependencies Arnd Bergmann
@ 2021-01-25 12:33 ` Chris Wilson
  2021-01-25 13:09   ` Arnd Bergmann
  0 siblings, 1 reply; 3+ messages in thread
From: Chris Wilson @ 2021-01-25 12:33 UTC (permalink / raw)
  To: Arnd Bergmann, Daniel Vetter, David Airlie, Jani Nikula,
	Joonas Lahtinen, Mika Kuoppala, Rodrigo Vivi
  Cc: intel-gfx, dri-devel, Arnd Bergmann, linux-kernel

Quoting Arnd Bergmann (2021-01-25 12:26:44)
> From: Arnd Bergmann <arnd@arndb.de>
> 
> CONFIG_DRM_I915_DEBUG now selects CONFIG_DRM_I915_WERROR, but fails
> to honor its dependencies:
> 
> WARNING: unmet direct dependencies detected for DRM_I915_WERROR
>   Depends on [n]: HAS_IOMEM [=y] && DRM_I915 [=m] && EXPERT [=y] && !COMPILE_TEST [=y]
>   Selected by [m]:
>   - DRM_I915_DEBUG [=y] && HAS_IOMEM [=y] && EXPERT [=y] && DRM_I915 [=m]

DRM_I915_DEBUG now depends on !COMPILE_TEST and EXPERT.
-Chris

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] i915: Fix DRM_I915_WERROR dependencies
  2021-01-25 12:33 ` Chris Wilson
@ 2021-01-25 13:09   ` Arnd Bergmann
  0 siblings, 0 replies; 3+ messages in thread
From: Arnd Bergmann @ 2021-01-25 13:09 UTC (permalink / raw)
  To: Chris Wilson
  Cc: Daniel Vetter, David Airlie, Jani Nikula, Joonas Lahtinen,
	Mika Kuoppala, Rodrigo Vivi, Intel Graphics, dri-devel,
	Arnd Bergmann, linux-kernel

On Mon, Jan 25, 2021 at 1:33 PM Chris Wilson <chris@chris-wilson.co.uk> wrote:
>
> Quoting Arnd Bergmann (2021-01-25 12:26:44)
> > From: Arnd Bergmann <arnd@arndb.de>
> >
> > CONFIG_DRM_I915_DEBUG now selects CONFIG_DRM_I915_WERROR, but fails
> > to honor its dependencies:
> >
> > WARNING: unmet direct dependencies detected for DRM_I915_WERROR
> >   Depends on [n]: HAS_IOMEM [=y] && DRM_I915 [=m] && EXPERT [=y] && !COMPILE_TEST [=y]
> >   Selected by [m]:
> >   - DRM_I915_DEBUG [=y] && HAS_IOMEM [=y] && EXPERT [=y] && DRM_I915 [=m]
>
> DRM_I915_DEBUG now depends on !COMPILE_TEST and EXPERT.

Works for me, thanks!

      Arnd

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2021-01-26  6:07 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-25 12:26 [PATCH] i915: Fix DRM_I915_WERROR dependencies Arnd Bergmann
2021-01-25 12:33 ` Chris Wilson
2021-01-25 13:09   ` Arnd Bergmann

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®