From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paulo Zanoni Subject: Re: [PATCH v2 06/10] drm/i915/gen9: Add ddb changes to atomic debug output Date: Thu, 13 Oct 2016 17:17:36 -0300 Message-ID: <1476389856.2478.36.camel@intel.com> References: <1475885497-6094-1-git-send-email-cpaul@redhat.com> <1475885497-6094-7-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-7-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: Lyude , intel-gfx@lists.freedesktop.org Cc: David Airlie , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Daniel Vetter List-Id: dri-devel@lists.freedesktop.org RW0gU2V4LCAyMDE2LTEwLTA3IMOgcyAyMDoxMSAtMDQwMCwgTHl1ZGUgZXNjcmV2ZXU6Cj4gRmlu YWxseSwgYWRkIHNvbWUgZGVidWdnaW5nIG91dHB1dCBmb3IgZGRiIGNoYW5nZXMgaW4gdGhlIGF0 b21pYwo+IGRlYnVnCj4gb3V0cHV0LiBUaGlzIG1ha2VzIGl0IGEgbG90IGVhc2llciB0byBzcG90 IGJ1Z3MgZnJvbSBpbmNvcnJlY3QgZGRiCj4gYWxsb2NhdGlvbnMuCj4gCj4gU2lnbmVkLW9mZi1i eTogTHl1ZGUgPGNwYXVsQHJlZGhhdC5jb20+Cj4gUmV2aWV3ZWQtYnk6IE1hYXJ0ZW4gTGFua2hv cnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+Cj4gQ2M6IFZpbGxlIFN5cmrD pGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+Cj4gQ2M6IFBhdWxvIFphbm9uaSA8 cGF1bG8uci56YW5vbmlAaW50ZWwuY29tPgo+IC0tLQo+IMKgZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfcG0uYyB8IDU3Cj4gKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysKPiDCoDEgZmlsZSBjaGFuZ2VkLCA1NyBpbnNlcnRpb25zKCspCj4gCj4gZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKPiBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3BtLmMKPiBpbmRleCA1Y2I1MzdjLi45ZTUzZmY3IDEwMDY0NAo+IC0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9wbS5jCj4gQEAgLTQwNDAsNiArNDA0MCw2MSBAQCBza2xfY29weV93bV9mb3JfcGlwZShz dHJ1Y3Qgc2tsX3dtX3ZhbHVlcwo+ICpkc3QsCj4gwqAJwqDCoMKgwqDCoMKgwqBzaXplb2YoZHN0 LT5kZGIucGxhbmVbcGlwZV0pKTsKPiDCoH0KPiDCoAo+ICtzdGF0aWMgdm9pZAo+ICtza2xfcHJp bnRfd21fY2hhbmdlcyhjb25zdCBzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUpCj4gK3sK PiArCWNvbnN0IHN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBzdGF0ZS0+ZGV2Owo+ICsJY29uc3Qg c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOwo+ICsJY29u c3Qgc3RydWN0IGludGVsX2F0b21pY19zdGF0ZSAqaW50ZWxfc3RhdGUgPQo+ICsJCXRvX2ludGVs X2F0b21pY19zdGF0ZShzdGF0ZSk7Cj4gKwljb25zdCBzdHJ1Y3QgZHJtX2NydGMgKmNydGM7Cj4g Kwljb25zdCBzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNzdGF0ZTsKPiArCWNvbnN0IHN0cnVjdCBk cm1fcGxhbmUgKnBsYW5lOwo+ICsJY29uc3Qgc3RydWN0IGludGVsX3BsYW5lICppbnRlbF9wbGFu ZTsKPiArCWNvbnN0IHN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgKnBzdGF0ZTsKPiArCWNvbnN0IHN0 cnVjdCBza2xfZGRiX2FsbG9jYXRpb24gKm9sZF9kZGIgPSAmZGV2X3ByaXYtCj4gPndtLnNrbF9o dy5kZGI7Cj4gKwljb25zdCBzdHJ1Y3Qgc2tsX2RkYl9hbGxvY2F0aW9uICpuZXdfZGRiID0gJmlu dGVsX3N0YXRlLQo+ID53bV9yZXN1bHRzLmRkYjsKPiArCWVudW0gcGlwZSBwaXBlOwo+ICsJaW50 IGlkOwo+ICsJaW50IGksIGo7Cj4gKwo+ICsJZm9yX2VhY2hfY3J0Y19pbl9zdGF0ZShzdGF0ZSwg Y3J0YywgY3N0YXRlLCBpKSB7Cj4gKwkJaWYgKCFjcnRjLT5zdGF0ZSkKPiArCQkJY29udGludWU7 CgpXaHkgZXhhY3RseSBkbyB3ZSBoYXZlIHRoaXMgY2hlY2s/CgpFdmVyeXRoaW5nIGVsc2UgbG9v a3MgZ29vZC4gU28gd2l0aCBlaXRoZXIgYW4gZXhwbGFuYXRpb24gb3IgdGhlIGNoZWNrCnJlbW92 ZWQgaW4gY2FzZSBpdCdzIG5vdCBuZWVkZWQ6ClJldmlld2VkLWJ5OiBQYXVsbyBaYW5vbmkgPHBh dWxvLnIuemFub25pQGludGVsLmNvbT4KCj4gKwo+ICsJCXBpcGUgPSB0b19pbnRlbF9jcnRjKGNy dGMpLT5waXBlOwo+ICsKPiArCQlmb3JfZWFjaF9wbGFuZV9pbl9zdGF0ZShzdGF0ZSwgcGxhbmUs IHBzdGF0ZSwgaikgewo+ICsJCQljb25zdCBzdHJ1Y3Qgc2tsX2RkYl9lbnRyeSAqb2xkLCAqbmV3 Owo+ICsKPiArCQkJaW50ZWxfcGxhbmUgPSB0b19pbnRlbF9wbGFuZShwbGFuZSk7Cj4gKwkJCWlk ID0gc2tsX3dtX3BsYW5lX2lkKGludGVsX3BsYW5lKTsKPiArCQkJb2xkID0gJm9sZF9kZGItPnBs YW5lW3BpcGVdW2lkXTsKPiArCQkJbmV3ID0gJm5ld19kZGItPnBsYW5lW3BpcGVdW2lkXTsKPiAr Cj4gKwkJCWlmIChpbnRlbF9wbGFuZS0+cGlwZSAhPSBwaXBlKQo+ICsJCQkJY29udGludWU7Cj4g Kwo+ICsJCQlpZiAoc2tsX2RkYl9lbnRyeV9lcXVhbChvbGQsIG5ldykpCj4gKwkJCQljb250aW51 ZTsKPiArCj4gKwkJCWlmIChpZCAhPSBQTEFORV9DVVJTT1IpIHsKPiArCQkJCURSTV9ERUJVR19B VE9NSUMoIltQTEFORTolZDpwbGFuZQo+ICVkJWNdIGRkYiAoJWQgLSAlZCkgLT4gKCVkIC0gJWQp XG4iLAo+ICsJCQkJCQnCoHBsYW5lLT5iYXNlLmlkLCBpZAo+ICsgMSwKPiArCQkJCQkJwqBwaXBl X25hbWUocGlwZSksCj4gKwkJCQkJCcKgb2xkLT5zdGFydCwgb2xkLQo+ID5lbmQsCj4gKwkJCQkJ CcKgbmV3LT5zdGFydCwgbmV3LQo+ID5lbmQpOwo+ICsJCQl9IGVsc2Ugewo+ICsJCQkJRFJNX0RF QlVHX0FUT01JQygiW1BMQU5FOiVkOmN1cnNvcgo+ICVjXSBkZGIgKCVkIC0gJWQpIC0+ICglZCAt ICVkKVxuIiwKPiArCQkJCQkJwqBwbGFuZS0+YmFzZS5pZCwKPiArCQkJCQkJwqBwaXBlX25hbWUo cGlwZSksCj4gKwkJCQkJCcKgb2xkLT5zdGFydCwgb2xkLQo+ID5lbmQsCj4gKwkJCQkJCcKgbmV3 LT5zdGFydCwgbmV3LQo+ID5lbmQpOwo+ICsJCQl9Cj4gKwkJfQo+ICsJfQo+ICt9Cj4gKwo+IMKg c3RhdGljIGludAo+IMKgc2tsX2NvbXB1dGVfd20oc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0 YXRlKQo+IMKgewo+IEBAIC00MTAxLDYgKzQxNTYsOCBAQCBza2xfY29tcHV0ZV93bShzdHJ1Y3Qg ZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUpCj4gwqAJCWludGVsX2NzdGF0ZS0+dXBkYXRlX3dtX3By ZSA9IHRydWU7Cj4gwqAJfQo+IMKgCj4gKwlza2xfcHJpbnRfd21fY2hhbmdlcyhzdGF0ZSk7Cj4g Kwo+IMKgCXJldHVybiAwOwo+IMKgfQo+IMKgCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3Rz LmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xp c3RpbmZvL2ludGVsLWdmeAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755624AbcJMUSD (ORCPT ); Thu, 13 Oct 2016 16:18:03 -0400 Received: from mga01.intel.com ([192.55.52.88]:34442 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751991AbcJMUR5 (ORCPT ); Thu, 13 Oct 2016 16:17:57 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,489,1473145200"; d="scan'208";a="772325216" Message-ID: <1476389856.2478.36.camel@intel.com> Subject: Re: [PATCH v2 06/10] drm/i915/gen9: Add ddb changes to atomic debug output From: Paulo Zanoni To: Lyude , intel-gfx@lists.freedesktop.org Cc: Ville =?ISO-8859-1?Q?Syrj=E4l=E4?= , Daniel Vetter , Jani Nikula , David Airlie , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Date: Thu, 13 Oct 2016 17:17:36 -0300 In-Reply-To: <1475885497-6094-7-git-send-email-cpaul@redhat.com> References: <1475885497-6094-1-git-send-email-cpaul@redhat.com> <1475885497-6094-7-git-send-email-cpaul@redhat.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.20.5 (3.20.5-1.fc24) Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Em Sex, 2016-10-07 às 20:11 -0400, Lyude escreveu: > 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; Why exactly do we have this check? Everything else looks good. So with either an explanation or the check removed in case it's not needed: Reviewed-by: Paulo Zanoni > + > + 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; >  } >