From: Tvrtko Ursulin Subject: [PATCH 4/9] drm/i915: Tidy planes and scaler info in intel_dump_pipe_config Date: Wed, 27 Apr 2016 11:06:57 +0100 Message-ID: <1461751622-26927-5-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1461751622-26927-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 mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 55B376EA3D for ; Wed, 27 Apr 2016 10:07:11 +0000 (UTC) In-Reply-To: <1461751622-26927-1-git-send-email-tvrtko.ursulin@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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCjEuIE9ubHkg bG9nIHNjYWxlciBkYXRhIHdoZXJlIHNjYWxlcnMgYXJlIHN1cHBvcnRlZCBmb3IKICAgdGlkaWVy IGxvZ3MuCgoyLiBUaWR5IHBsYW5lIGRhdGEgYW5kIGZpeCBsb2dnaW5nIHByZWZpeCBpbiB0aGUg bWlkZGxlCiAgIG9mIGEgbGluZS4KClNpZ25lZC1vZmYtYnk6IFR2cnRrbyBVcnN1bGluIDx0dnJ0 a28udXJzdWxpbkBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlz cGxheS5jIHwgNjggKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUg Y2hhbmdlZCwgNDAgaW5zZXJ0aW9ucygrKSwgMjggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IDEzNjJhMTI3MGM5Zi4uNmQ2M2JjMzk3NzdjIDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC0xMjEzMCw2ICsxMjEzMCw3IEBAIHN0 YXRpYyB2b2lkIGludGVsX2R1bXBfcGlwZV9jb25maWcoc3RydWN0IGludGVsX2NydGMgKmNydGMs CiAJCQkJICAgY29uc3QgY2hhciAqY29udGV4dCkKIHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 ID0gY3J0Yy0+YmFzZS5kZXY7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0g dG9faTkxNShkZXYpOwogCXN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lOwogCXN0cnVjdCBpbnRlbF9w bGFuZSAqaW50ZWxfcGxhbmU7CiAJc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpzdGF0ZTsKQEAg LTEyMTgwLDEwICsxMjE4MSwxMyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9kdW1wX3BpcGVfY29uZmln KHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAogCURSTV9ERUJVR19LTVMoInBvcnQgY2xvY2s6ICVk XG4iLCBwaXBlX2NvbmZpZy0+cG9ydF9jbG9jayk7CiAJRFJNX0RFQlVHX0tNUygicGlwZSBzcmMg c2l6ZTogJWR4JWRcbiIsCiAJCSAgICAgIHBpcGVfY29uZmlnLT5waXBlX3NyY193LCBwaXBlX2Nv bmZpZy0+cGlwZV9zcmNfaCk7Ci0JRFJNX0RFQlVHX0tNUygibnVtX3NjYWxlcnM6ICVkLCBzY2Fs ZXJfdXNlcnM6IDB4JXgsIHNjYWxlcl9pZDogJWRcbiIsCi0JCSAgICAgIGNydGMtPm51bV9zY2Fs ZXJzLAotCQkgICAgICBwaXBlX2NvbmZpZy0+c2NhbGVyX3N0YXRlLnNjYWxlcl91c2VycywKLQkJ ICAgICAgcGlwZV9jb25maWctPnNjYWxlcl9zdGF0ZS5zY2FsZXJfaWQpOworCisJaWYgKElOVEVM X0dFTihkZXZfcHJpdikgPj0gOSkKKwkJRFJNX0RFQlVHX0tNUygibnVtX3NjYWxlcnM6ICVkLCBz Y2FsZXJfdXNlcnM6IDB4JXgsIHNjYWxlcl9pZDogJWRcbiIsCisJCQkgICAgICBjcnRjLT5udW1f c2NhbGVycywKKwkJCSAgICAgIHBpcGVfY29uZmlnLT5zY2FsZXJfc3RhdGUuc2NhbGVyX3VzZXJz LAorCQkJICAgICAgcGlwZV9jb25maWctPnNjYWxlcl9zdGF0ZS5zY2FsZXJfaWQpOworCiAJRFJN X0RFQlVHX0tNUygiZ21jaCBwZml0OiBjb250cm9sOiAweCUwOHgsIHJhdGlvczogMHglMDh4LCBs dmRzIGJvcmRlcjogMHglMDh4XG4iLAogCQkgICAgICBwaXBlX2NvbmZpZy0+Z21jaF9wZml0LmNv bnRyb2wsCiAJCSAgICAgIHBpcGVfY29uZmlnLT5nbWNoX3BmaXQucGdtX3JhdGlvcywKQEAgLTEy MjMyLDcgKzEyMjM2LDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfZHVtcF9waXBlX2NvbmZpZyhzdHJ1 Y3QgaW50ZWxfY3J0YyAqY3J0YywKIAkJCSAgICAgIHBpcGVfY29uZmlnLT5kcGxsX2h3X3N0YXRl LmZwMSk7CiAJfQogCi0JRFJNX0RFQlVHX0tNUygicGxhbmVzIG9uIHRoaXMgY3J0Y1xuIik7CisJ RFJNX0RFQlVHX0tNUygiUGxhbmVzIG9uIHRoaXMgY3J0YzpcbiIpOwogCWxpc3RfZm9yX2VhY2hf ZW50cnkocGxhbmUsICZkZXYtPm1vZGVfY29uZmlnLnBsYW5lX2xpc3QsIGhlYWQpIHsKIAkJaW50 ZWxfcGxhbmUgPSB0b19pbnRlbF9wbGFuZShwbGFuZSk7CiAJCWlmIChpbnRlbF9wbGFuZS0+cGlw ZSAhPSBjcnRjLT5waXBlKQpAQCAtMTIyNDAsMzAgKzEyMjQ0LDM4IEBAIHN0YXRpYyB2b2lkIGlu dGVsX2R1bXBfcGlwZV9jb25maWcoc3RydWN0IGludGVsX2NydGMgKmNydGMsCiAKIAkJc3RhdGUg PSB0b19pbnRlbF9wbGFuZV9zdGF0ZShwbGFuZS0+c3RhdGUpOwogCQlmYiA9IHN0YXRlLT5iYXNl LmZiOwotCQlpZiAoIWZiKSB7Ci0JCQlEUk1fREVCVUdfS01TKCIlcyBQTEFORTolZCBwbGFuZTog JXUuJXUgaWR4OiAlZCAiCi0JCQkJImRpc2FibGVkLCBzY2FsZXJfaWQgPSAlZFxuIiwKLQkJCQlw bGFuZS0+dHlwZSA9PSBEUk1fUExBTkVfVFlQRV9DVVJTT1IgPyAiQ1VSU09SIiA6ICJTVEFOREFS RCIsCi0JCQkJcGxhbmUtPmJhc2UuaWQsIGludGVsX3BsYW5lLT5waXBlLAotCQkJCShjcnRjLT5i YXNlLnByaW1hcnkgPT0gcGxhbmUpID8gMCA6IGludGVsX3BsYW5lLT5wbGFuZSArIDEsCi0JCQkJ ZHJtX3BsYW5lX2luZGV4KHBsYW5lKSwgc3RhdGUtPnNjYWxlcl9pZCk7Ci0JCQljb250aW51ZTsK LQkJfQogCi0JCURSTV9ERUJVR19LTVMoIiVzIFBMQU5FOiVkIHBsYW5lOiAldS4ldSBpZHg6ICVk IGVuYWJsZWQiLAotCQkJcGxhbmUtPnR5cGUgPT0gRFJNX1BMQU5FX1RZUEVfQ1VSU09SID8gIkNV UlNPUiIgOiAiU1RBTkRBUkQiLAotCQkJcGxhbmUtPmJhc2UuaWQsIGludGVsX3BsYW5lLT5waXBl LAotCQkJY3J0Yy0+YmFzZS5wcmltYXJ5ID09IHBsYW5lID8gMCA6IGludGVsX3BsYW5lLT5wbGFu ZSArIDEsCi0JCQlkcm1fcGxhbmVfaW5kZXgocGxhbmUpKTsKLQkJRFJNX0RFQlVHX0tNUygiXHRG QjolZCwgZmIgPSAldXgldSBmb3JtYXQgPSAweCV4IiwKLQkJCWZiLT5iYXNlLmlkLCBmYi0+d2lk dGgsIGZiLT5oZWlnaHQsIGZiLT5waXhlbF9mb3JtYXQpOwotCQlEUk1fREVCVUdfS01TKCJcdHNj YWxlcjolZCBzcmMgKCV1LCAldSkgJXV4JXUgZHN0ICgldSwgJXUpICV1eCV1XG4iLAotCQkJc3Rh dGUtPnNjYWxlcl9pZCwKLQkJCXN0YXRlLT5zcmMueDEgPj4gMTYsIHN0YXRlLT5zcmMueTEgPj4g MTYsCi0JCQlkcm1fcmVjdF93aWR0aCgmc3RhdGUtPnNyYykgPj4gMTYsCi0JCQlkcm1fcmVjdF9o ZWlnaHQoJnN0YXRlLT5zcmMpID4+IDE2LAotCQkJc3RhdGUtPmRzdC54MSwgc3RhdGUtPmRzdC55 MSwKLQkJCWRybV9yZWN0X3dpZHRoKCZzdGF0ZS0+ZHN0KSwgZHJtX3JlY3RfaGVpZ2h0KCZzdGF0 ZS0+ZHN0KSk7CisJCWlmIChmYikKKwkJCURSTV9ERUJVR19LTVMoIioiKTsKKwkJZWxzZQorCQkJ RFJNX0RFQlVHX0tNUygiICIpOworCisJCWlmIChkcm1fZGVidWcgJiBEUk1fVVRfS01TKQorCQkJ cHJpbnRrKCIlcyBwbGFuZTolZCAoJXUuJXUpIGlkeDogJWQiLAorCQkJICAgICAgIHBsYW5lLT50 eXBlID09IERSTV9QTEFORV9UWVBFX0NVUlNPUiA/CisJCQkgICAgICAgImN1cnNvciIgOiAic3Rh bmRhcmQiLAorCQkJICAgICAgIHBsYW5lLT5iYXNlLmlkLCBpbnRlbF9wbGFuZS0+cGlwZSwKKwkJ CSAgICAgICBjcnRjLT5iYXNlLnByaW1hcnkgPT0gcGxhbmUgPworCQkJICAgICAgIDAgOiBpbnRl bF9wbGFuZS0+cGxhbmUgKyAxLAorCQkJICAgICAgIGRybV9wbGFuZV9pbmRleChwbGFuZSkpOwor CisJCWlmIChmYiAmJiAoZHJtX2RlYnVnICYgRFJNX1VUX0tNUykpCisJCQlwcmludGsoIiBmYjol ZCAoJXV4JXUpIGZvcm1hdD0weCV4IiwKKwkJCSAgICAgICBmYi0+YmFzZS5pZCwgZmItPndpZHRo LCBmYi0+aGVpZ2h0LAorCQkJICAgICAgIGZiLT5waXhlbF9mb3JtYXQpOworCisJCWlmIChJTlRF TF9HRU4oZGV2X3ByaXYpID49IDkgJiYgKGRybV9kZWJ1ZyAmIERSTV9VVF9LTVMpKQorCQkJcHJp bnRrKCIgc2NhbGVyOiVkIHNyYyAoJXUsICV1KSAldXgldSBkc3QgKCV1LCAldSkgJXV4JXVcbiIs CisJCQkgICAgICAgc3RhdGUtPnNjYWxlcl9pZCwKKwkJCSAgICAgICBzdGF0ZS0+c3JjLngxID4+ IDE2LCBzdGF0ZS0+c3JjLnkxID4+IDE2LAorCQkJICAgICAgIGRybV9yZWN0X3dpZHRoKCZzdGF0 ZS0+c3JjKSA+PiAxNiwKKwkJCSAgICAgICBkcm1fcmVjdF9oZWlnaHQoJnN0YXRlLT5zcmMpID4+ IDE2LAorCQkJICAgICAgIHN0YXRlLT5kc3QueDEsIHN0YXRlLT5kc3QueTEsCisJCQkgICAgICAg ZHJtX3JlY3Rfd2lkdGgoJnN0YXRlLT5kc3QpLAorCQkJICAgICAgIGRybV9yZWN0X2hlaWdodCgm c3RhdGUtPmRzdCkpOworCisJCWlmIChmYiAmJiAoZHJtX2RlYnVnICYgRFJNX1VUX0tNUykpCisJ CQlwcmludGsoIlxuIik7CiAJfQogfQogCi0tIAoxLjkuMQoKX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1n ZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h aWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==