i915: Fix DRM_I915_WERROR dependencies

Message ID 20210125122650.4178417-1-arnd@kernel.org
State New
Headers show
Series
  • i915: Fix DRM_I915_WERROR dependencies
Related show

Commit Message

Arnd Bergmann Jan. 25, 2021, 12:26 p.m.
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(-)

-- 
2.29.2

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Comments

Chris Wilson Jan. 25, 2021, 12:33 p.m. | #1
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
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Arnd Bergmann Jan. 25, 2021, 1:09 p.m. | #2
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
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Patch

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