From: Tvrtko Ursulin Subject: [PATCH] drm/i915: Tidy intel_dump_pipe_config a bit Date: Thu, 28 Apr 2016 10:52:11 +0100 Message-ID: <1461837131-25011-1-git-send-email-tvrtko.ursulin@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 825086E166 for ; Thu, 28 Apr 2016 09:52:15 +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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCkEgZmV3IHRp ZGllcyB3aXRoIHRoZSBnb2FsIG9mIG1ha2luZyB0aGUgb3V0cHV0IG1vcmUgY29tcGFjdAphbmQg ZWFzaWVyIHRvIHJlYWQ6CgoxLiBHcm91cCBzb21lIGRhdGEgb24gc2luZ2xlIGxpbmVzIHdoZXJl IGl0IG1hZGUgc2Vuc2UuCjIuIERvIG5vdCBvdXRwdXQgc2NhbGVyIGRhdGEgb24gcHJlIEdlbjku CjMuIEZpeCBwbGFuZSBkdW1wIHNvIG5ldyBsb2cgbXNnIGlzIG5vdCBvdXRwdXQgaW4gdGhlIG1p ZGRkbGUKICAgb2YgdGhlIGxpbmUgYW5kIGNvbXBhY3QgaXQgYSBiaXQuCgpTaWduZWQtb2ZmLWJ5 OiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgpDYzogSmFuaSBOaWt1 bGEgPGphbmkubmlrdWxhQGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kaXNwbGF5LmMgfCA2OSArKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0t LS0KIDEgZmlsZSBjaGFuZ2VkLCAzNSBpbnNlcnRpb25zKCspLCAzNCBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggYmM4OWMxMjE1NjJiLi5lNjU4ZTNh MDdiNWMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTEyMTMxLDYgKzEy MTMxLDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfZHVtcF9waXBlX2NvbmZpZyhzdHJ1Y3QgaW50ZWxf Y3J0YyAqY3J0YywKIAkJCQkgICBjb25zdCBjaGFyICpjb250ZXh0KQogewogCXN0cnVjdCBkcm1f ZGV2aWNlICpkZXYgPSBjcnRjLT5iYXNlLmRldjsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CiAJc3RydWN0IGRybV9wbGFuZSAqcGxhbmU7CiAJc3Ry dWN0IGludGVsX3BsYW5lICppbnRlbF9wbGFuZTsKIAlzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUg KnN0YXRlOwpAQCAtMTIxMzksOCArMTIxNDAsOCBAQCBzdGF0aWMgdm9pZCBpbnRlbF9kdW1wX3Bp cGVfY29uZmlnKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAogCURSTV9ERUJVR19LTVMoIltDUlRD OiVkXSVzIGNvbmZpZyAlcCBmb3IgcGlwZSAlY1xuIiwgY3J0Yy0+YmFzZS5iYXNlLmlkLAogCQkg ICAgICBjb250ZXh0LCBwaXBlX2NvbmZpZywgcGlwZV9uYW1lKGNydGMtPnBpcGUpKTsKIAotCURS TV9ERUJVR19LTVMoImNwdV90cmFuc2NvZGVyOiAlc1xuIiwgdHJhbnNjb2Rlcl9uYW1lKHBpcGVf Y29uZmlnLT5jcHVfdHJhbnNjb2RlcikpOwotCURSTV9ERUJVR19LTVMoInBpcGUgYnBwOiAlaSwg ZGl0aGVyaW5nOiAlaVxuIiwKKwlEUk1fREVCVUdfS01TKCJjcHVfdHJhbnNjb2RlcjogJXM7IHBp cGUgYnBwOiAlaSwgZGl0aGVyaW5nOiAlaVxuIiwKKwkJICAgICAgdHJhbnNjb2Rlcl9uYW1lKHBp cGVfY29uZmlnLT5jcHVfdHJhbnNjb2RlciksCiAJCSAgICAgIHBpcGVfY29uZmlnLT5waXBlX2Jw cCwgcGlwZV9jb25maWctPmRpdGhlcik7CiAJRFJNX0RFQlVHX0tNUygiZmRpL3BjaDogJWksIGxh bmVzOiAlaSwgZ21jaF9tOiAldSwgZ21jaF9uOiAldSwgbGlua19tOiAldSwgbGlua19uOiAldSwg dHU6ICV1XG4iLAogCQkgICAgICBwaXBlX2NvbmZpZy0+aGFzX3BjaF9lbmNvZGVyLApAQCAtMTIx NzMsMTMgKzEyMTc0LDE0IEBAIHN0YXRpYyB2b2lkIGludGVsX2R1bXBfcGlwZV9jb25maWcoc3Ry dWN0IGludGVsX2NydGMgKmNydGMsCiAJRFJNX0RFQlVHX0tNUygiYWRqdXN0ZWQgbW9kZTpcbiIp OwogCWRybV9tb2RlX2RlYnVnX3ByaW50bW9kZWxpbmUoJnBpcGVfY29uZmlnLT5iYXNlLmFkanVz dGVkX21vZGUpOwogCWludGVsX2R1bXBfY3J0Y190aW1pbmdzKCZwaXBlX2NvbmZpZy0+YmFzZS5h ZGp1c3RlZF9tb2RlKTsKLQlEUk1fREVCVUdfS01TKCJwb3J0IGNsb2NrOiAlZFxuIiwgcGlwZV9j b25maWctPnBvcnRfY2xvY2spOwotCURSTV9ERUJVR19LTVMoInBpcGUgc3JjIHNpemU6ICVkeCVk XG4iLAorCURSTV9ERUJVR19LTVMoInBvcnQgY2xvY2s6ICVkOyBwaXBlIHNyYyBzaXplOiAlZHgl ZFxuIiwKKwkJICAgICAgcGlwZV9jb25maWctPnBvcnRfY2xvY2ssCiAJCSAgICAgIHBpcGVfY29u ZmlnLT5waXBlX3NyY193LCBwaXBlX2NvbmZpZy0+cGlwZV9zcmNfaCk7Ci0JRFJNX0RFQlVHX0tN UygibnVtX3NjYWxlcnM6ICVkLCBzY2FsZXJfdXNlcnM6IDB4JXgsIHNjYWxlcl9pZDogJWRcbiIs Ci0JCSAgICAgIGNydGMtPm51bV9zY2FsZXJzLAotCQkgICAgICBwaXBlX2NvbmZpZy0+c2NhbGVy X3N0YXRlLnNjYWxlcl91c2VycywKLQkJICAgICAgcGlwZV9jb25maWctPnNjYWxlcl9zdGF0ZS5z Y2FsZXJfaWQpOworCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDkpCisJCURSTV9ERUJVR19L TVMoIm51bV9zY2FsZXJzOiAlZCwgc2NhbGVyX3VzZXJzOiAweCV4LCBzY2FsZXJfaWQ6ICVkXG4i LAorCQkJICAgICAgY3J0Yy0+bnVtX3NjYWxlcnMsCisJCQkgICAgICBwaXBlX2NvbmZpZy0+c2Nh bGVyX3N0YXRlLnNjYWxlcl91c2VycywKKwkJCSAgICAgIHBpcGVfY29uZmlnLT5zY2FsZXJfc3Rh dGUuc2NhbGVyX2lkKTsKIAlEUk1fREVCVUdfS01TKCJnbWNoIHBmaXQ6IGNvbnRyb2w6IDB4JTA4 eCwgcmF0aW9zOiAweCUwOHgsIGx2ZHMgYm9yZGVyOiAweCUwOHhcbiIsCiAJCSAgICAgIHBpcGVf Y29uZmlnLT5nbWNoX3BmaXQuY29udHJvbCwKIAkJICAgICAgcGlwZV9jb25maWctPmdtY2hfcGZp dC5wZ21fcmF0aW9zLApAQCAtMTIxODgsOCArMTIxOTAsOCBAQCBzdGF0aWMgdm9pZCBpbnRlbF9k dW1wX3BpcGVfY29uZmlnKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAogCQkgICAgICBwaXBlX2Nv bmZpZy0+cGNoX3BmaXQucG9zLAogCQkgICAgICBwaXBlX2NvbmZpZy0+cGNoX3BmaXQuc2l6ZSwK IAkJICAgICAgcGlwZV9jb25maWctPnBjaF9wZml0LmVuYWJsZWQgPyAiZW5hYmxlZCIgOiAiZGlz YWJsZWQiKTsKLQlEUk1fREVCVUdfS01TKCJpcHM6ICVpXG4iLCBwaXBlX2NvbmZpZy0+aXBzX2Vu YWJsZWQpOwotCURSTV9ERUJVR19LTVMoImRvdWJsZSB3aWRlOiAlaVxuIiwgcGlwZV9jb25maWct PmRvdWJsZV93aWRlKTsKKwlEUk1fREVCVUdfS01TKCJpcHM6ICVpOyBkb3VibGUgd2lkZTogJWlc biIsCisJCSAgICAgIHBpcGVfY29uZmlnLT5pcHNfZW5hYmxlZCwgcGlwZV9jb25maWctPmRvdWJs ZV93aWRlKTsKIAogCWlmIChJU19CUk9YVE9OKGRldikpIHsKIAkJRFJNX0RFQlVHX0tNUygiZGRp X3BsbF9zZWw6ICV1OyBkcGxsX2h3X3N0YXRlOiBlYmIwOiAweCV4LCBlYmI0OiAweCV4LCIKQEAg LTEyMjI4LDM4ICsxMjIzMCwzNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9kdW1wX3BpcGVfY29uZmln KHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAogCQkJICAgICAgcGlwZV9jb25maWctPmRwbGxfaHdf c3RhdGUuZnAxKTsKIAl9CiAKLQlEUk1fREVCVUdfS01TKCJwbGFuZXMgb24gdGhpcyBjcnRjXG4i KTsKKwlEUk1fREVCVUdfS01TKCJQbGFuZXMgb24gdGhpcyBjcnRjOlxuIik7CiAJbGlzdF9mb3Jf ZWFjaF9lbnRyeShwbGFuZSwgJmRldi0+bW9kZV9jb25maWcucGxhbmVfbGlzdCwgaGVhZCkgewog CQlpbnRlbF9wbGFuZSA9IHRvX2ludGVsX3BsYW5lKHBsYW5lKTsKIAkJaWYgKGludGVsX3BsYW5l LT5waXBlICE9IGNydGMtPnBpcGUpCiAJCQljb250aW51ZTsKIAorCQlEUk1fREVCVUdfS01TKCIg ICVzIHBsYW5lOiVkICgldS4ldSkgaWR4OiAlZFxuIiwKKwkJCXBsYW5lLT50eXBlID09IERSTV9Q TEFORV9UWVBFX0NVUlNPUiA/CisJCQkiY3Vyc29yIiA6ICJzdGFuZGFyZCIsCisJCQlwbGFuZS0+ YmFzZS5pZCwgaW50ZWxfcGxhbmUtPnBpcGUsCisJCQkoY3J0Yy0+YmFzZS5wcmltYXJ5ID09IHBs YW5lKSA/CisJCQkwIDogaW50ZWxfcGxhbmUtPnBsYW5lICsgMSwKKwkJCWRybV9wbGFuZV9pbmRl eChwbGFuZSkpOworCiAJCXN0YXRlID0gdG9faW50ZWxfcGxhbmVfc3RhdGUocGxhbmUtPnN0YXRl KTsKIAkJZmIgPSBzdGF0ZS0+YmFzZS5mYjsKLQkJaWYgKCFmYikgewotCQkJRFJNX0RFQlVHX0tN UygiJXMgUExBTkU6JWQgcGxhbmU6ICV1LiV1IGlkeDogJWQgIgotCQkJCSJkaXNhYmxlZCwgc2Nh bGVyX2lkID0gJWRcbiIsCi0JCQkJcGxhbmUtPnR5cGUgPT0gRFJNX1BMQU5FX1RZUEVfQ1VSU09S ID8gIkNVUlNPUiIgOiAiU1RBTkRBUkQiLAotCQkJCXBsYW5lLT5iYXNlLmlkLCBpbnRlbF9wbGFu ZS0+cGlwZSwKLQkJCQkoY3J0Yy0+YmFzZS5wcmltYXJ5ID09IHBsYW5lKSA/IDAgOiBpbnRlbF9w bGFuZS0+cGxhbmUgKyAxLAotCQkJCWRybV9wbGFuZV9pbmRleChwbGFuZSksIHN0YXRlLT5zY2Fs ZXJfaWQpOwotCQkJY29udGludWU7Ci0JCX0KIAotCQlEUk1fREVCVUdfS01TKCIlcyBQTEFORTol ZCBwbGFuZTogJXUuJXUgaWR4OiAlZCBlbmFibGVkIiwKLQkJCXBsYW5lLT50eXBlID09IERSTV9Q TEFORV9UWVBFX0NVUlNPUiA/ICJDVVJTT1IiIDogIlNUQU5EQVJEIiwKLQkJCXBsYW5lLT5iYXNl LmlkLCBpbnRlbF9wbGFuZS0+cGlwZSwKLQkJCWNydGMtPmJhc2UucHJpbWFyeSA9PSBwbGFuZSA/ IDAgOiBpbnRlbF9wbGFuZS0+cGxhbmUgKyAxLAotCQkJZHJtX3BsYW5lX2luZGV4KHBsYW5lKSk7 Ci0JCURSTV9ERUJVR19LTVMoIlx0RkI6JWQsIGZiID0gJXV4JXUgZm9ybWF0ID0gMHgleCIsCi0J CQlmYi0+YmFzZS5pZCwgZmItPndpZHRoLCBmYi0+aGVpZ2h0LCBmYi0+cGl4ZWxfZm9ybWF0KTsK LQkJRFJNX0RFQlVHX0tNUygiXHRzY2FsZXI6JWQgc3JjICgldSwgJXUpICV1eCV1IGRzdCAoJXUs ICV1KSAldXgldVxuIiwKLQkJCXN0YXRlLT5zY2FsZXJfaWQsCi0JCQlzdGF0ZS0+c3JjLngxID4+ IDE2LCBzdGF0ZS0+c3JjLnkxID4+IDE2LAotCQkJZHJtX3JlY3Rfd2lkdGgoJnN0YXRlLT5zcmMp ID4+IDE2LAotCQkJZHJtX3JlY3RfaGVpZ2h0KCZzdGF0ZS0+c3JjKSA+PiAxNiwKLQkJCXN0YXRl LT5kc3QueDEsIHN0YXRlLT5kc3QueTEsCi0JCQlkcm1fcmVjdF93aWR0aCgmc3RhdGUtPmRzdCks IGRybV9yZWN0X2hlaWdodCgmc3RhdGUtPmRzdCkpOworCQlpZiAoZmIpCisJCQlEUk1fREVCVUdf S01TKCJcdGZiOiVkLCAldXgldSwgZm9ybWF0ID0gMHgleCIsCisJCQkJICAgICAgZmItPmJhc2Uu aWQsIGZiLT53aWR0aCwgZmItPmhlaWdodCwKKwkJCQkgICAgICBmYi0+cGl4ZWxfZm9ybWF0KTsK KworCQlpZiAoZmIgJiYgSU5URUxfR0VOKGRldl9wcml2KSA+PSA5KQorCQkJRFJNX0RFQlVHX0tN UygiXHRzY2FsZXI6JWQgc3JjICgldSwgJXUpICV1eCV1IGRzdCAoJXUsICV1KSAldXgldVxuIiwK KwkJCQkgICAgICBzdGF0ZS0+c2NhbGVyX2lkLAorCQkJCSAgICAgIHN0YXRlLT5zcmMueDEgPj4g MTYsIHN0YXRlLT5zcmMueTEgPj4gMTYsCisJCQkJICAgICAgZHJtX3JlY3Rfd2lkdGgoJnN0YXRl LT5zcmMpID4+IDE2LAorCQkJCSAgICAgIGRybV9yZWN0X2hlaWdodCgmc3RhdGUtPnNyYykgPj4g MTYsCisJCQkJICAgICAgc3RhdGUtPmRzdC54MSwgc3RhdGUtPmRzdC55MSwKKwkJCQkgICAgICBk cm1fcmVjdF93aWR0aCgmc3RhdGUtPmRzdCksCisJCQkJICAgICAgZHJtX3JlY3RfaGVpZ2h0KCZz dGF0ZS0+ZHN0KSk7CiAJfQogfQogCi0tIAoxLjkuMQoKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhA bGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxt YW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==