Skip to content

Commit 4836c6c

Browse files
committed
drm/i915: remove unused leftover basedie step code
The basedie step initialization as well as its last users were removed in commit 326e30e ("drm/i915: Drop dead code for pvc"). Follow through with removing the unused macros and struct member and debug logging. Suggested-by: Matt Roper <[email protected]> Reviewed-by: Matt Roper <[email protected]> Reviewed-by: Jonathan Cavitt <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] Signed-off-by: Jani Nikula <[email protected]>
1 parent e24b0ef commit 4836c6c

File tree

3 files changed

+0
-7
lines changed

3 files changed

+0
-7
lines changed

drivers/gpu/drm/i915/i915_drv.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,6 @@ static inline struct intel_gt *to_gt(const struct drm_i915_private *i915)
410410

411411
#define INTEL_GRAPHICS_STEP(__i915) (RUNTIME_INFO(__i915)->step.graphics_step)
412412
#define INTEL_MEDIA_STEP(__i915) (RUNTIME_INFO(__i915)->step.media_step)
413-
#define INTEL_BASEDIE_STEP(__i915) (RUNTIME_INFO(__i915)->step.basedie_step)
414413

415414
#define IS_GRAPHICS_STEP(__i915, since, until) \
416415
(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)
420419
(drm_WARN_ON(&(__i915)->drm, INTEL_MEDIA_STEP(__i915) == STEP_NONE), \
421420
INTEL_MEDIA_STEP(__i915) >= (since) && INTEL_MEDIA_STEP(__i915) < (until))
422421

423-
#define IS_BASEDIE_STEP(__i915, since, until) \
424-
(drm_WARN_ON(&(__i915)->drm, INTEL_BASEDIE_STEP(__i915) == STEP_NONE), \
425-
INTEL_BASEDIE_STEP(__i915) >= (since) && INTEL_BASEDIE_STEP(__i915) < (until))
426-
427422
static __always_inline unsigned int
428423
__platform_mask_index(const struct intel_runtime_info *info,
429424
enum intel_platform p)

drivers/gpu/drm/i915/intel_device_info.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@ void intel_device_info_print(const struct intel_device_info *info,
108108

109109
drm_printf(p, "graphics stepping: %s\n", intel_step_name(runtime->step.graphics_step));
110110
drm_printf(p, "media stepping: %s\n", intel_step_name(runtime->step.media_step));
111-
drm_printf(p, "base die stepping: %s\n", intel_step_name(runtime->step.basedie_step));
112111

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

drivers/gpu/drm/i915/intel_step.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ struct intel_step_info {
1717
*/
1818
u8 graphics_step; /* Represents the compute tile on Xe_HPC */
1919
u8 media_step;
20-
u8 basedie_step;
2120
};
2221

2322
#define STEP_ENUM_VAL(name) STEP_##name,

0 commit comments

Comments
 (0)