From: Lyude <cpaul@redhat.com> To: intel-gfx@lists.freedesktop.org Cc: Lyude <cpaul@redhat.com>, "Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>, "Ville Syrjälä" <ville.syrjala@linux.intel.com>, "Matt Roper" <matthew.d.roper@intel.com>, "Paulo Zanoni" <paulo.r.zanoni@intel.com>, "Daniel Vetter" <daniel.vetter@intel.com>, "Jani Nikula" <jani.nikula@linux.intel.com>, "David Airlie" <airlied@linux.ie>, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 08/10] drm/i915/gen9: Add skl_wm_level_equals() Date: Fri, 14 Oct 2016 17:31:56 -0400 [thread overview] Message-ID: <1476480722-13015-9-git-send-email-cpaul@redhat.com> (raw) In-Reply-To: <1476480722-13015-1-git-send-email-cpaul@redhat.com> Helper we're going to be using for implementing verification of the wm levels in skl_verify_wm_level(). Signed-off-by: Lyude <cpaul@redhat.com> Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> Cc: Matt Roper <matthew.d.roper@intel.com Cc: Paulo Zanoni <paulo.r.zanoni@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 7036310..96963ea 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 6eaeb87..fae3ce4 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -3857,6 +3857,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) { -- 2.7.4
WARNING: multiple messages have this Message-ID (diff)
From: Lyude <cpaul@redhat.com> To: intel-gfx@lists.freedesktop.org Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Daniel Vetter <daniel.vetter@intel.com>, Lyude <cpaul@redhat.com> Subject: [PATCH v2 08/10] drm/i915/gen9: Add skl_wm_level_equals() Date: Fri, 14 Oct 2016 17:31:56 -0400 [thread overview] Message-ID: <1476480722-13015-9-git-send-email-cpaul@redhat.com> (raw) In-Reply-To: <1476480722-13015-1-git-send-email-cpaul@redhat.com> Helper we're going to be using for implementing verification of the wm levels in skl_verify_wm_level(). Signed-off-by: Lyude <cpaul@redhat.com> Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> Cc: Matt Roper <matthew.d.roper@intel.com Cc: Paulo Zanoni <paulo.r.zanoni@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 7036310..96963ea 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 6eaeb87..fae3ce4 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -3857,6 +3857,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) { -- 2.7.4 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2016-10-14 21:36 UTC|newest] Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-10-14 21:31 [PATCH v3 00/10] Start of skl watermark cleanup Lyude 2016-10-14 21:31 ` Lyude 2016-10-14 21:31 ` [PATCH v3 01/10] drm/i915/skl: Move per-pipe ddb allocations into crtc states Lyude 2016-10-14 21:31 ` Lyude 2016-10-14 21:31 ` [PATCH v3 02/10] drm/i915/skl: Remove linetime from skl_wm_values Lyude 2016-10-14 21:31 ` Lyude 2016-10-14 21:31 ` [PATCH v3 03/10] drm/i915/gen9: Make skl_wm_level per-plane Lyude 2016-10-14 21:31 ` Lyude 2016-10-14 21:31 ` [PATCH v2 04/10] drm/i915/gen9: Cleanup skl_pipe_wm_active_state Lyude 2016-10-14 21:31 ` Lyude 2016-10-14 21:31 ` [PATCH v3 05/10] drm/i915/gen9: Get rid of redundant watermark values Lyude 2016-10-14 21:31 ` Lyude 2016-10-18 18:09 ` [PATCH v4 " Paulo Zanoni 2016-10-14 21:31 ` [PATCH v3 06/10] drm/i915/gen9: Add ddb changes to atomic debug output Lyude 2016-10-14 21:31 ` Lyude 2016-10-14 21:31 ` [PATCH v2 07/10] drm/i915/gen9: Make skl_pipe_wm_get_hw_state() reusable Lyude 2016-10-18 18:12 ` Paulo Zanoni 2016-10-18 18:12 ` Paulo Zanoni 2016-10-14 21:31 ` Lyude [this message] 2016-10-14 21:31 ` [PATCH v2 08/10] drm/i915/gen9: Add skl_wm_level_equals() Lyude 2016-10-14 21:31 ` [PATCH v2 09/10] drm/i915/gen9: Actually verify WM levels in verify_wm_state() Lyude 2016-10-14 21:31 ` Lyude 2016-10-14 21:31 ` [PATCH v2 10/10] drm/i915/gen9: Don't wrap strings " Lyude 2016-10-14 21:31 ` Lyude 2016-10-14 22:21 ` ✗ Fi.CI.BAT: warning for Start of skl watermark cleanup (rev3) Patchwork 2016-10-17 6:00 ` Saarinen, Jani 2016-10-16 23:21 ` [PATCH v3 00/10] Start of skl watermark cleanup Lyude 2016-10-16 23:21 ` Lyude
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1476480722-13015-9-git-send-email-cpaul@redhat.com \ --to=cpaul@redhat.com \ --cc=airlied@linux.ie \ --cc=daniel.vetter@intel.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=intel-gfx@lists.freedesktop.org \ --cc=jani.nikula@linux.intel.com \ --cc=linux-kernel@vger.kernel.org \ --cc=maarten.lankhorst@linux.intel.com \ --cc=matthew.d.roper@intel.com \ --cc=paulo.r.zanoni@intel.com \ --cc=ville.syrjala@linux.intel.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.