| Message ID | 20240822143946.2526425-1-jani.nikula@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915: remove unused leftover basedie step code | expand |
On Thu, Aug 22, 2024 at 05:39:46PM +0300, Jani Nikula wrote: > The basedie step initialization as well as its last users were removed > in commit 326e30e4624c ("drm/i915: Drop dead code for pvc"). Follow > through with removing the unused macros and struct member and debug > logging. > > Suggested-by: Matt Roper <matthew.d.roper@intel.com> > Signed-off-by: Jani Nikula <jani.nikula@intel.com> > --- > drivers/gpu/drm/i915/i915_drv.h | 5 ----- > drivers/gpu/drm/i915/intel_device_info.c | 1 - > drivers/gpu/drm/i915/intel_step.h | 1 - > 3 files changed, 7 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > index 3b1b16e71cf9..eb4c33e83c7c 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -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) > diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c > index d92b3050ac78..b485e959f064 100644 > --- a/drivers/gpu/drm/i915/intel_device_info.c > +++ b/drivers/gpu/drm/i915/intel_device_info.c > @@ -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); > diff --git a/drivers/gpu/drm/i915/intel_step.h b/drivers/gpu/drm/i915/intel_step.h > index 83bd1190edf5..22f1d6905160 100644 > --- a/drivers/gpu/drm/i915/intel_step.h > +++ b/drivers/gpu/drm/i915/intel_step.h > @@ -17,7 +17,6 @@ struct intel_step_info { > */ > u8 graphics_step; /* Represents the compute tile on Xe_HPC */ Looks like we should drop the comment on this line too (Xe_HPC is the name of PVC's IP)... Reviewed-by: Matt Roper <matthew.d.roper@intel.com> > u8 media_step; > - u8 basedie_step; > }; > > #define STEP_ENUM_VAL(name) STEP_##name, > -- > 2.39.2 >
-----Original Message----- From: Intel-gfx <intel-gfx-bounces@lists.freedesktop.org> On Behalf Of Jani Nikula Sent: Thursday, August 22, 2024 7:40 AM To: intel-gfx@lists.freedesktop.org Cc: Nikula, Jani <jani.nikula@intel.com>; Roper, Matthew D <matthew.d.roper@intel.com> Subject: [PATCH] drm/i915: remove unused leftover basedie step code > > The basedie step initialization as well as its last users were removed > in commit 326e30e4624c ("drm/i915: Drop dead code for pvc"). Follow > through with removing the unused macros and struct member and debug > logging. > > Suggested-by: Matt Roper <matthew.d.roper@intel.com> > Signed-off-by: Jani Nikula <jani.nikula@intel.com> LGTM. Reviewed-by: Jonathan Cavitt <jonathan.cavitt@intel.com> -Jonathan Cavitt > --- > drivers/gpu/drm/i915/i915_drv.h | 5 ----- > drivers/gpu/drm/i915/intel_device_info.c | 1 - > drivers/gpu/drm/i915/intel_step.h | 1 - > 3 files changed, 7 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > index 3b1b16e71cf9..eb4c33e83c7c 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -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) > diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c > index d92b3050ac78..b485e959f064 100644 > --- a/drivers/gpu/drm/i915/intel_device_info.c > +++ b/drivers/gpu/drm/i915/intel_device_info.c > @@ -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); > diff --git a/drivers/gpu/drm/i915/intel_step.h b/drivers/gpu/drm/i915/intel_step.h > index 83bd1190edf5..22f1d6905160 100644 > --- a/drivers/gpu/drm/i915/intel_step.h > +++ b/drivers/gpu/drm/i915/intel_step.h > @@ -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, > -- > 2.39.2 > >
On Thu, 22 Aug 2024, Matt Roper <matthew.d.roper@intel.com> wrote: > On Thu, Aug 22, 2024 at 05:39:46PM +0300, Jani Nikula wrote: >> The basedie step initialization as well as its last users were removed >> in commit 326e30e4624c ("drm/i915: Drop dead code for pvc"). Follow >> through with removing the unused macros and struct member and debug >> logging. >> >> Suggested-by: Matt Roper <matthew.d.roper@intel.com> >> Signed-off-by: Jani Nikula <jani.nikula@intel.com> >> --- >> drivers/gpu/drm/i915/i915_drv.h | 5 ----- >> drivers/gpu/drm/i915/intel_device_info.c | 1 - >> drivers/gpu/drm/i915/intel_step.h | 1 - >> 3 files changed, 7 deletions(-) >> >> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h >> index 3b1b16e71cf9..eb4c33e83c7c 100644 >> --- a/drivers/gpu/drm/i915/i915_drv.h >> +++ b/drivers/gpu/drm/i915/i915_drv.h >> @@ -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) >> diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c >> index d92b3050ac78..b485e959f064 100644 >> --- a/drivers/gpu/drm/i915/intel_device_info.c >> +++ b/drivers/gpu/drm/i915/intel_device_info.c >> @@ -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); >> diff --git a/drivers/gpu/drm/i915/intel_step.h b/drivers/gpu/drm/i915/intel_step.h >> index 83bd1190edf5..22f1d6905160 100644 >> --- a/drivers/gpu/drm/i915/intel_step.h >> +++ b/drivers/gpu/drm/i915/intel_step.h >> @@ -17,7 +17,6 @@ struct intel_step_info { >> */ >> u8 graphics_step; /* Represents the compute tile on Xe_HPC */ > > Looks like we should drop the comment on this line too (Xe_HPC is the > name of PVC's IP)... Cleanups for another time... > > > Reviewed-by: Matt Roper <matthew.d.roper@intel.com> Thanks for the review, pushed this one. BR, Jani. > >> u8 media_step; >> - u8 basedie_step; >> }; >> >> #define STEP_ENUM_VAL(name) STEP_##name, >> -- >> 2.39.2 >>
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 3b1b16e71cf9..eb4c33e83c7c 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -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) diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c index d92b3050ac78..b485e959f064 100644 --- a/drivers/gpu/drm/i915/intel_device_info.c +++ b/drivers/gpu/drm/i915/intel_device_info.c @@ -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); diff --git a/drivers/gpu/drm/i915/intel_step.h b/drivers/gpu/drm/i915/intel_step.h index 83bd1190edf5..22f1d6905160 100644 --- a/drivers/gpu/drm/i915/intel_step.h +++ b/drivers/gpu/drm/i915/intel_step.h @@ -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,
The basedie step initialization as well as its last users were removed in commit 326e30e4624c ("drm/i915: Drop dead code for pvc"). Follow through with removing the unused macros and struct member and debug logging. Suggested-by: Matt Roper <matthew.d.roper@intel.com> Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- drivers/gpu/drm/i915/i915_drv.h | 5 ----- drivers/gpu/drm/i915/intel_device_info.c | 1 - drivers/gpu/drm/i915/intel_step.h | 1 - 3 files changed, 7 deletions(-)