On Tue, Aug 20, 2024 at 10:00:38PM +0300, Jani Nikula wrote:
> Unify macro naming. Be more in line with DISPLAY_VER() and
> IS_DISPLAY_VER().
>
> Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx>
This does make it less consistent with the i915-specific graphics/media
macros, but since the goal is to make display its own unit that should
be fine.
Reviewed-by: Matt Roper <matthew.d.roper@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/display/intel_display_device.h | 4 ++--
> drivers/gpu/drm/i915/display/intel_display_power.c | 2 +-
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display_device.h b/drivers/gpu/drm/i915/display/intel_display_device.h
> index 13453ea4daea..30c624989902 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_device.h
> +++ b/drivers/gpu/drm/i915/display/intel_display_device.h
> @@ -161,7 +161,7 @@ enum intel_display_subplatform {
> #define SUPPORTS_TV(i915) (DISPLAY_INFO(i915)->supports_tv)
>
> /* Check that device has a display IP version within the specific range. */
> -#define IS_DISPLAY_IP_RANGE(__i915, from, until) ( \
> +#define IS_DISPLAY_VER_FULL(__i915, from, until) ( \
> BUILD_BUG_ON_ZERO((from) < IP_VER(2, 0)) + \
> (DISPLAY_VER_FULL(__i915) >= (from) && \
> DISPLAY_VER_FULL(__i915) <= (until)))
> @@ -182,7 +182,7 @@ enum intel_display_subplatform {
> * stepping bound for the specified IP version.
> */
> #define IS_DISPLAY_IP_STEP(__i915, ipver, from, until) \
> - (IS_DISPLAY_IP_RANGE((__i915), (ipver), (ipver)) && \
> + (IS_DISPLAY_VER_FULL((__i915), (ipver), (ipver)) && \
> IS_DISPLAY_STEP((__i915), (from), (until)))
>
> #define DISPLAY_INFO(i915) (__to_intel_display(i915)->info.__device_info)
> diff --git a/drivers/gpu/drm/i915/display/intel_display_power.c b/drivers/gpu/drm/i915/display/intel_display_power.c
> index 39ab3117265c..ef2fdbf97346 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_power.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_power.c
> @@ -1684,7 +1684,7 @@ static void icl_display_core_init(struct drm_i915_private *dev_priv,
> intel_dmc_load_program(dev_priv);
>
> /* Wa_14011508470:tgl,dg1,rkl,adl-s,adl-p,dg2 */
> - if (IS_DISPLAY_IP_RANGE(dev_priv, IP_VER(12, 0), IP_VER(13, 0)))
> + if (IS_DISPLAY_VER_FULL(dev_priv, IP_VER(12, 0), IP_VER(13, 0)))
> intel_de_rmw(dev_priv, GEN11_CHICKEN_DCPR_2, 0,
> DCPR_CLEAR_MEMSTAT_DIS | DCPR_SEND_RESP_IMM |
> DCPR_MASK_LPMODE | DCPR_MASK_MAXLATENCY_MEMUP_CLR);
> --
> 2.39.2
>
--
Matt Roper
Graphics Software Engineer
Linux GPU Platform Enablement
Intel Corporation
