From mboxrd@z Thu Jan 1 00:00:00 1970 From: Robert Fekete Subject: [PATCH v3] drm/i915: Add extra plane information in debugfs. Date: Tue, 27 Oct 2015 16:58:32 +0100 Message-ID: <1445961512-25317-1-git-send-email-robert.fekete@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 9E9E66E2E1 for ; Tue, 27 Oct 2015 08:56:37 -0700 (PDT) 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 RXh0ZW5kcyBpOTE1X2Rpc3BsYXlfaW5mbyBzbyB0aGF0IGZvciBlYWNoIGFjdGl2ZSBjcnRjIGFs c28gcHJpbnQKYWxsIHBsYW5lcyBhc3NvY2lhdGVkIHdpdGggdGhlIHBpcGUuIFRoaXMgcGF0Y2gg c2hvd3MgaW5mb3JtYXRpb24KYWJvdXQgZWFjaCBwbGFuZSB3cnQgZm9ybWF0LCBzaXplLCBwb3Np dGlvbiwgcm90YXRpb24sIGFuZCBzY2FsaW5nLgpUaGlzIGlzIHZlcnkgdXNlZnVsIHdoZW4gZGVi dWdnaW5nIHVzZXIgc3BhY2UgY29tcG9zaXRvcnMgdGhhdCB0cnkKdG8gdXRpbGl6ZSBzZXZlcmFs IHBsYW5lcyBmb3IgYSBjb21taXQuCgpWMjogRml4ZWQgY29tbWVudHMgZnJvbSBNYWFydGVuLCBW aWxsZSwgYW5kIENocmlzLiBGaXhlZCBwcmludGluZyBvZgoxNi4xNiBmaXhwb2ludCwgYmV0dGVy IHJvdGF0aW9uIGJpdG1hc2sgbWFuYWdlbWVudCBhbmQgc29tZSBtaW5vciBmaXhlcwoKVjM6IENv cnJlY3RlZCBzdGF0ZS0+c3JjX3ggJiAweDAwZmYgdG8gc3RhdGUtPnNyY194ICYgMHhmZmZmLi4u CgpTaWduZWQtb2ZmLWJ5OiBSb2JlcnQgRmVrZXRlIDxyb2JlcnQuZmVrZXRlQGxpbnV4LmludGVs LmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYyB8IDEwOSArKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0KIDEgZmlsZSBjaGFuZ2VkLCAxMDcgaW5z ZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2RlYnVnZnMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5j CmluZGV4IDg5YmE1NDllOTJiZS4uMDQ3NGM2NTU3YmJkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2RlYnVnZnMuYwpAQCAtMjk1MCw2ICsyOTUwLDEwNyBAQCBzdGF0aWMgYm9vbCBjdXJzb3JfcG9z aXRpb24oc3RydWN0IGRybV9kZXZpY2UgKmRldiwgaW50IHBpcGUsIGludCAqeCwgaW50ICp5KQog CXJldHVybiBjdXJzb3JfYWN0aXZlKGRldiwgcGlwZSk7CiB9CiAKK3N0YXRpYyBjb25zdCBjaGFy ICpwbGFuZV90eXBlKGVudW0gZHJtX3BsYW5lX3R5cGUgdHlwZSkKK3sKKwlzd2l0Y2ggKHR5cGUp IHsKKwljYXNlIERSTV9QTEFORV9UWVBFX09WRVJMQVk6CisJCXJldHVybiAiT1ZMIjsKKwljYXNl IERSTV9QTEFORV9UWVBFX1BSSU1BUlk6CisJCXJldHVybiAiUFJJIjsKKwljYXNlIERSTV9QTEFO RV9UWVBFX0NVUlNPUjoKKwkJcmV0dXJuICJDVVIiOworCS8qCisJICogRGVsaWJlcmF0ZWx5IG9t aXR0aW5nIGRlZmF1bHQ6IHRvIGdlbmVyYXRlIGNvbXBpbGVyIHdhcm5pbmdzCisJICogd2hlbiBh IG5ldyBkcm1fcGxhbmVfdHlwZSBnZXRzIGFkZGVkLgorCSAqLworCX0KKworCXJldHVybiAidW5r bm93biI7Cit9CisKK3N0YXRpYyBjb25zdCBjaGFyICpwbGFuZV9yb3RhdGlvbih1bnNpZ25lZCBp bnQgcm90YXRpb24pCit7CisJc3RhdGljIGNoYXIgYnVmWzQ4XTsKKwkvKgorCSAqIEFjY29yZGlu ZyB0byBkb2Mgb25seSBvbmUgRFJNX1JPVEFURV8gaXMgYWxsb3dlZCBidXQgdGhpcworCSAqIHdp bGwgcHJpbnQgdGhlbSBhbGwgdG8gdmlzdWFsaXplIGlmIHRoZSB2YWx1ZXMgYXJlIG1pc3VzZWQK KwkgKi8KKwlzbnByaW50ZihidWYsIHNpemVvZihidWYpLAorCQkgIiVzJXMlcyVzJXMlcygweCUw OHgpIiwKKwkJIChyb3RhdGlvbiAmIEJJVChEUk1fUk9UQVRFXzApKSA/ICIwICIgOiAiIiwKKwkJ IChyb3RhdGlvbiAmIEJJVChEUk1fUk9UQVRFXzkwKSkgPyAiOTAgIiA6ICIiLAorCQkgKHJvdGF0 aW9uICYgQklUKERSTV9ST1RBVEVfMTgwKSkgPyAiMTgwICIgOiAiIiwKKwkJIChyb3RhdGlvbiAm IEJJVChEUk1fUk9UQVRFXzI3MCkpID8gIjI3MCAiIDogIiIsCisJCSAocm90YXRpb24gJiBCSVQo RFJNX1JFRkxFQ1RfWCkpID8gIkZMSVBYICIgOiAiIiwKKwkJIChyb3RhdGlvbiAmIEJJVChEUk1f UkVGTEVDVF9ZKSkgPyAiRkxJUFkgIiA6ICIiLAorCQkgcm90YXRpb24pOworCisJcmV0dXJuIGJ1 ZjsKK30KKworc3RhdGljIHZvaWQgaW50ZWxfcGxhbmVfaW5mbyhzdHJ1Y3Qgc2VxX2ZpbGUgKm0s IHN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjKQoreworCXN0cnVjdCBkcm1faW5mb19ub2Rl ICpub2RlID0gbS0+cHJpdmF0ZTsKKwlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gbm9kZS0+bWlu b3ItPmRldjsKKwlzdHJ1Y3QgaW50ZWxfcGxhbmUgKmludGVsX3BsYW5lOworCisJZm9yX2VhY2hf aW50ZWxfcGxhbmVfb25fY3J0YyhkZXYsIGludGVsX2NydGMsIGludGVsX3BsYW5lKSB7CisJCXN0 cnVjdCBkcm1fcGxhbmVfc3RhdGUgKnN0YXRlOworCQlzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSA9 ICZpbnRlbF9wbGFuZS0+YmFzZTsKKworCQlpZiAoIXBsYW5lLT5zdGF0ZSkgeworCQkJc2VxX3B1 dHMobSwgInBsYW5lLT5zdGF0ZSBpcyBOVUxMIVxuIik7CisJCQljb250aW51ZTsKKwkJfQorCisJ CXN0YXRlID0gcGxhbmUtPnN0YXRlOworCisJCXNlcV9wcmludGYobSwgIlx0LS1QbGFuZSBpZCAl ZDogdHlwZT0lcywgY3J0Y19wb3M9JTRkeCU0ZCwgY3J0Y19zaXplPSU0ZHglNGQsIHNyY19wb3M9 JWQuJTA0dXglZC4lMDR1LCBzcmNfc2l6ZT0lZC4lMDR1eCVkLiUwNHUsIGZvcm1hdD0lcywgcm90 YXRpb249JXNcbiIsCisJCQkgICBwbGFuZS0+YmFzZS5pZCwKKwkJCSAgIHBsYW5lX3R5cGUoaW50 ZWxfcGxhbmUtPmJhc2UudHlwZSksCisJCQkgICBzdGF0ZS0+Y3J0Y194LCBzdGF0ZS0+Y3J0Y195 LAorCQkJICAgc3RhdGUtPmNydGNfdywgc3RhdGUtPmNydGNfaCwKKwkJCSAgIChzdGF0ZS0+c3Jj X3ggPj4gMTYpLAorCQkJICAgKChzdGF0ZS0+c3JjX3ggJiAweGZmZmYpICogMTU2MjUpID4+IDEw LAorCQkJICAgKHN0YXRlLT5zcmNfeSA+PiAxNiksCisJCQkgICAoKHN0YXRlLT5zcmNfeSAmIDB4 ZmZmZikgKiAxNTYyNSkgPj4gMTAsCisJCQkgICAoc3RhdGUtPnNyY193ID4+IDE2KSwKKwkJCSAg ICgoc3RhdGUtPnNyY193ICYgMHhmZmZmKSAqIDE1NjI1KSA+PiAxMCwKKwkJCSAgIChzdGF0ZS0+ c3JjX2ggPj4gMTYpLAorCQkJICAgKChzdGF0ZS0+c3JjX2ggJiAweGZmZmYpICogMTU2MjUpID4+ IDEwLAorCQkJICAgc3RhdGUtPmZiID8gZHJtX2dldF9mb3JtYXRfbmFtZShzdGF0ZS0+ZmItPnBp eGVsX2Zvcm1hdCkgOiAiTi9BIiwKKwkJCSAgIHBsYW5lX3JvdGF0aW9uKHN0YXRlLT5yb3RhdGlv bikpOworCX0KK30KKworc3RhdGljIHZvaWQgaW50ZWxfc2NhbGVyX2luZm8oc3RydWN0IHNlcV9m aWxlICptLCBzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YykKK3sKKwlzdHJ1Y3QgaW50ZWxf Y3J0Y19zdGF0ZSAqcGlwZV9jb25maWc7CisJaW50IG51bV9zY2FsZXJzID0gaW50ZWxfY3J0Yy0+ bnVtX3NjYWxlcnM7CisJaW50IGk7CisKKwlwaXBlX2NvbmZpZyA9IHRvX2ludGVsX2NydGNfc3Rh dGUoaW50ZWxfY3J0Yy0+YmFzZS5zdGF0ZSk7CisKKwkvKiBOb3QgYWxsIHBsYXRmb3JtYXMgaGF2 ZSBhIHNjYWxlciAqLworCWlmIChudW1fc2NhbGVycykgeworCQlzZXFfcHJpbnRmKG0sICJcdG51 bV9zY2FsZXJzPSVkLCBzY2FsZXJfdXNlcnM9JXggc2NhbGVyX2lkPSVkIiwKKwkJCSAgIG51bV9z Y2FsZXJzLAorCQkJICAgcGlwZV9jb25maWctPnNjYWxlcl9zdGF0ZS5zY2FsZXJfdXNlcnMsCisJ CQkgICBwaXBlX2NvbmZpZy0+c2NhbGVyX3N0YXRlLnNjYWxlcl9pZCk7CisKKwkJZm9yIChpID0g MDsgaSA8IFNLTF9OVU1fU0NBTEVSUzsgaSsrKSB7CisJCQlzdHJ1Y3QgaW50ZWxfc2NhbGVyICpz YyA9CisJCQkJCSZwaXBlX2NvbmZpZy0+c2NhbGVyX3N0YXRlLnNjYWxlcnNbaV07CisKKwkJCXNl cV9wcmludGYobSwgIiwgc2NhbGVyc1slZF06IHVzZT0lcywgbW9kZT0leCIsCisJCQkJICAgaSwg eWVzbm8oc2MtPmluX3VzZSksIHNjLT5tb2RlKTsKKwkJfQorCQlzZXFfcHV0cyhtLCAiXG4iKTsK Kwl9IGVsc2UgeworCQlzZXFfcHV0cyhtLCAiXHRObyBzY2FsZXJzIGF2YWlsYWJsZSBvbiB0aGlz IHBsYXRmb3JtXG4iKTsKKwl9Cit9CisKIHN0YXRpYyBpbnQgaTkxNV9kaXNwbGF5X2luZm8oc3Ry dWN0IHNlcV9maWxlICptLCB2b2lkICp1bnVzZWQpCiB7CiAJc3RydWN0IGRybV9pbmZvX25vZGUg Km5vZGUgPSBtLT5wcml2YXRlOwpAQCAtMjk2OSwxMCArMzA3MCwxMiBAQCBzdGF0aWMgaW50IGk5 MTVfZGlzcGxheV9pbmZvKHN0cnVjdCBzZXFfZmlsZSAqbSwgdm9pZCAqdW51c2VkKQogCiAJCXBp cGVfY29uZmlnID0gdG9faW50ZWxfY3J0Y19zdGF0ZShjcnRjLT5iYXNlLnN0YXRlKTsKIAotCQlz ZXFfcHJpbnRmKG0sICJDUlRDICVkOiBwaXBlOiAlYywgYWN0aXZlPSVzIChzaXplPSVkeCVkKVxu IiwKKwkJc2VxX3ByaW50ZihtLCAiQ1JUQyAlZDogcGlwZTogJWMsIGFjdGl2ZT0lcywgKHNpemU9 JWR4JWQpLCBkaXRoZXI9JXMsIGJwcD0lZFxuIiwKIAkJCSAgIGNydGMtPmJhc2UuYmFzZS5pZCwg cGlwZV9uYW1lKGNydGMtPnBpcGUpLAogCQkJICAgeWVzbm8ocGlwZV9jb25maWctPmJhc2UuYWN0 aXZlKSwKLQkJCSAgIHBpcGVfY29uZmlnLT5waXBlX3NyY193LCBwaXBlX2NvbmZpZy0+cGlwZV9z cmNfaCk7CisJCQkgICBwaXBlX2NvbmZpZy0+cGlwZV9zcmNfdywgcGlwZV9jb25maWctPnBpcGVf c3JjX2gsCisJCQkgICB5ZXNubyhwaXBlX2NvbmZpZy0+ZGl0aGVyKSwgcGlwZV9jb25maWctPnBp cGVfYnBwKTsKKwogCQlpZiAocGlwZV9jb25maWctPmJhc2UuYWN0aXZlKSB7CiAJCQlpbnRlbF9j cnRjX2luZm8obSwgY3J0Yyk7CiAKQEAgLTI5ODIsNiArMzA4NSw4IEBAIHN0YXRpYyBpbnQgaTkx NV9kaXNwbGF5X2luZm8oc3RydWN0IHNlcV9maWxlICptLCB2b2lkICp1bnVzZWQpCiAJCQkJICAg eCwgeSwgY3J0Yy0+YmFzZS5jdXJzb3ItPnN0YXRlLT5jcnRjX3csCiAJCQkJICAgY3J0Yy0+YmFz ZS5jdXJzb3ItPnN0YXRlLT5jcnRjX2gsCiAJCQkJICAgY3J0Yy0+Y3Vyc29yX2FkZHIsIHllc25v KGFjdGl2ZSkpOworCQkJaW50ZWxfc2NhbGVyX2luZm8obSwgY3J0Yyk7CisJCQlpbnRlbF9wbGFu ZV9pbmZvKG0sIGNydGMpOwogCQl9CiAKIAkJc2VxX3ByaW50ZihtLCAiXHR1bmRlcnJ1biByZXBv cnRpbmc6IGNwdT0lcyBwY2g9JXMgXG4iLAotLSAKMS45LjEKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwt Z2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h aWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==