Commit 4836c6cc authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915: remove unused leftover basedie step code 



The basedie step initialization as well as its last users were removed
in commit 326e30e4 ("drm/i915: Drop dead code for pvc"). Follow
through with removing the unused macros and struct member and debug
logging.

Suggested-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Reviewed-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Reviewed-by: default avatarJonathan Cavitt <jonathan.cavitt@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240822143946.2526425-1-jani.nikula@intel.com


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

drivers/gpu/drm/i915/i915_drv.h

+0 −5
Original line number Diff line number Diff line
@@ -410,7 +410,6 @@ static inline struct intel_gt *to_gt(const struct drm_i915_private *i915) 


#define INTEL_GRAPHICS_STEP(__i915) (RUNTIME_INFO(__i915)->step.graphics_step)

#define INTEL_MEDIA_STEP(__i915) (RUNTIME_INFO(__i915)->step.media_step)

#define INTEL_BASEDIE_STEP(__i915) (RUNTIME_INFO(__i915)->step.basedie_step)



#define IS_GRAPHICS_STEP(__i915, since, until) \

	(drm_WARN_ON(&(__i915)->drm, INTEL_GRAPHICS_STEP(__i915) == STEP_NONE), \
@@ -420,10 +419,6 @@ static inline struct intel_gt *to_gt(const struct drm_i915_private *i915) 
	(drm_WARN_ON(&(__i915)->drm, INTEL_MEDIA_STEP(__i915) == STEP_NONE), \

	 INTEL_MEDIA_STEP(__i915) >= (since) && INTEL_MEDIA_STEP(__i915) < (until))



#define IS_BASEDIE_STEP(__i915, since, until) \

	(drm_WARN_ON(&(__i915)->drm, INTEL_BASEDIE_STEP(__i915) == STEP_NONE), \

	 INTEL_BASEDIE_STEP(__i915) >= (since) && INTEL_BASEDIE_STEP(__i915) < (until))



static __always_inline unsigned int

__platform_mask_index(const struct intel_runtime_info *info,

		      enum intel_platform p)

drivers/gpu/drm/i915/intel_device_info.c

+0 −1
Original line number Diff line number Diff line
@@ -108,7 +108,6 @@ void intel_device_info_print(const struct intel_device_info *info, 


	drm_printf(p, "graphics stepping: %s\n", intel_step_name(runtime->step.graphics_step));

	drm_printf(p, "media stepping: %s\n", intel_step_name(runtime->step.media_step));

	drm_printf(p, "base die stepping: %s\n", intel_step_name(runtime->step.basedie_step));



	drm_printf(p, "gt: %d\n", info->gt);

	drm_printf(p, "memory-regions: 0x%x\n", info->memory_regions);

drivers/gpu/drm/i915/intel_step.h

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ struct intel_step_info { 
	 */

	u8 graphics_step;	/* Represents the compute tile on Xe_HPC */

	u8 media_step;

	u8 basedie_step;

};



#define STEP_ENUM_VAL(name)  STEP_##name,