From: "Dixit, Ashutosh" <ashutosh.dixit@intel.com>
To: Jani Nikula <jani.nikula@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH] drm/i915: use IS_ENABLED() instead of defined() on config options
Date: Wed, 04 Sep 2024 08:57:27 -0700 [thread overview]
Message-ID: <87zfonxvh4.wl-ashutosh.dixit@intel.com> (raw)
In-Reply-To: <20240904145218.3902145-1-jani.nikula@intel.com>
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 <ashutosh.dixit@intel.com>
>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
> 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 <asm/smp.h>
> #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
>
next prev parent reply other threads:[~2024-09-04 16:11 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-04 14:52 [PATCH] drm/i915: use IS_ENABLED() instead of defined() on config options Jani Nikula
2024-09-04 15:57 ` Dixit, Ashutosh [this message]
2024-09-05 18:17 ` Jani Nikula
2024-09-04 16:21 ` ✗ Fi.CI.SPARSE: warning for " Patchwork
2024-09-04 16:57 ` ✓ Fi.CI.BAT: success " Patchwork
2024-09-05 14:13 ` ✗ Fi.CI.IGT: failure " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87zfonxvh4.wl-ashutosh.dixit@intel.com \
--to=ashutosh.dixit@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.