From patchwork Thu Oct 29 16:50:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uladzislau Rezki X-Patchwork-Id: 11868687 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.3 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7E31DC4741F for ; Fri, 30 Oct 2020 08:23:42 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 087C522228 for ; Fri, 30 Oct 2020 08:23:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="qMTUAse9" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 087C522228 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 517706E97F; Fri, 30 Oct 2020 08:23:19 +0000 (UTC) Received: from mail-lf1-x144.google.com (mail-lf1-x144.google.com [IPv6:2a00:1450:4864:20::144]) by gabe.freedesktop.org (Postfix) with ESMTPS id 188B46E8E2; Thu, 29 Oct 2020 16:50:53 +0000 (UTC) Received: by mail-lf1-x144.google.com with SMTP id 126so4170657lfi.8; Thu, 29 Oct 2020 09:50:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=U0tBXDISJ7PKav4r0CxWwIZDBb4jy3ecrSqgpsbA5/M=; b=qMTUAse97Ag4sY/heShgNSsNCYf6PXz+YhGoBkReVy5Bpk+oGTd1KwM2lnLwkDRLNy FzGsZ4HODS2WboXisLq2+6AVl5Wu+3Mgan1NVY1USwNyCJou5D3CMK2dGTr100VKUGvv e83wr+oyKofohMsxCrWg/q2Ca88IUA+mAWtEX6m4dSGMdq9EXLBXyvwlU3wlJpqLKgm6 +C/1VcjOTXXMMcekAS5jU59FBlYq5Sl2VhPtnyewNbmtv/jGh2615Z8YRYQT+wHPgzmw 1TJMauGq7t6T3pPs0HOmkk+pFDJdzCrZx4bcL1axLzdcjK1Yi3+bFgTgPZarGiEeZqOE 0oBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=U0tBXDISJ7PKav4r0CxWwIZDBb4jy3ecrSqgpsbA5/M=; b=lvXUMZmQCMPolmUf+d5WUvgJR1w0+KTmA7b2c4jPtXoDX4AVWH74oITK0QPAK7RxcB Jpm5Twq67wADpCHd+KyIGt6xMtYQMsFSR+T56+HAvoJsyR5JJGFNTMYceeG2H54IGEX5 PdT9+608VVyxK6I6ylPvXqZbRd0k2PV4ml7HP+Z2bSQBTnMx0qKWrEwGX4BRtt9nwOeW ej/3WkKV9ljyxdYdgChvsf59JclatK42F8efqQfHvXH3Z4j/rZgqpEuv10rIGZyI/Jlb /SU1dIdurKU8Eb3vYaXepwUjIJyUrZmtJ6Uhf8PchSPjTAQkTZKuQoTSjID09UfPyIH5 s7Cg== X-Gm-Message-State: AOAM532nLm+Z4Sz0YWBXjK3Y+aHVGoAv6dI99IlPWWBESvt5HLTMwAlt TUcqYwzUmJ6rsq04/67+tWQ= X-Google-Smtp-Source: ABdhPJxCVmyVxeVzPA96sFx7IYrVStSytwDOLVMpyU3KlnWKEx1b8+yy00bzRJOYt2P0XyP2u5jIjA== X-Received: by 2002:a19:6003:: with SMTP id u3mr1837955lfb.317.1603990251091; Thu, 29 Oct 2020 09:50:51 -0700 (PDT) Received: from pc638.lan (h5ef52e31.seluork.dyn.perspektivbredband.net. [94.245.46.49]) by smtp.gmail.com with ESMTPSA id s1sm331832lfd.236.2020.10.29.09.50.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Oct 2020 09:50:50 -0700 (PDT) From: "Uladzislau Rezki (Sony)" To: LKML , RCU , "Paul E . McKenney" Subject: [PATCH 12/16] drm/i915: Cleanup PREEMPT_COUNT leftovers Date: Thu, 29 Oct 2020 17:50:15 +0100 Message-Id: <20201029165019.14218-12-urezki@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201029165019.14218-1-urezki@gmail.com> References: <20201029165019.14218-1-urezki@gmail.com> MIME-Version: 1.0 X-Mailman-Approved-At: Fri, 30 Oct 2020 08:23:17 +0000 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michal Hocko , "Theodore Y . Ts'o" , intel-gfx@lists.freedesktop.org, Peter Zijlstra , Sebastian Andrzej Siewior , David Airlie , Uladzislau Rezki , dri-devel@lists.freedesktop.org, Rodrigo Vivi , Joel Fernandes , Andrew Morton , Oleksiy Avramchenko , Thomas Gleixner Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Thomas Gleixner CONFIG_PREEMPT_COUNT is now unconditionally enabled and will be removed. Cleanup the leftovers before doing so. Signed-off-by: Thomas Gleixner Cc: Jani Nikula Cc: Joonas Lahtinen Cc: Rodrigo Vivi Cc: David Airlie Cc: Daniel Vetter Cc: intel-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org Signed-off-by: Uladzislau Rezki (Sony) --- 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 25cd9788a4d5..b149f76d3ccd 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 54773371e6bd..ecfed860b3f6 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)