]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
Revert "drm/i915: replace select with dependency for visible DEBUG_OBJECTS"
authorJani Nikula <jani.nikula@intel.com>
Wed, 6 May 2026 10:19:57 +0000 (13:19 +0300)
committerJani Nikula <jani.nikula@intel.com>
Wed, 6 May 2026 14:32:09 +0000 (17:32 +0300)
This reverts commit 025f89b01ed8d5e65d87ed54f231e10c6ac08188.

025f89b01ed8 ("drm/i915: replace select with dependency for visible
DEBUG_OBJECTS") breaks the build in certain scenarios, presumably
because config DRM_I915_DEBUG selects DRM_I915_SW_FENCE_DEBUG_OBJECTS
without looking at its dependencies, allowing
DRM_I915_SW_FENCE_DEBUG_OBJECTS=y and DEBUG_OBJECTS=n.

Fixes: 025f89b01ed8 ("drm/i915: replace select with dependency for visible DEBUG_OBJECTS")
Cc: Julian Braha <julianbraha@gmail.com>
Acked-by: Tvrtko Ursulin <tvrtko.ursulin@igalia.com>
Link: https://patch.msgid.link/20260506101957.202271-1-jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/Kconfig.debug

index 9a2a49284876d45b8e41e3420d7109aa5dec9767..3562a02ef7adcab607e0b4494e6f8de01454cd3e 100644 (file)
@@ -153,7 +153,7 @@ config DRM_I915_TRACE_GTT
 config DRM_I915_SW_FENCE_DEBUG_OBJECTS
        bool "Enable additional driver debugging for fence objects"
        depends on DRM_I915
-       depends on DEBUG_OBJECTS
+       select DEBUG_OBJECTS
        default n
        help
          Choose this option to turn on extra driver debugging that may affect