Commit 5ea28f92 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/xe: 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 avatarBadal Nilawar <badal.nilawar@intel.com>
Reviewed-by: default avatarAshutosh Dixit <ashutosh.dixit@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240904145231.3902289-1-jani.nikula@intel.com


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

drivers/gpu/drm/xe/xe_bo.c

+1 −1
Original line number Diff line number Diff line
@@ -468,7 +468,7 @@ static int xe_ttm_io_mem_reserve(struct ttm_device *bdev, 
		mem->bus.offset += vram->io_start;

		mem->bus.is_iomem = true;



#if  !defined(CONFIG_X86)

#if  !IS_ENABLED(CONFIG_X86)

		mem->bus.caching = ttm_write_combined;

#endif

		return 0;

drivers/gpu/drm/xe/xe_gt_sriov_vf_debugfs.c

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ static const struct drm_info_list vf_info[] = { 
		.show = xe_gt_debugfs_simple_show,

		.data = xe_gt_sriov_vf_print_version,

	},

#if defined(CONFIG_DRM_XE_DEBUG) || defined(CONFIG_DRM_XE_DEBUG_SRIOV)

#if IS_ENABLED(CONFIG_DRM_XE_DEBUG) || IS_ENABLED(CONFIG_DRM_XE_DEBUG_SRIOV)

	{

		"runtime_regs",

		.show = xe_gt_debugfs_simple_show,

drivers/gpu/drm/xe/xe_guc.c

+1 −1
Original line number Diff line number Diff line
@@ -583,7 +583,7 @@ static s32 guc_pc_get_cur_freq(struct xe_guc_pc *guc_pc) 
 * extreme thermal throttling. And a system that is that hot during boot is probably

 * dead anyway!

 */

#if defined(CONFIG_DRM_XE_DEBUG)

#if IS_ENABLED(CONFIG_DRM_XE_DEBUG)

#define GUC_LOAD_RETRY_LIMIT	20

#else

#define GUC_LOAD_RETRY_LIMIT	3