From: Rodrigo Vivi Subject: [PATCH 05/11] drm/i915/psr: Unify VSC setup functions. Date: Thu, 7 Sep 2017 16:00:35 -0700 Message-ID: <20170907230041.22978-6-rodrigo.vivi@intel.com> References: <20170907230041.22978-1-rodrigo.vivi@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5E18B6EA3B for ; Thu, 7 Sep 2017 23:00:51 +0000 (UTC) In-Reply-To: <20170907230041.22978-1-rodrigo.vivi@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 Cc: Dhinakaran Pandiyan , Rodrigo Vivi List-Id: intel-gfx@lists.freedesktop.org VlNDIHBhY2thZ2UgaXMgZGVjaWRlZCBwZXIgZURQIHNwZWMgZm9yIHBzcjEgb3IgcHNyMiwKYW5k IG5vdCBwZXIgcGxhdGZvcm0sIHNvIGxldCdzIHVuaWZ5IGl0IGFuZCBraWxsICJza2wiCmZ1bmMu Cgp2MjogUmViYXNlZCBvbiB0b3Agb2YgY29tbWl0IGQyNDE5ZmZjMTBlNCAoImRybS9pOTE1OiBQ bHVtYgogICAgY3J0Y19zdGF0ZSB0byBQU1IgZW5hYmxlL2Rpc2FibGUiKQoKQ2M6IERoaW5ha2Fy YW4gUGFuZGl5YW4gPGRoaW5ha2FyYW4ucGFuZGl5YW5AaW50ZWwuY29tPgpDYzogVmF0aHNhbGEg TmFnYXJhanUgPHZhdGhzYWxhLm5hZ2FyYWp1QGludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogUm9k cmlnbyBWaXZpIDxyb2RyaWdvLnZpdmlAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX3Bzci5jIHwgNjEgKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0t LS0tLQogMSBmaWxlIGNoYW5nZWQsIDI3IGluc2VydGlvbnMoKyksIDM0IGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Bzci5jIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfcHNyLmMKaW5kZXggYjNjMWU2MDFhOGIyLi5lY2E2MTcwYmVjZGMg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Bzci5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3Bzci5jCkBAIC0xMTcsNDYgKzExNyw0MSBAQCBzdGF0aWMg dm9pZCB2bHZfcHNyX3NldHVwX3ZzYyhzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwLAogCUk5MTVf V1JJVEUoVkxWX1ZTQ1NEUChjcnRjLT5waXBlKSwgdmFsKTsKIH0KIAotc3RhdGljIHZvaWQgc2ts X3Bzcl9zZXR1cF9zdV92c2Moc3RydWN0IGludGVsX2RwICppbnRlbF9kcCwKLQkJCQkgY29uc3Qg c3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpCitzdGF0aWMgdm9pZCBoc3dfcHNy X3NldHVwX3ZzYyhzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwLAorCQkJICAgICAgY29uc3Qgc3Ry dWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpCiB7CiAJc3RydWN0IGludGVsX2RpZ2l0 YWxfcG9ydCAqaW50ZWxfZGlnX3BvcnQgPSBkcF90b19kaWdfcG9ydChpbnRlbF9kcCk7CiAJc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShpbnRlbF9kaWdfcG9ydC0+ YmFzZS5iYXNlLmRldik7CiAJc3RydWN0IGVkcF92c2NfcHNyIHBzcl92c2M7CiAKLQkvKiBQcmVw YXJlIFZTQyBIZWFkZXIgZm9yIFNVIGFzIHBlciBFRFAgMS40IHNwZWMsIFRhYmxlIDYuMTEgKi8K LQltZW1zZXQoJnBzcl92c2MsIDAsIHNpemVvZihwc3JfdnNjKSk7Ci0JcHNyX3ZzYy5zZHBfaGVh ZGVyLkhCMCA9IDA7Ci0JcHNyX3ZzYy5zZHBfaGVhZGVyLkhCMSA9IDB4NzsKLQlpZiAoZGV2X3By aXYtPnBzci5jb2xvcmltZXRyeV9zdXBwb3J0ICYmCi0JCWRldl9wcml2LT5wc3IueV9jb3JkX3N1 cHBvcnQpIHsKLQkJcHNyX3ZzYy5zZHBfaGVhZGVyLkhCMiA9IDB4NTsKLQkJcHNyX3ZzYy5zZHBf aGVhZGVyLkhCMyA9IDB4MTM7Ci0JfSBlbHNlIGlmIChkZXZfcHJpdi0+cHNyLnlfY29yZF9zdXBw b3J0KSB7Ci0JCXBzcl92c2Muc2RwX2hlYWRlci5IQjIgPSAweDQ7Ci0JCXBzcl92c2Muc2RwX2hl YWRlci5IQjMgPSAweGU7CisJaWYgKGRldl9wcml2LT5wc3IucHNyMl9zdXBwb3J0KSB7CisJCS8q IFByZXBhcmUgVlNDIEhlYWRlciBmb3IgU1UgYXMgcGVyIEVEUCAxLjQgc3BlYywgVGFibGUgNi4x MSAqLworCQltZW1zZXQoJnBzcl92c2MsIDAsIHNpemVvZihwc3JfdnNjKSk7CisJCXBzcl92c2Mu c2RwX2hlYWRlci5IQjAgPSAwOworCQlwc3JfdnNjLnNkcF9oZWFkZXIuSEIxID0gMHg3OworCQlp ZiAoZGV2X3ByaXYtPnBzci5jb2xvcmltZXRyeV9zdXBwb3J0ICYmCisJCSAgICBkZXZfcHJpdi0+ cHNyLnlfY29yZF9zdXBwb3J0KSB7CisJCQlwc3JfdnNjLnNkcF9oZWFkZXIuSEIyID0gMHg1Owor CQkJcHNyX3ZzYy5zZHBfaGVhZGVyLkhCMyA9IDB4MTM7CisJCX0gZWxzZSBpZiAoZGV2X3ByaXYt PnBzci55X2NvcmRfc3VwcG9ydCkgeworCQkJcHNyX3ZzYy5zZHBfaGVhZGVyLkhCMiA9IDB4NDsK KwkJCXBzcl92c2Muc2RwX2hlYWRlci5IQjMgPSAweGU7CisJCX0gZWxzZSB7CisJCQlwc3JfdnNj LnNkcF9oZWFkZXIuSEIyID0gMHgzOworCQkJcHNyX3ZzYy5zZHBfaGVhZGVyLkhCMyA9IDB4YzsK KwkJfQogCX0gZWxzZSB7Ci0JCXBzcl92c2Muc2RwX2hlYWRlci5IQjIgPSAweDM7Ci0JCXBzcl92 c2Muc2RwX2hlYWRlci5IQjMgPSAweGM7CisJCS8qIFByZXBhcmUgVlNDIHBhY2tldCBhcyBwZXIg RURQIDEuMyBzcGVjLCBUYWJsZSAzLjEwICovCisJCW1lbXNldCgmcHNyX3ZzYywgMCwgc2l6ZW9m KHBzcl92c2MpKTsKKwkJcHNyX3ZzYy5zZHBfaGVhZGVyLkhCMCA9IDA7CisJCXBzcl92c2Muc2Rw X2hlYWRlci5IQjEgPSAweDc7CisJCXBzcl92c2Muc2RwX2hlYWRlci5IQjIgPSAweDI7CisJCXBz cl92c2Muc2RwX2hlYWRlci5IQjMgPSAweDg7CiAJfQogCiAJaW50ZWxfcHNyX3dyaXRlX3ZzYyhp bnRlbF9kcCwgJnBzcl92c2MpOwogfQogCi1zdGF0aWMgdm9pZCBoc3dfcHNyX3NldHVwX3ZzYyhz dHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwLAotCQkJICAgICAgY29uc3Qgc3RydWN0IGludGVsX2Ny dGNfc3RhdGUgKmNydGNfc3RhdGUpCi17Ci0Jc3RydWN0IGVkcF92c2NfcHNyIHBzcl92c2M7Ci0K LQkvKiBQcmVwYXJlIFZTQyBwYWNrZXQgYXMgcGVyIEVEUCAxLjMgc3BlYywgVGFibGUgMy4xMCAq LwotCW1lbXNldCgmcHNyX3ZzYywgMCwgc2l6ZW9mKHBzcl92c2MpKTsKLQlwc3JfdnNjLnNkcF9o ZWFkZXIuSEIwID0gMDsKLQlwc3JfdnNjLnNkcF9oZWFkZXIuSEIxID0gMHg3OwotCXBzcl92c2Mu c2RwX2hlYWRlci5IQjIgPSAweDI7Ci0JcHNyX3ZzYy5zZHBfaGVhZGVyLkhCMyA9IDB4ODsKLQlp bnRlbF9wc3Jfd3JpdGVfdnNjKGludGVsX2RwLCAmcHNyX3ZzYyk7Ci19Ci0KIHN0YXRpYyB2b2lk IHZsdl9wc3JfZW5hYmxlX3Npbmsoc3RydWN0IGludGVsX2RwICppbnRlbF9kcCkKIHsKIAlkcm1f ZHBfZHBjZF93cml0ZWIoJmludGVsX2RwLT5hdXgsIERQX1BTUl9FTl9DRkcsCkBAIC01MTIsOSAr NTA3LDEwIEBAIHZvaWQgaW50ZWxfcHNyX2VuYWJsZShzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2Rw LAogCWRldl9wcml2LT5wc3IuYnVzeV9mcm9udGJ1ZmZlcl9iaXRzID0gMDsKIAogCWlmIChIQVNf RERJKGRldl9wcml2KSkgewotCQlpZiAoZGV2X3ByaXYtPnBzci5wc3IyX3N1cHBvcnQpIHsKLQkJ CXNrbF9wc3Jfc2V0dXBfc3VfdnNjKGludGVsX2RwLCBjcnRjX3N0YXRlKTsKIAorCQloc3dfcHNy X3NldHVwX3ZzYyhpbnRlbF9kcCwgY3J0Y19zdGF0ZSk7CisKKwkJaWYgKGRldl9wcml2LT5wc3Iu cHNyMl9zdXBwb3J0KSB7CiAJCQljaGlja2VuID0gUFNSMl9WU0NfRU5BQkxFX1BST0dfSEVBREVS OwogCQkJaWYgKGRldl9wcml2LT5wc3IueV9jb3JkX3N1cHBvcnQpCiAJCQkJY2hpY2tlbiB8PSBQ U1IyX0FERF9WRVJUSUNBTF9MSU5FX0NPVU5UOwpAQCAtNTI3LDkgKzUyMyw2IEBAIHZvaWQgaW50 ZWxfcHNyX2VuYWJsZShzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwLAogCQkJCSAgIEVEUF9QU1Jf REVCVUdfTUFTS19NQVhfU0xFRVAgfAogCQkJCSAgIEVEUF9QU1JfREVCVUdfTUFTS19ESVNQX1JF R19XUklURSk7CiAJCX0gZWxzZSB7Ci0JCQkvKiBzZXQgdXAgdnNjIGhlYWRlciBmb3IgcHNyMSAq LwotCQkJaHN3X3Bzcl9zZXR1cF92c2MoaW50ZWxfZHAsIGNydGNfc3RhdGUpOwotCiAJCQkvKgog CQkJICogUGVyIFNwZWM6IEF2b2lkIGNvbnRpbnVvdXMgUFNSIGV4aXQgYnkgbWFza2luZyBNRU1V UAogCQkJICogYW5kIEhQRC4gYWxzbyBtYXNrIExQU1AgdG8gYXZvaWQgZGVwZW5kZW5jeSBvbiBv dGhlcgotLSAKMi4xMy4yCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRl bC1nZngK