From: Lyude <cpaul@redhat.com> To: intel-gfx@lists.freedesktop.org Cc: Lyude <cpaul@redhat.com>, "Ville Syrjälä" <ville.syrjala@linux.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 06/10] drm/i915/gen9: Add ddb changes to atomic debug output Date: Fri, 7 Oct 2016 20:11:30 -0400 [thread overview] Message-ID: <1475885497-6094-7-git-send-email-cpaul@redhat.com> (raw) In-Reply-To: <1475885497-6094-1-git-send-email-cpaul@redhat.com> Finally, add some debugging output for ddb changes in the atomic debug output. This makes it a lot easier to spot bugs from incorrect ddb allocations. Signed-off-by: Lyude <cpaul@redhat.com> Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> Cc: Paulo Zanoni <paulo.r.zanoni@intel.com> --- drivers/gpu/drm/i915/intel_pm.c | 57 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index 5cb537c..9e53ff7 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -4040,6 +4040,61 @@ skl_copy_wm_for_pipe(struct skl_wm_values *dst, sizeof(dst->ddb.plane[pipe])); } +static void +skl_print_wm_changes(const struct drm_atomic_state *state) +{ + const struct drm_device *dev = state->dev; + const struct drm_i915_private *dev_priv = to_i915(dev); + const struct intel_atomic_state *intel_state = + to_intel_atomic_state(state); + const struct drm_crtc *crtc; + const struct drm_crtc_state *cstate; + const struct drm_plane *plane; + const struct intel_plane *intel_plane; + const struct drm_plane_state *pstate; + const struct skl_ddb_allocation *old_ddb = &dev_priv->wm.skl_hw.ddb; + const struct skl_ddb_allocation *new_ddb = &intel_state->wm_results.ddb; + enum pipe pipe; + int id; + int i, j; + + for_each_crtc_in_state(state, crtc, cstate, i) { + if (!crtc->state) + continue; + + pipe = to_intel_crtc(crtc)->pipe; + + for_each_plane_in_state(state, plane, pstate, j) { + const struct skl_ddb_entry *old, *new; + + intel_plane = to_intel_plane(plane); + id = skl_wm_plane_id(intel_plane); + old = &old_ddb->plane[pipe][id]; + new = &new_ddb->plane[pipe][id]; + + if (intel_plane->pipe != pipe) + continue; + + if (skl_ddb_entry_equal(old, new)) + continue; + + if (id != PLANE_CURSOR) { + DRM_DEBUG_ATOMIC("[PLANE:%d:plane %d%c] ddb (%d - %d) -> (%d - %d)\n", + plane->base.id, id + 1, + pipe_name(pipe), + old->start, old->end, + new->start, new->end); + } else { + DRM_DEBUG_ATOMIC("[PLANE:%d:cursor %c] ddb (%d - %d) -> (%d - %d)\n", + plane->base.id, + pipe_name(pipe), + old->start, old->end, + new->start, new->end); + } + } + } +} + static int skl_compute_wm(struct drm_atomic_state *state) { @@ -4101,6 +4156,8 @@ skl_compute_wm(struct drm_atomic_state *state) intel_cstate->update_wm_pre = true; } + skl_print_wm_changes(state); + return 0; } -- 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>, David Airlie <airlied@linux.ie>, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Daniel Vetter <daniel.vetter@intel.com> Subject: [PATCH v2 06/10] drm/i915/gen9: Add ddb changes to atomic debug output Date: Fri, 7 Oct 2016 20:11:30 -0400 [thread overview] Message-ID: <1475885497-6094-7-git-send-email-cpaul@redhat.com> (raw) In-Reply-To: <1475885497-6094-1-git-send-email-cpaul@redhat.com> Finally, add some debugging output for ddb changes in the atomic debug output. This makes it a lot easier to spot bugs from incorrect ddb allocations. Signed-off-by: Lyude <cpaul@redhat.com> Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> Cc: Paulo Zanoni <paulo.r.zanoni@intel.com> --- drivers/gpu/drm/i915/intel_pm.c | 57 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index 5cb537c..9e53ff7 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -4040,6 +4040,61 @@ skl_copy_wm_for_pipe(struct skl_wm_values *dst, sizeof(dst->ddb.plane[pipe])); } +static void +skl_print_wm_changes(const struct drm_atomic_state *state) +{ + const struct drm_device *dev = state->dev; + const struct drm_i915_private *dev_priv = to_i915(dev); + const struct intel_atomic_state *intel_state = + to_intel_atomic_state(state); + const struct drm_crtc *crtc; + const struct drm_crtc_state *cstate; + const struct drm_plane *plane; + const struct intel_plane *intel_plane; + const struct drm_plane_state *pstate; + const struct skl_ddb_allocation *old_ddb = &dev_priv->wm.skl_hw.ddb; + const struct skl_ddb_allocation *new_ddb = &intel_state->wm_results.ddb; + enum pipe pipe; + int id; + int i, j; + + for_each_crtc_in_state(state, crtc, cstate, i) { + if (!crtc->state) + continue; + + pipe = to_intel_crtc(crtc)->pipe; + + for_each_plane_in_state(state, plane, pstate, j) { + const struct skl_ddb_entry *old, *new; + + intel_plane = to_intel_plane(plane); + id = skl_wm_plane_id(intel_plane); + old = &old_ddb->plane[pipe][id]; + new = &new_ddb->plane[pipe][id]; + + if (intel_plane->pipe != pipe) + continue; + + if (skl_ddb_entry_equal(old, new)) + continue; + + if (id != PLANE_CURSOR) { + DRM_DEBUG_ATOMIC("[PLANE:%d:plane %d%c] ddb (%d - %d) -> (%d - %d)\n", + plane->base.id, id + 1, + pipe_name(pipe), + old->start, old->end, + new->start, new->end); + } else { + DRM_DEBUG_ATOMIC("[PLANE:%d:cursor %c] ddb (%d - %d) -> (%d - %d)\n", + plane->base.id, + pipe_name(pipe), + old->start, old->end, + new->start, new->end); + } + } + } +} + static int skl_compute_wm(struct drm_atomic_state *state) { @@ -4101,6 +4156,8 @@ skl_compute_wm(struct drm_atomic_state *state) intel_cstate->update_wm_pre = true; } + skl_print_wm_changes(state); + return 0; } -- 2.7.4 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2016-10-08 0:13 UTC|newest] Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-10-08 0:11 [PATCH v2 00/10] Start of skl watermark cleanup Lyude 2016-10-08 0:11 ` Lyude 2016-10-08 0:11 ` [PATCH v2 01/10] drm/i915/skl: Move per-pipe ddb allocations into crtc states Lyude 2016-10-08 0:11 ` Lyude 2016-10-11 19:36 ` [Intel-gfx] " Paulo Zanoni 2016-10-11 19:36 ` Paulo Zanoni 2016-10-08 0:11 ` [PATCH v2 02/10] drm/i915/skl: Remove linetime from skl_wm_values Lyude 2016-10-08 0:11 ` Lyude 2016-10-08 0:11 ` [PATCH v2 03/10] drm/i915/gen9: Make skl_wm_level per-plane Lyude 2016-10-08 0:11 ` Lyude 2016-10-11 19:36 ` Paulo Zanoni 2016-10-11 19:36 ` Paulo Zanoni 2016-10-08 0:11 ` [PATCH 04/10] drm/i915/gen9: Cleanup skl_pipe_wm_active_state Lyude 2016-10-11 19:40 ` [Intel-gfx] " Paulo Zanoni 2016-10-11 19:40 ` Paulo Zanoni 2016-10-08 0:11 ` [PATCH v2 05/10] drm/i915/gen9: Get rid of redundant watermark values Lyude 2016-10-08 0:11 ` Lyude 2016-10-13 13:39 ` [Intel-gfx] " Maarten Lankhorst 2016-10-13 20:04 ` Paulo Zanoni 2016-10-13 20:04 ` Paulo Zanoni 2016-10-13 20:07 ` [Intel-gfx] " Paulo Zanoni 2016-10-13 20:07 ` Paulo Zanoni 2016-10-13 21:25 ` [Intel-gfx] " Lyude Paul 2016-10-13 21:25 ` Lyude Paul 2016-10-17 6:05 ` Daniel Vetter 2016-10-17 6:05 ` Daniel Vetter 2016-10-17 8:07 ` [Intel-gfx] " Maarten Lankhorst 2016-10-17 8:07 ` Maarten Lankhorst 2016-10-08 0:11 ` Lyude [this message] 2016-10-08 0:11 ` [PATCH v2 06/10] drm/i915/gen9: Add ddb changes to atomic debug output Lyude 2016-10-13 20:17 ` Paulo Zanoni 2016-10-13 20:17 ` Paulo Zanoni 2016-10-08 0:11 ` [PATCH 07/10] drm/i915/gen9: Make skl_pipe_wm_get_hw_state() reusable Lyude 2016-10-08 0:11 ` Lyude 2016-10-13 20:36 ` Paulo Zanoni 2016-10-13 20:36 ` Paulo Zanoni 2016-10-08 0:11 ` [PATCH 08/10] drm/i915/gen9: Add skl_wm_level_equals() Lyude 2016-10-08 0:11 ` Lyude 2016-10-13 20:40 ` Paulo Zanoni 2016-10-13 20:40 ` Paulo Zanoni 2016-10-08 0:11 ` [PATCH 09/10] drm/i915/gen9: Actually verify WM levels in verify_wm_state() Lyude 2016-10-08 0:11 ` Lyude 2016-10-13 21:15 ` Paulo Zanoni 2016-10-13 21:15 ` Paulo Zanoni 2016-10-13 21:20 ` [Intel-gfx] " Paulo Zanoni 2016-10-13 21:20 ` Paulo Zanoni 2016-10-08 0:11 ` [PATCH 10/10] drm/i915/gen9: Don't wrap strings " Lyude 2016-10-08 0:11 ` Lyude 2016-10-13 21:18 ` Paulo Zanoni 2016-10-13 21:18 ` Paulo Zanoni
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=1475885497-6094-7-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=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.