From: Maarten Lankhorst Subject: [PATCH] drm/i915: Dump watermark info in i915_display_info, v2. Date: Tue, 24 Oct 2017 15:13:29 +0200 Message-ID: <20171024131329.18696-1-maarten.lankhorst@linux.intel.com> References: <20171024114411.23759-1-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mblankhorst.nl (mblankhorst.nl [IPv6:2a02:2308::216:3eff:fe92:dfa3]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0B4EC89E3B for ; Tue, 24 Oct 2017 13:13:35 +0000 (UTC) In-Reply-To: <20171024114411.23759-1-maarten.lankhorst@linux.intel.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 List-Id: intel-gfx@lists.freedesktop.org RHVtcGluZyB3YXRlcm1hcmsgaW5mbyB3aWxsIG1ha2UgaXQgZWFzaWVyIHRvIGRlYnVnIHdoZXRo ZXIKdGhlIGhhcmR3YXJlIHdhdGVybWFya3MgbWF0Y2ggd2hhdCdzIGNhbGN1bGF0ZWQgZm9yIGlu dGVybWVkaWF0ZQphbmQgb3B0aW1hbCB3YXRlcm1hcmtzLiBUaGlzIGhhcyBtYWRlIGl0IGVhc2ll ciB0byBkZWJ1ZyBjZXJ0YWluClNOQiB1bmRlcnJ1bnMsIHNvIEkndmUgZXh0ZW5kZWQgaXQgZnJv bSBhIGhhY2sgdG8gc29tZXRoaW5nIHRoYXQKd2lsbCBwcmludCBhbGwgYXRvbWljIHdhdGVybWFy a3MuCgpDaGFuZ2VzIHNpbmNlIHYxOgotIEZpeCBXTSBhc3NpZ25tZW50IGNvbXBpbGVyIHdhcm5p bmcuCgpTaWduZWQtb2ZmLWJ5OiBNYWFydGVuIExhbmtob3JzdCA8bWFhcnRlbi5sYW5raG9yc3RA bGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5j IHwgMTU1ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKwogMSBmaWxlIGNoYW5n ZWQsIDE1NSBpbnNlcnRpb25zKCspCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9kZWJ1Z2ZzLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYwppbmRl eCBjNjVlMzgxYjg1ZjMuLmY5Zjk1NTAxMzdjMyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1 Z2ZzLmMKQEAgLTMxNzAsNiArMzE3MCwxNjAgQEAgc3RhdGljIHZvaWQgaW50ZWxfc2NhbGVyX2lu Zm8oc3RydWN0IHNlcV9maWxlICptLCBzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YykKIAl9 CiB9CiAKK3N0YXRpYyB2b2lkIGludGVsX3dhdGVybWFya19pbmZvKHN0cnVjdCBzZXFfZmlsZSAq bSwKKwkJCQkgc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAorCQkJCSBzdHJ1Y3Qg aW50ZWxfY3J0YyAqY3J0YykKK3sKKwlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0 ZSA9CisJCXRvX2ludGVsX2NydGNfc3RhdGUoY3J0Yy0+YmFzZS5zdGF0ZSk7CisJaW50IGksIGo7 CisJY29uc3QgY2hhciAqbmFtZXNbM10gPSB7CisJCSJoYXJkd2FyZSIsCisJCSJpbnRlcm1lZGlh dGUiLAorCQkib3B0aW1hbCIKKwl9OworCisJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gOSkg eworCQlzdHJ1Y3Qgc2tsX3BpcGVfd20gKndtID0gJmNydGNfc3RhdGUtPndtLnNrbC5vcHRpbWFs OworCQlzdHJ1Y3Qgc2tsX2RkYl9lbnRyeSAqZW50cnkgPSAmY3J0Y19zdGF0ZS0+d20uc2tsLmRk YjsKKwkJc3RydWN0IHNrbF9kZGJfYWxsb2NhdGlvbiAqZGRiID0gJmRldl9wcml2LT53bS5za2xf aHcuZGRiOworCisJCXNlcV9wcmludGYobSwgIlx0RERCIGFsbG9jYXRpb246IHN0YXJ0ICV1IGVu ZCAldSwgc2l6ZSAldVxuIiwKKwkJCSAgIGVudHJ5LT5zdGFydCwgZW50cnktPmVuZCwgc2tsX2Rk Yl9lbnRyeV9zaXplKGVudHJ5KSk7CisJCWZvciAoaSA9IDA7IGkgPCBBUlJBWV9TSVpFKGRkYi0+ cGxhbmVbY3J0Yy0+cGlwZV0pOyBpKyspIHsKKwkJCWVudHJ5ID0gJmRkYi0+cGxhbmVbY3J0Yy0+ cGlwZV1baV07CisKKwkJCWlmICghc2tsX2RkYl9lbnRyeV9zaXplKGVudHJ5KSkKKwkJCQljb250 aW51ZTsKKworCQkJc2VxX3ByaW50ZihtLCAiXHRcdHBsYW5lICVkJWMgRERCIGFsbG9jYXRpb246 IHN0YXJ0ICV1IGVuZCAldSwgc2l6ZSAldSwgIiwKKwkJCQkgICBpLCBwaXBlX25hbWUoY3J0Yy0+ cGlwZSksIGVudHJ5LT5zdGFydCwgZW50cnktPmVuZCwKKwkJCQkgICBza2xfZGRiX2VudHJ5X3Np emUoZW50cnkpKTsKKworCQkJZW50cnkgPSAmZGRiLT55X3BsYW5lW2NydGMtPnBpcGVdW2ldOwor CQkJaWYgKCFza2xfZGRiX2VudHJ5X3NpemUoZW50cnkpKQorCQkJCWNvbnRpbnVlOworCisJCQlz ZXFfcHJpbnRmKG0sICJcdFx0cGxhbmUgJWQlYyBEREIgWSBhbGxvY2F0aW9uOiBzdGFydCAldSBl bmQgJXUsIHNpemUgJXUsICIsCisJCQkJICAgaSwgcGlwZV9uYW1lKGNydGMtPnBpcGUpLCBlbnRy eS0+c3RhcnQsIGVudHJ5LT5lbmQsCisJCQkJICAgc2tsX2RkYl9lbnRyeV9zaXplKGVudHJ5KSk7 CisJCX0KKworCQlzZXFfcHJpbnRmKG0sICJcdExpbmV0aW1lOiAldVxuIiwgd20tPmxpbmV0aW1l KTsKKworCQlmb3IgKGkgPSAwOyBpIDwgQVJSQVlfU0laRSh3bS0+cGxhbmVzKTsgaSsrKSB7CisJ CQlzdHJ1Y3Qgc2tsX3BsYW5lX3dtICpwd20gPSAmd20tPnBsYW5lc1tpXTsKKworCQkJc2VxX3By aW50ZihtLCAiXHRwbGFuZSAlZCVjLCB3bSBlbmFibGVkOiAlcyIsCisJCQkJICAgaSwgcGlwZV9u YW1lKGNydGMtPnBpcGUpLAorCQkJCSAgIGVuYWJsZWRkaXNhYmxlZChwd20tPndtWzBdLnBsYW5l X2VuKSk7CisJCQlpZiAoIXB3bS0+d21bMF0ucGxhbmVfZW4pCisJCQkJY29udGludWU7CisKKwkJ CXNlcV9wcmludGYobSwgIlx0XHRUcmFuc2l0aW9uIHdtOiAlcywgbGluZXMgJXUsIGJsb2NrcyAl dSIsCisJCQkJICAgZW5hYmxlZGRpc2FibGVkKHB3bS0+dHJhbnNfd20ucGxhbmVfZW4pLAorCQkJ CSAgIHB3bS0+dHJhbnNfd20ucGxhbmVfcmVzX2IsIHB3bS0+dHJhbnNfd20ucGxhbmVfcmVzX2wp OworCisJCQlmb3IgKGogPSAwOyBqIDwgQVJSQVlfU0laRShwd20tPndtKTsgaisrKSB7CisJCQkJ aWYgKCFwd20tPndtW2pdLnBsYW5lX2VuKQorCQkJCQlicmVhazsKKworCQkJCSAgc2VxX3ByaW50 ZihtLCAiXHRcdExldmVsWyV1XTogbGluZXMgJXUsIGJsb2NrcyAldSIsCisJCQkJCSAgICAgaiwg cHdtLT50cmFuc193bS5wbGFuZV9yZXNfYiwKKwkJCQkJICAgICBwd20tPnRyYW5zX3dtLnBsYW5l X3Jlc19sKTsKKwkJCX0KKwkJfQorCX0gZWxzZSBpZiAoSEFTX1BDSF9TUExJVChkZXZfcHJpdikp IHsKKwkJc3RydWN0IGludGVsX3BpcGVfd20gKndtc1szXSA9IHsKKwkJCSZjcnRjLT53bS5hY3Rp dmUuaWxrLAorCQkJJmNydGNfc3RhdGUtPndtLmlsay5pbnRlcm1lZGlhdGUsCisJCQkmY3J0Y19z dGF0ZS0+d20uaWxrLm9wdGltYWwgfTsKKworCQlmb3IgKGogPSAwOyBqIDwgMzsgaisrKSB7CisJ CQlzdHJ1Y3QgaW50ZWxfcGlwZV93bSAqd20gPSB3bXNbal07CisKKwkJCXNlcV9wcmludGYobSwg Ilx0RHVtcGluZyAlcyB3YXRlcm1hcmtzLCBwb3N0IHZibCB1cGRhdGU6ICVzXG4iLAorCQkJCSAg IG5hbWVzW2pdLCB5ZXNubyhjcnRjX3N0YXRlLT53bS5uZWVkX3Bvc3R2YmxfdXBkYXRlKSk7CisK KwkJCWZvciAoaSA9IDA7IGkgPCBBUlJBWV9TSVpFKHdtLT53bSk7IGkrKykgeworCQkJCXN0cnVj dCBpbnRlbF93bV9sZXZlbCAqbHZsID0gJndtLT53bVtpXTsKKworCQkJCXNlcV9wcmludGYobSwg Ilx0XHR3bSBsZXZlbFslaV0sIGVuYWJsZWQ6ICVzLCB2YWxzOiAldSwgJXUsICV1LCAldVxuIiwK KwkJCQkJICBpLCB5ZXNubyhsdmwtPmVuYWJsZSksIGx2bC0+cHJpX3ZhbCwKKwkJCQkJICBsdmwt PnNwcl92YWwsIGx2bC0+Y3VyX3ZhbCwgbHZsLT5mYmNfdmFsKTsKKwkJCX0KKworCQkJc2VxX3By aW50ZihtLCAiXHRMaW5ldGltZTogJXVcbiIsIHdtLT5saW5ldGltZSk7CisJCQlzZXFfcHJpbnRm KG0sICJcdGZiYyB3bSBlbmFibGVkOiAlcywgcGlwZTogJXMsIHNwcml0ZXMgZW5hYmxlZDogJXMs IHNjYWxlZDogJXNcbiIsCisJCQkJICB5ZXNubyh3bS0+ZmJjX3dtX2VuYWJsZWQpLCB5ZXNubyh3 bS0+cGlwZV9lbmFibGVkKSwKKwkJCQkgIHllc25vKHdtLT5zcHJpdGVzX2VuYWJsZWQpLCB5ZXNu byh3bS0+c3ByaXRlc19zY2FsZWQpKTsKKwkJfQorCX0gZWxzZSBpZiAoSVNfVkFMTEVZVklFVyhk ZXZfcHJpdikgfHwgSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpIHsKKwkJc3RydWN0IHZsdl93bV9z dGF0ZSAqd21zWzNdID0geworCQkJJmNydGMtPndtLmFjdGl2ZS52bHYsCisJCQkmY3J0Y19zdGF0 ZS0+d20udmx2LmludGVybWVkaWF0ZSwKKwkJCSZjcnRjX3N0YXRlLT53bS52bHYub3B0aW1hbCB9 OworCisJCWZvciAoaiA9IDA7IGogPCAzOyBqKyspIHsKKwkJCXN0cnVjdCB2bHZfd21fc3RhdGUg KndtID0gd21zW2pdOworCisJCQlzZXFfcHJpbnRmKG0sICJcdER1bXBpbmcgJXMgd2F0ZXJtYXJr cywgQ3hTUjogJXMsIG51bSBsZXZlbHM6ICV1XG4iLAorCQkJCSAgIG5hbWVzW2pdLCB5ZXNubyh3 bS0+Y3hzciksIHdtLT5udW1fbGV2ZWxzKTsKKworCQkJZm9yIChpID0gMDsgaSA8IHdtLT5udW1f bGV2ZWxzOyBpKyspIHsKKwkJCQlzdHJ1Y3QgZzR4X3BpcGVfd20gKnB3bSA9ICZ3bS0+d21baV07 CisJCQkJc3RydWN0IGc0eF9zcl93bSAqc3IgPSAmd20tPnNyW2ldOworCQkJCWludCBrOworCisJ CQkJc2VxX3ByaW50ZihtLCAiXHRMZXZlbCAldSBhbGxvY2F0aW9uczpcbiIsIGkpOworCQkJCWZv ciAoayA9IDA7IGsgPCBBUlJBWV9TSVpFKHB3bS0+cGxhbmUpOyBrKyspCisJCQkJCXNlcV9wcmlu dGYobSwgIlx0XHRQbGFuZSAldTogJXVcbiIsIGssIHB3bS0+cGxhbmVba10pOworCQkJCXNlcV9w cmludGYobSwgIlx0XHRGQkM6ICV1XG4iLCBwd20tPmZiYyk7CisKKwkJCQlpZiAoIXdtLT5jeHNy KQorCQkJCQljb250aW51ZTsKKworCQkJCXNlcV9wcmludGYobSwgIlx0XHRTUjogcGxhbmUgJXUs IGN1cnNvciAldSwgRkJDICV1XG4iLAorCQkJCQkgICBzci0+cGxhbmUsIHNyLT5jdXJzb3IsIHNy LT5mYmMpOworCQkJfQorCQl9CisJfSBlbHNlIGlmIChJU19HNFgoZGV2X3ByaXYpKSB7CisJCXN0 cnVjdCBnNHhfd21fc3RhdGUgKndtc1szXSA9IHsKKwkJCSZjcnRjLT53bS5hY3RpdmUuZzR4LAor CQkJJmNydGNfc3RhdGUtPndtLmc0eC5pbnRlcm1lZGlhdGUsCisJCQkmY3J0Y19zdGF0ZS0+d20u ZzR4Lm9wdGltYWwgfTsKKworCQlmb3IgKGogPSAwOyBqIDwgMzsgaisrKSB7CisJCQlzdHJ1Y3Qg ZzR4X3dtX3N0YXRlICp3bSA9IHdtc1tqXTsKKwkJCXN0cnVjdCBnNHhfcGlwZV93bSAqcHdtID0g JndtLT53bTsKKwkJCXN0cnVjdCBnNHhfc3Jfd20gKnNyID0gJndtLT5zcjsKKwkJCXN0cnVjdCBn NHhfc3Jfd20gKmhwbGwgPSAmd20tPmhwbGw7CisKKwkJCXNlcV9wcmludGYobSwgIlx0RHVtcGlu ZyAlcyB3YXRlcm1hcmtzLCBDeFNSOiAlcywgSFBMTDogJXMsIGZiYzogJXNcbiIsCisJCQkJICAg bmFtZXNbal0sIHllc25vKHdtLT5jeHNyKSwgeWVzbm8od20tPmhwbGxfZW4pLAorCQkJCSAgIHll c25vKHdtLT5mYmNfZW4pKTsKKworCQkJZm9yIChpID0gMDsgaSA8IEFSUkFZX1NJWkUocHdtLT5w bGFuZSk7IGkrKykKKwkJCQlzZXFfcHJpbnRmKG0sICJcdFx0UGxhbmUgJXU6ICV1XG4iLCBpLCBw d20tPnBsYW5lW2ldKTsKKworCQkJaWYgKHdtLT5mYmNfZW4pCisJCQkJc2VxX3ByaW50ZihtLCAi XHRcdEZCQzogJXVcbiIsIHB3bS0+ZmJjKTsKKworCQkJaWYgKHdtLT5jeHNyKQorCQkJCXNlcV9w cmludGYobSwgIlx0XHRTUjogcGxhbmUgJXUsIGN1cnNvciAldSwgRkJDICV1XG4iLAorCQkJCQkg ICBzci0+cGxhbmUsIHNyLT5jdXJzb3IsIHNyLT5mYmMpOworCisJCQlpZiAod20tPmhwbGxfZW4p CisJCQkJc2VxX3ByaW50ZihtLCAiXHRcdEhQTEw6IHBsYW5lICV1LCBjdXJzb3IgJXUsIEZCQyAl dVxuIiwKKwkJCQkJICAgaHBsbC0+cGxhbmUsIGhwbGwtPmN1cnNvciwgaHBsbC0+ZmJjKTsKKwkJ fQorCX0KKworCWlmIChkZXZfcHJpdi0+ZGlzcGxheS5vcHRpbWl6ZV93YXRlcm1hcmtzKQorCQlz ZXFfcHJpbnRmKG0sICJcdE5lZWQgcG9zdCB2YmxhbmsgdXBkYXRlOiAlc1xuIiwKKwkJCSAgIHll c25vKGNydGNfc3RhdGUtPndtLm5lZWRfcG9zdHZibF91cGRhdGUpKTsKK30KKwogc3RhdGljIGlu dCBpOTE1X2Rpc3BsYXlfaW5mbyhzdHJ1Y3Qgc2VxX2ZpbGUgKm0sIHZvaWQgKnVudXNlZCkKIHsK IAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBub2RlX3RvX2k5MTUobS0+cHJp dmF0ZSk7CkBAIC0zMjA4LDYgKzMzNjIsNyBAQCBzdGF0aWMgaW50IGk5MTVfZGlzcGxheV9pbmZv KHN0cnVjdCBzZXFfZmlsZSAqbSwgdm9pZCAqdW51c2VkKQogCQkJCSAgIGN1cnNvci0+Y3Vyc29y LmJhc2UpOwogCQkJaW50ZWxfc2NhbGVyX2luZm8obSwgY3J0Yyk7CiAJCQlpbnRlbF9wbGFuZV9p bmZvKG0sIGNydGMpOworCQkJaW50ZWxfd2F0ZXJtYXJrX2luZm8obSwgZGV2X3ByaXYsIGNydGMp OwogCQl9CiAKIAkJc2VxX3ByaW50ZihtLCAiXHR1bmRlcnJ1biByZXBvcnRpbmc6IGNwdT0lcyBw Y2g9JXMgXG4iLAotLSAKMi4xNC4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVl ZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m by9pbnRlbC1nZngK