From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 7EEC1CD98FE for ; Thu, 5 Sep 2024 18:17:54 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2B2F410E928; Thu, 5 Sep 2024 18:17:54 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="Ob04R2iq"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.15]) by gabe.freedesktop.org (Postfix) with ESMTPS id A545110E928 for ; Thu, 5 Sep 2024 18:17:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1725560272; x=1757096272; h=from:to:cc:subject:in-reply-to:references:date: message-id:mime-version; bh=q9Aywq/2qRW07LVhQ5iSxPWJaPH+GCNWhMuyFqDv/KQ=; b=Ob04R2iqZOsf/WwF3OJHC/My7EcQ4WNPrF05Z72TAUCqmQwxCVUlr2Qd E+CSgLOyrEOHV2KyqlA2mty6IalLEoIpRm/ivJleSvw7fC89vbHZwdeIW +qUHxur7z44Btsl99K4rXorzBUD1Mii/Mj4DxWypfIGKq0kFzPhjOrzj2 IlQO3Q5om/3tP9WXACUad56YUd3B11KImNYD4q6BMxZyOuTtRjNM67Vel 5Q5yR2iaMwpfQBVsZwKJae0j4139A/qSQx0vpW3QW0yP+O+mfxtvEBOdf FSwJ4M/U/XjyKjhLG/+ls27EG/XqONELvZguTQB76l/FuzEUANi/0kYX/ w==; X-CSE-ConnectionGUID: Uk4cIJwLRVyTUpHgWJp0hg== X-CSE-MsgGUID: Pnv2A8V1REqLADOClOeptA== X-IronPort-AV: E=McAfee;i="6700,10204,11186"; a="24462045" X-IronPort-AV: E=Sophos;i="6.10,205,1719903600"; d="scan'208";a="24462045" Received: from orviesa006.jf.intel.com ([10.64.159.146]) by fmvoesa109.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Sep 2024 11:17:52 -0700 X-CSE-ConnectionGUID: /Owl0T3aT66r0j5GhRCsbg== X-CSE-MsgGUID: yZWb3bFUTEui6mSHJjezXg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,205,1719903600"; d="scan'208";a="66031952" Received: from fdefranc-mobl3.ger.corp.intel.com (HELO localhost) ([10.245.246.216]) by orviesa006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Sep 2024 11:17:51 -0700 From: Jani Nikula To: "Dixit, Ashutosh" Cc: intel-gfx@lists.freedesktop.org Subject: Re: [PATCH] drm/i915: use IS_ENABLED() instead of defined() on config options In-Reply-To: <87zfonxvh4.wl-ashutosh.dixit@intel.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20240904145218.3902145-1-jani.nikula@intel.com> <87zfonxvh4.wl-ashutosh.dixit@intel.com> Date: Thu, 05 Sep 2024 21:17:47 +0300 Message-ID: <871q1yoth0.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Wed, 04 Sep 2024, "Dixit, Ashutosh" wrote: > On Wed, 04 Sep 2024 07:52:18 -0700, Jani Nikula wrote: >> >> Prefer IS_ENABLED() instead of defined() for checking whether a kconfig >> option is enabled. > > Reviewed-by: Ashutosh Dixit Thanks, pushed to din. BR, Jani. > >> >> Signed-off-by: Jani Nikula >> --- >> drivers/gpu/drm/i915/display/intel_display_irq.c | 2 +- >> drivers/gpu/drm/i915/display/intel_dp_tunnel.h | 2 +- >> drivers/gpu/drm/i915/gem/i915_gem_pm.c | 2 +- >> drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c | 2 +- >> drivers/gpu/drm/i915/gt/uc/intel_guc_log.c | 2 +- >> drivers/gpu/drm/i915/gt/uc/intel_huc.c | 2 +- >> drivers/gpu/drm/i915/i915_trace.h | 2 +- >> drivers/gpu/drm/i915/i915_utils.h | 2 +- >> drivers/gpu/drm/i915/selftests/mock_gem_device.c | 4 ++-- >> 9 files changed, 10 insertions(+), 10 deletions(-) >> >> diff --git a/drivers/gpu/drm/i915/display/intel_display_irq.c b/drivers/gpu/drm/i915/display/intel_display_irq.c >> index 73369847ed66..9c0b83abbe3c 100644 >> --- a/drivers/gpu/drm/i915/display/intel_display_irq.c >> +++ b/drivers/gpu/drm/i915/display/intel_display_irq.c >> @@ -298,7 +298,7 @@ void i915_enable_asle_pipestat(struct drm_i915_private *dev_priv) >> spin_unlock_irq(&dev_priv->irq_lock); >> } >> >> -#if defined(CONFIG_DEBUG_FS) >> +#if IS_ENABLED(CONFIG_DEBUG_FS) >> static void display_pipe_crc_irq_handler(struct drm_i915_private *dev_priv, >> enum pipe pipe, >> u32 crc0, u32 crc1, >> diff --git a/drivers/gpu/drm/i915/display/intel_dp_tunnel.h b/drivers/gpu/drm/i915/display/intel_dp_tunnel.h >> index a0c00b7d3303..e9314cf25a19 100644 >> --- a/drivers/gpu/drm/i915/display/intel_dp_tunnel.h >> +++ b/drivers/gpu/drm/i915/display/intel_dp_tunnel.h >> @@ -20,7 +20,7 @@ struct intel_dp; >> struct intel_encoder; >> struct intel_link_bw_limits; >> >> -#if defined(CONFIG_DRM_I915_DP_TUNNEL) && defined(I915) >> +#if IS_ENABLED(CONFIG_DRM_I915_DP_TUNNEL) && defined(I915) >> >> int intel_dp_tunnel_detect(struct intel_dp *intel_dp, struct drm_modeset_acquire_ctx *ctx); >> void intel_dp_tunnel_disconnect(struct intel_dp *intel_dp); >> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_pm.c b/drivers/gpu/drm/i915/gem/i915_gem_pm.c >> index 3b27218aabe2..900c08337942 100644 >> --- a/drivers/gpu/drm/i915/gem/i915_gem_pm.c >> +++ b/drivers/gpu/drm/i915/gem/i915_gem_pm.c >> @@ -13,7 +13,7 @@ >> #include "i915_driver.h" >> #include "i915_drv.h" >> >> -#if defined(CONFIG_X86) >> +#if IS_ENABLED(CONFIG_X86) >> #include >> #else >> #define wbinvd_on_all_cpus() \ >> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c >> index 23f54c84cbab..fe53e8eccf4b 100644 >> --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c >> +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c >> @@ -145,7 +145,7 @@ static inline bool guc_load_done(struct intel_uncore *uncore, u32 *status, bool >> * an end user should hit the timeout is in case of extreme thermal throttling. >> * And a system that is that hot during boot is probably dead anyway! >> */ >> -#if defined(CONFIG_DRM_I915_DEBUG_GEM) >> +#if IS_ENABLED(CONFIG_DRM_I915_DEBUG_GEM) >> #define GUC_LOAD_RETRY_LIMIT 20 >> #else >> #define GUC_LOAD_RETRY_LIMIT 3 >> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_log.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_log.c >> index bf16351c9349..222c95f62156 100644 >> --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_log.c >> +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_log.c >> @@ -14,7 +14,7 @@ >> #include "intel_guc_log.h" >> #include "intel_guc_print.h" >> >> -#if defined(CONFIG_DRM_I915_DEBUG_GUC) >> +#if IS_ENABLED(CONFIG_DRM_I915_DEBUG_GUC) >> #define GUC_LOG_DEFAULT_CRASH_BUFFER_SIZE SZ_2M >> #define GUC_LOG_DEFAULT_DEBUG_BUFFER_SIZE SZ_16M >> #define GUC_LOG_DEFAULT_CAPTURE_BUFFER_SIZE SZ_1M >> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc.c b/drivers/gpu/drm/i915/gt/uc/intel_huc.c >> index 2d9152eb7282..d7ac31c3254c 100644 >> --- a/drivers/gpu/drm/i915/gt/uc/intel_huc.c >> +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc.c >> @@ -455,7 +455,7 @@ static const char *auth_mode_string(struct intel_huc *huc, >> * an end user should hit the timeout is in case of extreme thermal throttling. >> * And a system that is that hot during boot is probably dead anyway! >> */ >> -#if defined(CONFIG_DRM_I915_DEBUG_GEM) >> +#if IS_ENABLED(CONFIG_DRM_I915_DEBUG_GEM) >> #define HUC_LOAD_RETRY_LIMIT 20 >> #else >> #define HUC_LOAD_RETRY_LIMIT 3 >> diff --git a/drivers/gpu/drm/i915/i915_trace.h b/drivers/gpu/drm/i915/i915_trace.h >> index ce1cbee1b39d..09d89bdf82f4 100644 >> --- a/drivers/gpu/drm/i915/i915_trace.h >> +++ b/drivers/gpu/drm/i915/i915_trace.h >> @@ -322,7 +322,7 @@ DEFINE_EVENT(i915_request, i915_request_add, >> TP_ARGS(rq) >> ); >> >> -#if defined(CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS) >> +#if IS_ENABLED(CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS) >> DEFINE_EVENT(i915_request, i915_request_guc_submit, >> TP_PROTO(struct i915_request *rq), >> TP_ARGS(rq) >> diff --git a/drivers/gpu/drm/i915/i915_utils.h b/drivers/gpu/drm/i915/i915_utils.h >> index 71bdc89bd621..609214231ffc 100644 >> --- a/drivers/gpu/drm/i915/i915_utils.h >> +++ b/drivers/gpu/drm/i915/i915_utils.h >> @@ -270,7 +270,7 @@ wait_remaining_ms_from_jiffies(unsigned long timestamp_jiffies, int to_wait_ms) >> #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) >> +#if IS_ENABLED(CONFIG_DRM_I915_DEBUG) && IS_ENABLED(CONFIG_PREEMPT_COUNT) >> # define _WAIT_FOR_ATOMIC_CHECK(ATOMIC) WARN_ON_ONCE((ATOMIC) && !in_atomic()) >> #else >> # define _WAIT_FOR_ATOMIC_CHECK(ATOMIC) do { } while (0) >> diff --git a/drivers/gpu/drm/i915/selftests/mock_gem_device.c b/drivers/gpu/drm/i915/selftests/mock_gem_device.c >> index 91794ca17a58..70f3d7bf47d0 100644 >> --- a/drivers/gpu/drm/i915/selftests/mock_gem_device.c >> +++ b/drivers/gpu/drm/i915/selftests/mock_gem_device.c >> @@ -137,7 +137,7 @@ static const struct intel_device_info mock_info = { >> >> struct drm_i915_private *mock_gem_device(void) >> { >> -#if IS_ENABLED(CONFIG_IOMMU_API) && defined(CONFIG_INTEL_IOMMU) >> +#if IS_ENABLED(CONFIG_IOMMU_API) && IS_ENABLED(CONFIG_INTEL_IOMMU) >> static struct dev_iommu fake_iommu = { .priv = (void *)-1 }; >> #endif >> struct drm_i915_private *i915; >> @@ -153,7 +153,7 @@ struct drm_i915_private *mock_gem_device(void) >> dev_set_name(&pdev->dev, "mock"); >> dma_coerce_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64)); >> >> -#if IS_ENABLED(CONFIG_IOMMU_API) && defined(CONFIG_INTEL_IOMMU) >> +#if IS_ENABLED(CONFIG_IOMMU_API) && IS_ENABLED(CONFIG_INTEL_IOMMU) >> /* HACK to disable iommu for the fake device; force identity mapping */ >> pdev->dev.iommu = &fake_iommu; >> #endif >> -- >> 2.39.2 >> -- Jani Nikula, Intel