Re: [PATCH 08/10] drm/i915/gen9: Add skl_wm_level_equals()

[Paulo Zanoni]

Em Sex, 2016-10-07 Ãs 20:11 -0400, Lyude escreveu:
> Helper we're going to be using for implementing verification of the
> wm
> levels in skl_verify_wm_level().
> 
> Signed-off-by: Lyude <cpaul@xxxxxxxxxx>

Reviewed-by: Paulo Zanoni <paulo.r.zanoni@xxxxxxxxx>

> Cc: Maarten Lankhorst <maarten.lankhorst@xxxxxxxxxxxxxxx>
> Cc: Ville SyrjÃlà <ville.syrjala@xxxxxxxxxxxxxxx>
> Cc: Paulo Zanoni <paulo.r.zanoni@xxxxxxxxx>
> ---
> Âdrivers/gpu/drm/i915/intel_drv.h |ÂÂ2 ++
> Âdrivers/gpu/drm/i915/intel_pm.cÂÂ| 14 ++++++++++++++
> Â2 files changed, 16 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/intel_drv.h
> b/drivers/gpu/drm/i915/intel_drv.h
> index 73a2d16d..3e6e9af 100644
> --- a/drivers/gpu/drm/i915/intel_drv.h
> +++ b/drivers/gpu/drm/i915/intel_drv.h
> @@ -1761,6 +1761,8 @@ void skl_pipe_wm_get_hw_state(struct drm_crtc
> *crtc,
> Âbool intel_can_enable_sagv(struct drm_atomic_state *state);
> Âint intel_enable_sagv(struct drm_i915_private *dev_priv);
> Âint intel_disable_sagv(struct drm_i915_private *dev_priv);
> +bool skl_wm_level_equals(const struct skl_wm_level *l1,
> +			Âconst struct skl_wm_level *l2);
> Âbool skl_ddb_allocation_equals(const struct skl_ddb_allocation *old,
> Â			ÂÂÂÂÂÂÂconst struct skl_ddb_allocation *new,
> Â			ÂÂÂÂÂÂÂenum pipe pipe);
> diff --git a/drivers/gpu/drm/i915/intel_pm.c
> b/drivers/gpu/drm/i915/intel_pm.c
> index 27a520ce..6af1587 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -3853,6 +3853,20 @@ void skl_write_cursor_wm(struct intel_crtc
> *intel_crtc,
> Â			ÂÂÂÂ&ddb->plane[pipe][PLANE_CURSOR]);
> Â}
> Â
> +bool skl_wm_level_equals(const struct skl_wm_level *l1,
> +			Âconst struct skl_wm_level *l2)
> +{
> +	if (l1->plane_en != l2->plane_en)
> +		return false;
> +
> +	/* If both planes aren't enabled, the rest shouldn't matter
> */
> +	if (!l1->plane_en)
> +		return true;
> +
> +	return (l1->plane_res_l == l2->plane_res_l &&
> +		l1->plane_res_b == l2->plane_res_b);
> +}
> +
> Âstatic inline bool skl_ddb_entries_overlap(const struct
> skl_ddb_entry *a,
> Â					ÂÂÂconst struct
> skl_ddb_entry *b)
> Â{