From: Robert Fekete Subject: [PATCH] drm/i915: Add extra plane information in debugfs. Date: Fri, 23 Oct 2015 16:24:25 +0200 Message-ID: <1445610265-27189-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 mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 4176C6F057 for ; Fri, 23 Oct 2015 07:22:47 -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 IHBsYW5lcyBmb3IgYSBjb21taXQuCgpTaWduZWQtb2ZmLWJ5OiBSb2JlcnQgRmVrZXRlIDxyb2Jl cnQuZmVrZXRlQGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2RlYnVnZnMuYyB8IDEyNCArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0KIDEg ZmlsZSBjaGFuZ2VkLCAxMjIgaW5zZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZGVidWdmcy5jCmluZGV4IGVjYTk0ZDBlNGQ5OS4uNjIzNGY3MjkzZGM2IDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYworKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYwpAQCAtMjk1MCw2ICsyOTUwLDEyMiBAQCBz dGF0aWMgYm9vbCBjdXJzb3JfcG9zaXRpb24oc3RydWN0IGRybV9kZXZpY2UgKmRldiwgaW50IHBp cGUsIGludCAqeCwgaW50ICp5KQogCXJldHVybiBjdXJzb3JfYWN0aXZlKGRldiwgcGlwZSk7CiB9 CiAKK3N0YXRpYyBjb25zdCBjaGFyICpwbGFuZV90eXBlKGVudW0gZHJtX3BsYW5lX3R5cGUgdHlw ZSkKK3sKKwlzd2l0Y2ggKHR5cGUpIHsKKwljYXNlIERSTV9QTEFORV9UWVBFX09WRVJMQVk6CisJ CXJldHVybiAiT1ZMIjsKKwljYXNlIERSTV9QTEFORV9UWVBFX1BSSU1BUlk6CisJCXJldHVybiAi UFJJIjsKKwljYXNlIERSTV9QTEFORV9UWVBFX0NVUlNPUjoKKwkJcmV0dXJuICJDVVIiOworCWRl ZmF1bHQ6CisJCU1JU1NJTkdfQ0FTRSh0eXBlKTsKKwkJcmV0dXJuICJ1bmtub3duIjsKKwl9Cit9 CisKK3N0YXRpYyBjb25zdCBjaGFyICpwbGFuZV9mb3JtYXQodWludDMyX3QgZm9ybWF0KQorewor CXN0YXRpYyBjaGFyIHBpeGVsX2Zvcm1hdF9zdHJpbmdbNV07CisKKwkvKiBmb3VyY2Mgc3RyaW5n IGVuY29kaW5nIHRvIHN0cmluZyAqLworCXBpeGVsX2Zvcm1hdF9zdHJpbmdbMF0gPSBmb3JtYXQg JiAweGZmOworCXBpeGVsX2Zvcm1hdF9zdHJpbmdbMV0gPSAoZm9ybWF0ID4+IDgpICYgMHhmZjsK KwlwaXhlbF9mb3JtYXRfc3RyaW5nWzJdID0gKGZvcm1hdCA+PiAxNikgJiAweGZmOworCXBpeGVs X2Zvcm1hdF9zdHJpbmdbM10gPSAoZm9ybWF0ID4+IDI0KSAmIDB4ZmY7CisJcGl4ZWxfZm9ybWF0 X3N0cmluZ1s0XSA9ICdcMCc7CisKKwlyZXR1cm4gcGl4ZWxfZm9ybWF0X3N0cmluZzsKK30KKwor c3RhdGljIGNvbnN0IGNoYXIgKnBsYW5lX3JvdGF0aW9uKHVuc2lnbmVkIGludCByb3RhdGlvbikK K3sKKwlzd2l0Y2ggKHJvdGF0aW9uKSB7CisJY2FzZSBEUk1fUk9UQVRFXzA6CisJCXJldHVybiAi MCI7CisJY2FzZSBEUk1fUk9UQVRFXzkwOgorCQlyZXR1cm4gIjkwIjsKKwljYXNlIERSTV9ST1RB VEVfMTgwOgorCQlyZXR1cm4gIjE4MCI7CisJY2FzZSBEUk1fUk9UQVRFXzI3MDoKKwkJcmV0dXJu ICIyNzAiOworCWNhc2UgRFJNX1JFRkxFQ1RfWDoKKwkJcmV0dXJuICJGTElQIFgiOworCWNhc2Ug RFJNX1JFRkxFQ1RfWToKKwkJcmV0dXJuICJGTElQIFkiOworCWRlZmF1bHQ6CisJCU1JU1NJTkdf Q0FTRShyb3RhdGlvbik7CisJCXJldHVybiAidW5rbm93biI7CisJfQorfQorCisKK3N0YXRpYyB2 b2lkIGludGVsX3BsYW5lX2luZm8oc3RydWN0IHNlcV9maWxlICptLCBzdHJ1Y3QgaW50ZWxfY3J0 YyAqaW50ZWxfY3J0YykKK3sKKwlzdHJ1Y3QgZHJtX2luZm9fbm9kZSAqbm9kZSA9IG0tPnByaXZh dGU7CisJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IG5vZGUtPm1pbm9yLT5kZXY7CisJc3RydWN0 IGludGVsX3BsYW5lICppbnRlbF9wbGFuZTsKKworCWZvcl9lYWNoX2ludGVsX3BsYW5lX29uX2Ny dGMoZGV2LCBpbnRlbF9jcnRjLCBpbnRlbF9wbGFuZSkgeworCQlzdHJ1Y3QgZHJtX3BsYW5lX3N0 YXRlICpzdGF0ZTsKKwkJc3RydWN0IGRybV9wbGFuZSAqcGxhbmUgPSAmaW50ZWxfcGxhbmUtPmJh c2U7CisJCXVpbnQzMl90IGZiX2Zvcm1hdCA9IDA7CisKKwkJaWYgKCFwbGFuZS0+c3RhdGUpIHsK KwkJCXNlcV9wdXRzKG0sICJwbGFuZS0+c3RhdGUgaXMgTlVMTCFcbiIpOworCQkJY29udGludWU7 CisJCX0KKworCQlzdGF0ZSA9IHBsYW5lLT5zdGF0ZTsKKworCQlpZiAoc3RhdGUtPmZiKSB7CisJ CQkvKiBwbGFuZSBub3QgYWN0aXZlICovCisJCQlmYl9mb3JtYXQgPSBzdGF0ZS0+ZmItPnBpeGVs X2Zvcm1hdDsKKwkJfQorCisJCXNlcV9wcmludGYobSwgIlx0LS1QbGFuZSBpZCAlZDogdHlwZT0l cywgY3J0Y19wb3M9JTRkeCU0ZCwgY3J0Y19zaXplPSU0ZHglNGQsIHNyY19wb3M9JWQuJWR4JWQu JWQsIHNyY19zaXplPSVkLiVkeCVkLiVkLCBmb3JtYXQ9JXMsIHJvdGF0aW9uPSVzXG4iLAorCQkJ ICAgcGxhbmUtPmJhc2UuaWQsCisJCQkgICBwbGFuZV90eXBlKGludGVsX3BsYW5lLT5iYXNlLnR5 cGUpLAorCQkJICAgc3RhdGUtPmNydGNfeCwgc3RhdGUtPmNydGNfeSwKKwkJCSAgIHN0YXRlLT5j cnRjX3csIHN0YXRlLT5jcnRjX2gsCisJCQkgICAoc3RhdGUtPnNyY194ID4+IDE2KSwgKHN0YXRl LT5zcmNfeCAmIDB4MDBmZiksCisJCQkgICAoc3RhdGUtPnNyY195ID4+IDE2KSwgKHN0YXRlLT5z cmNfeSAmIDB4MDBmZiksCisJCQkgICAoc3RhdGUtPnNyY193ID4+IDE2KSwgKHN0YXRlLT5zcmNf dyAmIDB4MDBmZiksCisJCQkgICAoc3RhdGUtPnNyY19oID4+IDE2KSwgKHN0YXRlLT5zcmNfaCAm IDB4MDBmZiksCisJCQkgICBmYl9mb3JtYXQgPyBwbGFuZV9mb3JtYXQoZmJfZm9ybWF0KSA6ICJO L0EiLAorCQkJICAgcGxhbmVfcm90YXRpb24oc3RhdGUtPnJvdGF0aW9uKSk7CisJfQorfQorCitz dGF0aWMgdm9pZCBpbnRlbF9zY2FsZXJfaW5mbyhzdHJ1Y3Qgc2VxX2ZpbGUgKm0sIHN0cnVjdCBp bnRlbF9jcnRjICppbnRlbF9jcnRjKQoreworCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpwaXBl X2NvbmZpZzsKKwlpbnQgbnVtX3NjYWxlcnMgPSBpbnRlbF9jcnRjLT5udW1fc2NhbGVyczsKKwlp bnQgaTsKKworCXBpcGVfY29uZmlnID0gdG9faW50ZWxfY3J0Y19zdGF0ZShpbnRlbF9jcnRjLT5i YXNlLnN0YXRlKTsKKworCS8qIE5vdCBhbGwgcGxhdGZvcm1hcyBoYXZlIGEgc2NhbGVyICovCisJ aWYgKG51bV9zY2FsZXJzKSB7CisJCXNlcV9wcmludGYobSwgIlx0bnVtX3NjYWxlcnM9JWQsIHNj YWxlcl91c2Vycz0lZCBzY2FsZXJfaWQ9JWQiLAorCQkJICAgbnVtX3NjYWxlcnMsCisJCQkgICBw aXBlX2NvbmZpZy0+c2NhbGVyX3N0YXRlLnNjYWxlcl91c2VycywKKwkJCSAgIHBpcGVfY29uZmln LT5zY2FsZXJfc3RhdGUuc2NhbGVyX2lkKTsKKworCQlmb3IgKGkgPSAwOyBpIDwgU0tMX05VTV9T Q0FMRVJTOyBpKyspIHsKKwkJCXN0cnVjdCBpbnRlbF9zY2FsZXIgKnNjID0KKwkJCQkJJnBpcGVf Y29uZmlnLT5zY2FsZXJfc3RhdGUuc2NhbGVyc1tpXTsKKworCQkJc2VxX3ByaW50ZihtLCAiLCBz Y2FsZXJzWyVkXTogdXNlPSVkLCBtb2RlPSVkIiwKKwkJCQkgICBpLCBzYy0+aW5fdXNlLCBzYy0+ bW9kZSk7CisJCX0KKwkJc2VxX3B1dHMobSwgIlxuIik7CisJfSBlbHNlIHsKKwkJc2VxX3B1dHMo bSwgIlx0Tm8gc2NhbGVycyBhdmFpbGFibGUgb24gdGhpcyBwbGF0Zm9ybVxuIik7CisJfQorfQor CiBzdGF0aWMgaW50IGk5MTVfZGlzcGxheV9pbmZvKHN0cnVjdCBzZXFfZmlsZSAqbSwgdm9pZCAq dW51c2VkKQogewogCXN0cnVjdCBkcm1faW5mb19ub2RlICpub2RlID0gbS0+cHJpdmF0ZTsKQEAg LTI5NjksMTAgKzMwODUsMTIgQEAgc3RhdGljIGludCBpOTE1X2Rpc3BsYXlfaW5mbyhzdHJ1Y3Qg c2VxX2ZpbGUgKm0sIHZvaWQgKnVudXNlZCkKIAogCQlwaXBlX2NvbmZpZyA9IHRvX2ludGVsX2Ny dGNfc3RhdGUoY3J0Yy0+YmFzZS5zdGF0ZSk7CiAKLQkJc2VxX3ByaW50ZihtLCAiQ1JUQyAlZDog cGlwZTogJWMsIGFjdGl2ZT0lcyAoc2l6ZT0lZHglZClcbiIsCisJCXNlcV9wcmludGYobSwgIkNS VEMgJWQ6IHBpcGU6ICVjLCBhY3RpdmU9JXMsIChzaXplPSVkeCVkKSwgZGl0aGVyPSVzLCBicHA9 JWRcbiIsCiAJCQkgICBjcnRjLT5iYXNlLmJhc2UuaWQsIHBpcGVfbmFtZShjcnRjLT5waXBlKSwK IAkJCSAgIHllc25vKHBpcGVfY29uZmlnLT5iYXNlLmFjdGl2ZSksCi0JCQkgICBwaXBlX2NvbmZp Zy0+cGlwZV9zcmNfdywgcGlwZV9jb25maWctPnBpcGVfc3JjX2gpOworCQkJICAgcGlwZV9jb25m aWctPnBpcGVfc3JjX3csIHBpcGVfY29uZmlnLT5waXBlX3NyY19oLAorCQkJICAgeWVzbm8ocGlw ZV9jb25maWctPmRpdGhlciksIHBpcGVfY29uZmlnLT5waXBlX2JwcCk7CisKIAkJaWYgKHBpcGVf Y29uZmlnLT5iYXNlLmFjdGl2ZSkgewogCQkJaW50ZWxfY3J0Y19pbmZvKG0sIGNydGMpOwogCkBA IC0yOTgyLDYgKzMxMDAsOCBAQCBzdGF0aWMgaW50IGk5MTVfZGlzcGxheV9pbmZvKHN0cnVjdCBz ZXFfZmlsZSAqbSwgdm9pZCAqdW51c2VkKQogCQkJCSAgIHgsIHksIGNydGMtPmJhc2UuY3Vyc29y LT5zdGF0ZS0+Y3J0Y193LAogCQkJCSAgIGNydGMtPmJhc2UuY3Vyc29yLT5zdGF0ZS0+Y3J0Y19o LAogCQkJCSAgIGNydGMtPmN1cnNvcl9hZGRyLCB5ZXNubyhhY3RpdmUpKTsKKwkJCWludGVsX3Nj YWxlcl9pbmZvKG0sIGNydGMpOworCQkJaW50ZWxfcGxhbmVfaW5mbyhtLCBjcnRjKTsKIAkJfQog CiAJCXNlcV9wcmludGYobSwgIlx0dW5kZXJydW4gcmVwb3J0aW5nOiBjcHU9JXMgcGNoPSVzIFxu IiwKLS0gCjEuOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5v cmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdm eAo=