On Tue, 31 Jan 2023, Ville Syrjala <ville.syrjala@xxxxxxxxxxxxxxx> wrote: > From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > > Introuce a HAS_SAGV() macro to answer the question whether > the platform in general supports SAGV. intel_has_sagv() will > keep on giving us the more specific answer whether the current > device supports SAGV or not. > > Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> Reviewed-by: Jani Nikula <jani.nikula@xxxxxxxxx> > --- > drivers/gpu/drm/i915/display/skl_watermark.c | 6 +++--- > drivers/gpu/drm/i915/i915_drv.h | 3 ++- > 2 files changed, 5 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/skl_watermark.c b/drivers/gpu/drm/i915/display/skl_watermark.c > index 0c605034356f..5916694f147c 100644 > --- a/drivers/gpu/drm/i915/display/skl_watermark.c > +++ b/drivers/gpu/drm/i915/display/skl_watermark.c > @@ -64,7 +64,7 @@ static bool skl_needs_memory_bw_wa(struct drm_i915_private *i915) > static bool > intel_has_sagv(struct drm_i915_private *i915) > { > - return DISPLAY_VER(i915) >= 9 && !IS_LP(i915) && > + return HAS_SAGV(i915) && > i915->display.sagv.status != I915_SAGV_NOT_CONTROLLED; > } > > @@ -92,7 +92,7 @@ intel_sagv_block_time(struct drm_i915_private *i915) > return val; > } else if (DISPLAY_VER(i915) == 11) { > return 10; > - } else if (DISPLAY_VER(i915) == 9 && !IS_LP(i915)) { > + } else if (HAS_SAGV(i915)) { > return 30; > } else { > return 0; > @@ -101,7 +101,7 @@ intel_sagv_block_time(struct drm_i915_private *i915) > > static void intel_sagv_init(struct drm_i915_private *i915) > { > - if (!intel_has_sagv(i915)) > + if (!HAS_SAGV(i915)) > i915->display.sagv.status = I915_SAGV_NOT_CONTROLLED; > > /* > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > index a0dcf3352b66..0393273faa09 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -863,7 +863,8 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915, > */ > #define HAS_64K_PAGES(dev_priv) (INTEL_INFO(dev_priv)->has_64k_pages) > > -#define HAS_IPC(dev_priv) (INTEL_INFO(dev_priv)->display.has_ipc) > +#define HAS_IPC(dev_priv) (INTEL_INFO(dev_priv)->display.has_ipc) > +#define HAS_SAGV(dev_priv) (DISPLAY_VER(dev_priv) >= 9 && !IS_LP(dev_priv)) > > #define HAS_REGION(i915, i) (RUNTIME_INFO(i915)->memory_regions & (i)) > #define HAS_LMEM(i915) HAS_REGION(i915, REGION_LMEM) -- Jani Nikula, Intel Open Source Graphics Center