Commit c96c8348 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915: use IS_ENABLED() instead of defined() on config options 



Prefer IS_ENABLED() instead of defined() for checking whether a kconfig
option is enabled.

Reviewed-by: default avatarAshutosh Dixit <ashutosh.dixit@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240904145218.3902145-1-jani.nikula@intel.com


Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 307fa415

drivers/gpu/drm/i915/display/intel_display_irq.c

+1 −1
Original line number Diff line number Diff line
@@ -301,7 +301,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,

drivers/gpu/drm/i915/display/intel_dp_tunnel.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/gpu/drm/i915/gem/i915_gem_pm.c

+1 −1
Original line number Diff line number Diff line
@@ -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() \

drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/gpu/drm/i915/gt/uc/intel_guc_log.c

+1 −1
Original line number Diff line number Diff line
@@ -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