Quoting [email protected] (2020-09-29 02:30:58) > From: Thomas Gleixner <[email protected]> > > CONFIG_PREEMPT_COUNT is now unconditionally enabled and will be > removed. Cleanup the leftovers before doing so.
Change looks fine: Reviewed-by: Joonas Lahtinen <[email protected]> Are you looking for us to merge or merge through another tree? If us, did the base patch always enabling PREEMPT_COUNT go into 5.9 or is it heading to 5.10? We can queue this earliest for 5.11 as drm-next closed for 5.10 at week of -rc5. Regards, Joonas > Signed-off-by: Thomas Gleixner <[email protected]> > Cc: Jani Nikula <[email protected]> > Cc: Joonas Lahtinen <[email protected]> > Cc: Rodrigo Vivi <[email protected]> > Cc: David Airlie <[email protected]> > Cc: Daniel Vetter <[email protected]> > Cc: [email protected] > Cc: [email protected] > Signed-off-by: Paul E. McKenney <[email protected]> > --- > drivers/gpu/drm/i915/Kconfig.debug | 1 - > drivers/gpu/drm/i915/i915_utils.h | 3 +-- > 2 files changed, 1 insertion(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/Kconfig.debug > b/drivers/gpu/drm/i915/Kconfig.debug > index 1cb28c2..17d9b00 100644 > --- a/drivers/gpu/drm/i915/Kconfig.debug > +++ b/drivers/gpu/drm/i915/Kconfig.debug > @@ -20,7 +20,6 @@ config DRM_I915_DEBUG > bool "Enable additional driver debugging" > depends on DRM_I915 > select DEBUG_FS > - select PREEMPT_COUNT > select I2C_CHARDEV > select STACKDEPOT > select DRM_DP_AUX_CHARDEV > diff --git a/drivers/gpu/drm/i915/i915_utils.h > b/drivers/gpu/drm/i915/i915_utils.h > index 5477337..ecfed86 100644 > --- a/drivers/gpu/drm/i915/i915_utils.h > +++ b/drivers/gpu/drm/i915/i915_utils.h > @@ -337,8 +337,7 @@ wait_remaining_ms_from_jiffies(unsigned long > timestamp_jiffies, int to_wait_ms) > (Wmax)) > #define wait_for(COND, MS) _wait_for((COND), (MS) * 1000, 10, > 1000) > > -/* If CONFIG_PREEMPT_COUNT is disabled, in_atomic() always reports false. */ > -#if defined(CONFIG_DRM_I915_DEBUG) && defined(CONFIG_PREEMPT_COUNT) > +#ifdef CONFIG_DRM_I915_DEBUG > # define _WAIT_FOR_ATOMIC_CHECK(ATOMIC) WARN_ON_ONCE((ATOMIC) && > !in_atomic()) > #else > # define _WAIT_FOR_ATOMIC_CHECK(ATOMIC) do { } while (0) > -- > 2.9.5 >
