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 at redhat.com>
Reviewed-by: Paulo Zanoni <paulo.r.zanoni at intel.com>
> Cc: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
> Cc: Ville Syrjälä <ville.syrjala at linux.intel.com>
> Cc: Paulo Zanoni <paulo.r.zanoni at intel.com>
> ---
> Â 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)
> Â {