From: Maarten Lankhorst Subject: [PATCH] drm/i915: Dump watermark info in i915_display_info. Date: Tue, 24 Oct 2017 13:44:11 +0200 Message-ID: <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 CAF766E448 for ; Tue, 24 Oct 2017 11:44:37 +0000 (UTC) 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 VGhpcyB3aWxsIG1ha2UgaXQgZWFzaWVyIHRvIGRlYnVnIHdoZXRoZXIgdGhlIGhhcmR3YXJlIHdh dGVybWFya3MgbWF0Y2gKd2hhdCdzIGNhbGN1bGF0ZWQgZm9yIGludGVybWVkaWF0ZSBhbmQgb3B0 aW1hbCB3YXRlcm1hcmtzLgoKU2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0 ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2RlYnVnZnMuYyB8IDE1MyArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysK IDEgZmlsZSBjaGFuZ2VkLCAxNTMgaW5zZXJ0aW9ucygrKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k ZWJ1Z2ZzLmMKaW5kZXggYzY1ZTM4MWI4NWYzLi5hYzllYTQ3YWM4OWYgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZGVidWdmcy5jCkBAIC0zMTcwLDYgKzMxNzAsMTU4IEBAIHN0YXRpYyB2b2lkIGlu dGVsX3NjYWxlcl9pbmZvKHN0cnVjdCBzZXFfZmlsZSAqbSwgc3RydWN0IGludGVsX2NydGMgKmlu dGVsX2NydGMpCiAJfQogfQogCitzdGF0aWMgdm9pZCBpbnRlbF93YXRlcm1hcmtfaW5mbyhzdHJ1 Y3Qgc2VxX2ZpbGUgKm0sCisJCQkJIHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwK KwkJCQkgc3RydWN0IGludGVsX2NydGMgKmNydGMpCit7CisJc3RydWN0IGludGVsX2NydGNfc3Rh dGUgKmNydGNfc3RhdGUgPQorCQl0b19pbnRlbF9jcnRjX3N0YXRlKGNydGMtPmJhc2Uuc3RhdGUp OworCWludCBpLCBqOworCWNvbnN0IGNoYXIgKm5hbWVzWzNdID0geworCQkiaGFyZHdhcmUiLAor CQkiaW50ZXJtZWRpYXRlIiwKKwkJIm9wdGltYWwiCisJfTsKKworCWlmIChJTlRFTF9HRU4oZGV2 X3ByaXYpID49IDkpIHsKKwkJc3RydWN0IHNrbF9waXBlX3dtICp3bSA9ICZjcnRjX3N0YXRlLT53 bS5za2wub3B0aW1hbDsKKwkJc3RydWN0IHNrbF9kZGJfZW50cnkgKmVudHJ5ID0gJmNydGNfc3Rh dGUtPndtLnNrbC5kZGI7CisJCXN0cnVjdCBza2xfZGRiX2FsbG9jYXRpb24gKmRkYiA9ICZkZXZf cHJpdi0+d20uc2tsX2h3LmRkYjsKKworCQlzZXFfcHJpbnRmKG0sICJcdEREQiBhbGxvY2F0aW9u OiBzdGFydCAldSBlbmQgJXUsIHNpemUgJXVcbiIsCisJCQkgICBlbnRyeS0+c3RhcnQsIGVudHJ5 LT5lbmQsIHNrbF9kZGJfZW50cnlfc2l6ZShlbnRyeSkpOworCQlmb3IgKGkgPSAwOyBpIDwgQVJS QVlfU0laRShkZGItPnBsYW5lW2NydGMtPnBpcGVdKTsgaSsrKSB7CisJCQllbnRyeSA9ICZkZGIt PnBsYW5lW2NydGMtPnBpcGVdW2ldOworCisJCQlpZiAoIXNrbF9kZGJfZW50cnlfc2l6ZShlbnRy eSkpCisJCQkJY29udGludWU7CisKKwkJCXNlcV9wcmludGYobSwgIlx0XHRwbGFuZSAlZCVjIERE QiBhbGxvY2F0aW9uOiBzdGFydCAldSBlbmQgJXUsIHNpemUgJXUsICIsCisJCQkJICAgaSwgcGlw ZV9uYW1lKGNydGMtPnBpcGUpLCBlbnRyeS0+c3RhcnQsIGVudHJ5LT5lbmQsCisJCQkJICAgc2ts X2RkYl9lbnRyeV9zaXplKGVudHJ5KSk7CisKKwkJCWVudHJ5ID0gJmRkYi0+eV9wbGFuZVtjcnRj LT5waXBlXVtpXTsKKwkJCWlmICghc2tsX2RkYl9lbnRyeV9zaXplKGVudHJ5KSkKKwkJCQljb250 aW51ZTsKKworCQkJc2VxX3ByaW50ZihtLCAiXHRcdHBsYW5lICVkJWMgRERCIFkgYWxsb2NhdGlv bjogc3RhcnQgJXUgZW5kICV1LCBzaXplICV1LCAiLAorCQkJCSAgIGksIHBpcGVfbmFtZShjcnRj LT5waXBlKSwgZW50cnktPnN0YXJ0LCBlbnRyeS0+ZW5kLAorCQkJCSAgIHNrbF9kZGJfZW50cnlf c2l6ZShlbnRyeSkpOworCQl9CisKKwkJc2VxX3ByaW50ZihtLCAiXHRMaW5ldGltZTogJXVcbiIs IHdtLT5saW5ldGltZSk7CisKKwkJZm9yIChpID0gMDsgaSA8IEFSUkFZX1NJWkUod20tPnBsYW5l cyk7IGkrKykgeworCQkJc3RydWN0IHNrbF9wbGFuZV93bSAqcHdtID0gJndtLT5wbGFuZXNbaV07 CisKKwkJCXNlcV9wcmludGYobSwgIlx0cGxhbmUgJWQlYywgd20gZW5hYmxlZDogJXMiLAorCQkJ CSAgIGksIHBpcGVfbmFtZShjcnRjLT5waXBlKSwKKwkJCQkgICBlbmFibGVkZGlzYWJsZWQocHdt LT53bVswXS5wbGFuZV9lbikpOworCQkJaWYgKCFwd20tPndtWzBdLnBsYW5lX2VuKQorCQkJCWNv bnRpbnVlOworCisJCQlzZXFfcHJpbnRmKG0sICJcdFx0VHJhbnNpdGlvbiB3bTogJXMsIGxpbmVz ICV1LCBibG9ja3MgJXUiLAorCQkJCSAgIGVuYWJsZWRkaXNhYmxlZChwd20tPnRyYW5zX3dtLnBs YW5lX2VuKSwKKwkJCQkgICBwd20tPnRyYW5zX3dtLnBsYW5lX3Jlc19iLCBwd20tPnRyYW5zX3dt LnBsYW5lX3Jlc19sKTsKKworCQkJZm9yIChqID0gMDsgaiA8IEFSUkFZX1NJWkUocHdtLT53bSk7 IGorKykgeworCQkJCWlmICghcHdtLT53bVtqXS5wbGFuZV9lbikKKwkJCQkJYnJlYWs7CisKKwkJ CQkgIHNlcV9wcmludGYobSwgIlx0XHRMZXZlbFsldV06IGxpbmVzICV1LCBibG9ja3MgJXUiLAor CQkJCQkgICAgIGosIHB3bS0+dHJhbnNfd20ucGxhbmVfcmVzX2IsCisJCQkJCSAgICAgcHdtLT50 cmFuc193bS5wbGFuZV9yZXNfbCk7CisJCQl9CisJCX0KKwl9IGVsc2UgaWYgKEhBU19QQ0hfU1BM SVQoZGV2X3ByaXYpKSB7CisJCXN0cnVjdCBpbnRlbF9waXBlX3dtICp3bTsKKwkJc3RydWN0IGlu dGVsX3BpcGVfd20gKndtc1szXSA9IHsKKwkJCSZjcnRjLT53bS5hY3RpdmUuaWxrLAorCQkJJmNy dGNfc3RhdGUtPndtLmlsay5pbnRlcm1lZGlhdGUsCisJCQkmY3J0Y19zdGF0ZS0+d20uaWxrLm9w dGltYWwgfTsKKworCQlmb3IgKGogPSAwLCB3bSA9ICp3bXM7IGogPCAzOyBqKyssIHdtID0gd21z W2pdKSB7CisJCQlzZXFfcHJpbnRmKG0sICJcdER1bXBpbmcgJXMgd2F0ZXJtYXJrcywgcG9zdCB2 YmwgdXBkYXRlOiAlc1xuIiwKKwkJCQkgICBuYW1lc1tqXSwgeWVzbm8oY3J0Y19zdGF0ZS0+d20u bmVlZF9wb3N0dmJsX3VwZGF0ZSkpOworCisJCQlmb3IgKGkgPSAwOyBpIDwgQVJSQVlfU0laRSh3 bS0+d20pOyBpKyspIHsKKwkJCQlzdHJ1Y3QgaW50ZWxfd21fbGV2ZWwgKmx2bCA9ICZ3bS0+d21b aV07CisKKwkJCQlzZXFfcHJpbnRmKG0sICJcdFx0d20gbGV2ZWxbJWldLCBlbmFibGVkOiAlcywg dmFsczogJXUsICV1LCAldSwgJXVcbiIsCisJCQkJCSAgaSwgeWVzbm8obHZsLT5lbmFibGUpLCBs dmwtPnByaV92YWwsCisJCQkJCSAgbHZsLT5zcHJfdmFsLCBsdmwtPmN1cl92YWwsIGx2bC0+ZmJj X3ZhbCk7CisJCQl9CisKKwkJCXNlcV9wcmludGYobSwgIlx0TGluZXRpbWU6ICV1XG4iLCB3bS0+ bGluZXRpbWUpOworCQkJc2VxX3ByaW50ZihtLCAiXHRmYmMgd20gZW5hYmxlZDogJXMsIHBpcGU6 ICVzLCBzcHJpdGVzIGVuYWJsZWQ6ICVzLCBzY2FsZWQ6ICVzXG4iLAorCQkJCSAgeWVzbm8od20t PmZiY193bV9lbmFibGVkKSwgeWVzbm8od20tPnBpcGVfZW5hYmxlZCksCisJCQkJICB5ZXNubyh3 bS0+c3ByaXRlc19lbmFibGVkKSwgeWVzbm8od20tPnNwcml0ZXNfc2NhbGVkKSk7CisJCX0KKwl9 IGVsc2UgaWYgKElTX1ZBTExFWVZJRVcoZGV2X3ByaXYpIHx8IElTX0NIRVJSWVZJRVcoZGV2X3By aXYpKSB7CisJCXN0cnVjdCB2bHZfd21fc3RhdGUgKndtOworCQlzdHJ1Y3Qgdmx2X3dtX3N0YXRl ICp3bXNbM10gPSB7CisJCQkmY3J0Yy0+d20uYWN0aXZlLnZsdiwKKwkJCSZjcnRjX3N0YXRlLT53 bS52bHYuaW50ZXJtZWRpYXRlLAorCQkJJmNydGNfc3RhdGUtPndtLnZsdi5vcHRpbWFsIH07CisK KwkJZm9yIChqID0gMCwgd20gPSAqd21zOyBqIDwgMzsgaisrLCB3bSA9IHdtc1tqXSkgeworCQkJ c2VxX3ByaW50ZihtLCAiXHREdW1waW5nICVzIHdhdGVybWFya3MsIEN4U1I6ICVzLCBudW0gbGV2 ZWxzOiAldVxuIiwKKwkJCQkgICBuYW1lc1tqXSwgeWVzbm8od20tPmN4c3IpLCB3bS0+bnVtX2xl dmVscyk7CisKKwkJCWZvciAoaSA9IDA7IGkgPCB3bS0+bnVtX2xldmVsczsgaSsrKSB7CisJCQkJ c3RydWN0IGc0eF9waXBlX3dtICpwd20gPSAmd20tPndtW2ldOworCQkJCXN0cnVjdCBnNHhfc3Jf d20gKnNyID0gJndtLT5zcltpXTsKKwkJCQlpbnQgazsKKworCQkJCXNlcV9wcmludGYobSwgIlx0 TGV2ZWwgJXUgYWxsb2NhdGlvbnM6XG4iLCBpKTsKKwkJCQlmb3IgKGsgPSAwOyBrIDwgQVJSQVlf U0laRShwd20tPnBsYW5lKTsgaysrKQorCQkJCQlzZXFfcHJpbnRmKG0sICJcdFx0UGxhbmUgJXU6 ICV1XG4iLCBrLCBwd20tPnBsYW5lW2tdKTsKKwkJCQlzZXFfcHJpbnRmKG0sICJcdFx0RkJDOiAl dVxuIiwgcHdtLT5mYmMpOworCisJCQkJaWYgKCF3bS0+Y3hzcikKKwkJCQkJY29udGludWU7CisK KwkJCQlzZXFfcHJpbnRmKG0sICJcdFx0U1I6IHBsYW5lICV1LCBjdXJzb3IgJXUsIEZCQyAldVxu IiwKKwkJCQkJICAgc3ItPnBsYW5lLCBzci0+Y3Vyc29yLCBzci0+ZmJjKTsKKwkJCX0KKwkJfQor CX0gZWxzZSBpZiAoSVNfRzRYKGRldl9wcml2KSkgeworCQlzdHJ1Y3QgZzR4X3dtX3N0YXRlICp3 bTsKKwkJc3RydWN0IGc0eF93bV9zdGF0ZSAqd21zWzNdID0geworCQkJJmNydGMtPndtLmFjdGl2 ZS5nNHgsCisJCQkmY3J0Y19zdGF0ZS0+d20uZzR4LmludGVybWVkaWF0ZSwKKwkJCSZjcnRjX3N0 YXRlLT53bS5nNHgub3B0aW1hbCB9OworCisJCWZvciAoaiA9IDAsIHdtID0gKndtczsgaiA8IDM7 IGorKywgd20gPSB3bXNbal0pIHsKKwkJCXN0cnVjdCBnNHhfcGlwZV93bSAqcHdtID0gJndtLT53 bTsKKwkJCXN0cnVjdCBnNHhfc3Jfd20gKnNyID0gJndtLT5zcjsKKwkJCXN0cnVjdCBnNHhfc3Jf d20gKmhwbGwgPSAmd20tPmhwbGw7CisKKwkJCXNlcV9wcmludGYobSwgIlx0RHVtcGluZyAlcyB3 YXRlcm1hcmtzLCBDeFNSOiAlcywgSFBMTDogJXMsIGZiYzogJXNcbiIsCisJCQkJICAgbmFtZXNb al0sIHllc25vKHdtLT5jeHNyKSwgeWVzbm8od20tPmhwbGxfZW4pLAorCQkJCSAgIHllc25vKHdt LT5mYmNfZW4pKTsKKworCQkJZm9yIChpID0gMDsgaSA8IEFSUkFZX1NJWkUocHdtLT5wbGFuZSk7 IGkrKykKKwkJCQlzZXFfcHJpbnRmKG0sICJcdFx0UGxhbmUgJXU6ICV1XG4iLCBpLCBwd20tPnBs YW5lW2ldKTsKKworCQkJaWYgKHdtLT5mYmNfZW4pCisJCQkJc2VxX3ByaW50ZihtLCAiXHRcdEZC QzogJXVcbiIsIHB3bS0+ZmJjKTsKKworCQkJaWYgKHdtLT5jeHNyKQorCQkJCXNlcV9wcmludGYo bSwgIlx0XHRTUjogcGxhbmUgJXUsIGN1cnNvciAldSwgRkJDICV1XG4iLAorCQkJCQkgICBzci0+ cGxhbmUsIHNyLT5jdXJzb3IsIHNyLT5mYmMpOworCisJCQlpZiAod20tPmhwbGxfZW4pCisJCQkJ c2VxX3ByaW50ZihtLCAiXHRcdEhQTEw6IHBsYW5lICV1LCBjdXJzb3IgJXUsIEZCQyAldVxuIiwK KwkJCQkJICAgaHBsbC0+cGxhbmUsIGhwbGwtPmN1cnNvciwgaHBsbC0+ZmJjKTsKKwkJfQorCX0K KworCWlmIChkZXZfcHJpdi0+ZGlzcGxheS5vcHRpbWl6ZV93YXRlcm1hcmtzKQorCQlzZXFfcHJp bnRmKG0sICJcdE5lZWQgcG9zdCB2YmxhbmsgdXBkYXRlOiAlc1xuIiwKKwkJCSAgIHllc25vKGNy dGNfc3RhdGUtPndtLm5lZWRfcG9zdHZibF91cGRhdGUpKTsKK30KKwogc3RhdGljIGludCBpOTE1 X2Rpc3BsYXlfaW5mbyhzdHJ1Y3Qgc2VxX2ZpbGUgKm0sIHZvaWQgKnVudXNlZCkKIHsKIAlzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBub2RlX3RvX2k5MTUobS0+cHJpdmF0ZSk7 CkBAIC0zMjA4LDYgKzMzNjAsNyBAQCBzdGF0aWMgaW50IGk5MTVfZGlzcGxheV9pbmZvKHN0cnVj dCBzZXFfZmlsZSAqbSwgdm9pZCAqdW51c2VkKQogCQkJCSAgIGN1cnNvci0+Y3Vyc29yLmJhc2Up OwogCQkJaW50ZWxfc2NhbGVyX2luZm8obSwgY3J0Yyk7CiAJCQlpbnRlbF9wbGFuZV9pbmZvKG0s IGNydGMpOworCQkJaW50ZWxfd2F0ZXJtYXJrX2luZm8obSwgZGV2X3ByaXYsIGNydGMpOwogCQl9 CiAKIAkJc2VxX3ByaW50ZihtLCAiXHR1bmRlcnJ1biByZXBvcnRpbmc6IGNwdT0lcyBwY2g9JXMg XG4iLAotLSAKMi4xNC4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRl bC1nZngK