From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933133AbcJHANu (ORCPT ); Fri, 7 Oct 2016 20:13:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47646 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754756AbcJHAM3 (ORCPT ); Fri, 7 Oct 2016 20:12:29 -0400 From: Lyude To: intel-gfx@lists.freedesktop.org Cc: Lyude , =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= , Paulo Zanoni , Daniel Vetter , Jani Nikula , David Airlie , 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 Message-Id: <1475885497-6094-7-git-send-email-cpaul@redhat.com> In-Reply-To: <1475885497-6094-1-git-send-email-cpaul@redhat.com> References: <1475885497-6094-1-git-send-email-cpaul@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Sat, 08 Oct 2016 00:12:28 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Reviewed-by: Maarten Lankhorst Cc: Ville Syrjälä Cc: Paulo Zanoni --- 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 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lyude Subject: [PATCH v2 06/10] drm/i915/gen9: Add ddb changes to atomic debug output Date: Fri, 7 Oct 2016 20:11:30 -0400 Message-ID: <1475885497-6094-7-git-send-email-cpaul@redhat.com> References: <1475885497-6094-1-git-send-email-cpaul@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1475885497-6094-1-git-send-email-cpaul@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org Cc: Paulo Zanoni , David Airlie , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Daniel Vetter List-Id: dri-devel@lists.freedesktop.org RmluYWxseSwgYWRkIHNvbWUgZGVidWdnaW5nIG91dHB1dCBmb3IgZGRiIGNoYW5nZXMgaW4gdGhl IGF0b21pYyBkZWJ1ZwpvdXRwdXQuIFRoaXMgbWFrZXMgaXQgYSBsb3QgZWFzaWVyIHRvIHNwb3Qg YnVncyBmcm9tIGluY29ycmVjdCBkZGIKYWxsb2NhdGlvbnMuCgpTaWduZWQtb2ZmLWJ5OiBMeXVk ZSA8Y3BhdWxAcmVkaGF0LmNvbT4KUmV2aWV3ZWQtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFy dGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+CkNjOiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxl LnN5cmphbGFAbGludXguaW50ZWwuY29tPgpDYzogUGF1bG8gWmFub25pIDxwYXVsby5yLnphbm9u aUBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyB8IDU3ICsr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrCiAxIGZpbGUgY2hhbmdlZCwg NTcgaW5zZXJ0aW9ucygrKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCmluZGV4IDVjYjUzN2MuLjll NTNmZjcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwpAQCAtNDA0MCw2ICs0MDQwLDYxIEBAIHNr bF9jb3B5X3dtX2Zvcl9waXBlKHN0cnVjdCBza2xfd21fdmFsdWVzICpkc3QsCiAJICAgICAgIHNp emVvZihkc3QtPmRkYi5wbGFuZVtwaXBlXSkpOwogfQogCitzdGF0aWMgdm9pZAorc2tsX3ByaW50 X3dtX2NoYW5nZXMoY29uc3Qgc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlKQoreworCWNv bnN0IHN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBzdGF0ZS0+ZGV2OworCWNvbnN0IHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKKwljb25zdCBzdHJ1Y3Qg aW50ZWxfYXRvbWljX3N0YXRlICppbnRlbF9zdGF0ZSA9CisJCXRvX2ludGVsX2F0b21pY19zdGF0 ZShzdGF0ZSk7CisJY29uc3Qgc3RydWN0IGRybV9jcnRjICpjcnRjOworCWNvbnN0IHN0cnVjdCBk cm1fY3J0Y19zdGF0ZSAqY3N0YXRlOworCWNvbnN0IHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lOwor CWNvbnN0IHN0cnVjdCBpbnRlbF9wbGFuZSAqaW50ZWxfcGxhbmU7CisJY29uc3Qgc3RydWN0IGRy bV9wbGFuZV9zdGF0ZSAqcHN0YXRlOworCWNvbnN0IHN0cnVjdCBza2xfZGRiX2FsbG9jYXRpb24g Km9sZF9kZGIgPSAmZGV2X3ByaXYtPndtLnNrbF9ody5kZGI7CisJY29uc3Qgc3RydWN0IHNrbF9k ZGJfYWxsb2NhdGlvbiAqbmV3X2RkYiA9ICZpbnRlbF9zdGF0ZS0+d21fcmVzdWx0cy5kZGI7CisJ ZW51bSBwaXBlIHBpcGU7CisJaW50IGlkOworCWludCBpLCBqOworCisJZm9yX2VhY2hfY3J0Y19p bl9zdGF0ZShzdGF0ZSwgY3J0YywgY3N0YXRlLCBpKSB7CisJCWlmICghY3J0Yy0+c3RhdGUpCisJ CQljb250aW51ZTsKKworCQlwaXBlID0gdG9faW50ZWxfY3J0YyhjcnRjKS0+cGlwZTsKKworCQlm b3JfZWFjaF9wbGFuZV9pbl9zdGF0ZShzdGF0ZSwgcGxhbmUsIHBzdGF0ZSwgaikgeworCQkJY29u c3Qgc3RydWN0IHNrbF9kZGJfZW50cnkgKm9sZCwgKm5ldzsKKworCQkJaW50ZWxfcGxhbmUgPSB0 b19pbnRlbF9wbGFuZShwbGFuZSk7CisJCQlpZCA9IHNrbF93bV9wbGFuZV9pZChpbnRlbF9wbGFu ZSk7CisJCQlvbGQgPSAmb2xkX2RkYi0+cGxhbmVbcGlwZV1baWRdOworCQkJbmV3ID0gJm5ld19k ZGItPnBsYW5lW3BpcGVdW2lkXTsKKworCQkJaWYgKGludGVsX3BsYW5lLT5waXBlICE9IHBpcGUp CisJCQkJY29udGludWU7CisKKwkJCWlmIChza2xfZGRiX2VudHJ5X2VxdWFsKG9sZCwgbmV3KSkK KwkJCQljb250aW51ZTsKKworCQkJaWYgKGlkICE9IFBMQU5FX0NVUlNPUikgeworCQkJCURSTV9E RUJVR19BVE9NSUMoIltQTEFORTolZDpwbGFuZSAlZCVjXSBkZGIgKCVkIC0gJWQpIC0+ICglZCAt ICVkKVxuIiwKKwkJCQkJCSBwbGFuZS0+YmFzZS5pZCwgaWQgKyAxLAorCQkJCQkJIHBpcGVfbmFt ZShwaXBlKSwKKwkJCQkJCSBvbGQtPnN0YXJ0LCBvbGQtPmVuZCwKKwkJCQkJCSBuZXctPnN0YXJ0 LCBuZXctPmVuZCk7CisJCQl9IGVsc2UgeworCQkJCURSTV9ERUJVR19BVE9NSUMoIltQTEFORTol ZDpjdXJzb3IgJWNdIGRkYiAoJWQgLSAlZCkgLT4gKCVkIC0gJWQpXG4iLAorCQkJCQkJIHBsYW5l LT5iYXNlLmlkLAorCQkJCQkJIHBpcGVfbmFtZShwaXBlKSwKKwkJCQkJCSBvbGQtPnN0YXJ0LCBv bGQtPmVuZCwKKwkJCQkJCSBuZXctPnN0YXJ0LCBuZXctPmVuZCk7CisJCQl9CisJCX0KKwl9Cit9 CisKIHN0YXRpYyBpbnQKIHNrbF9jb21wdXRlX3dtKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpz dGF0ZSkKIHsKQEAgLTQxMDEsNiArNDE1Niw4IEBAIHNrbF9jb21wdXRlX3dtKHN0cnVjdCBkcm1f YXRvbWljX3N0YXRlICpzdGF0ZSkKIAkJaW50ZWxfY3N0YXRlLT51cGRhdGVfd21fcHJlID0gdHJ1 ZTsKIAl9CiAKKwlza2xfcHJpbnRfd21fY2hhbmdlcyhzdGF0ZSk7CisKIAlyZXR1cm4gMDsKIH0K IAotLSAKMi43LjQKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9y ZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdm eAo=