From: Sonika Jindal Subject: [PATCH] drm/i915/skl: Enabling PSR2 SU with frame sync Date: Thu, 2 Apr 2015 11:02:44 +0530 Message-ID: <1427952764-23394-1-git-send-email-sonika.jindal@intel.com> References: <20150331122849.GF6354@phenom.ffwll.local> 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 669D86E112 for ; Wed, 1 Apr 2015 22:41:06 -0700 (PDT) In-Reply-To: <20150331122849.GF6354@phenom.ffwll.local> 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: Rodrigo Vivi List-Id: intel-gfx@lists.freedesktop.org V2UgbWFrZSB1c2Ugb2YgSFcgdHJhY2tpbmcgZm9yIFNlbGVjdGl2ZSB1cGRhdGUgcmVnaW9uIGFu ZCBlbmFibGUgZnJhbWUgc3luYyBvbgpzaW5rLiBXZSB1c2UgaGFyZHdhcmUncyBoYXJkY29kZWQg ZGF0YSB2YWx1ZXMgZm9yIGZyYW1lIHN5bmMgYW5kIEdUQy4KCnYyOiBBZGQgMzIwMHgyMDAwIHJl c29sdXRpb24gcmVzdHJpY3Rpb24gd2l0aCBQU1IyLCBtb3ZlIHBzcjJfc3VwcG9ydCB0byBpOTE1 X3BzcgpzdHJ1Y3QsIGFkZCBhdXhfZnJhbWVfc3luYyB0byBpbmRlcGVuZGVudGx5IGNvbnRyb2wg YXV4IGZyYW1lIHN5bmMsIHJlbmFtZSB0aGUKVFAyIFRJTUUgbWFjcm8gZm9yIDI1MDB1cyAoUm9k cmlnbywgU2l2YSkKdjM6IE1vdmluZyB0aGUgcmVzb2x1dGlvbiByZXN0cmljdGlvbiB0byBpbnRl bF9wc3JfZW5hYmxlIHNvIHRoYXQgd2UgY2hlY2sgaXQKb25seSBvbmNlKER1cmdhKQoKQ2M6IER1 cmdhZG9zcyBSIDxkdXJnYWRvc3MuckBpbnRlbC5jb20+CkNjOiBSb2RyaWdvIFZpdmkgPHJvZHJp Z28udml2aUBpbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IFNvbmlrYSBKaW5kYWwgPHNvbmlrYS5q aW5kYWxAaW50ZWwuY29tPgpSZXZpZXdlZC1ieTogRHVyZ2Fkb3NzIFIgPGR1cmdhZG9zcy5yQGlu dGVsLmNvbT4KLS0tCkhpIERhbmllbCwKCkl0IGFwcGxpZXMgY2xlYW5seSBmb3IgbWUuIFN0aWxs IEkgY3JlYXRlZCBuZXcgcGF0Y2guClBsZWFzZSB0cnksIGlmIGl0IHdvcmtzIGZvciB5b3UuCgpS ZWdhcmRzLApTb25pa2EKCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oICB8ICAgIDIg KysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVnLmggIHwgICAxNCArKysrKysrKysrKysr KwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYyAgfCAgIDE1ICsrKysrKysrKysrKysr KwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcHNyLmMgfCAgIDM4ICsrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKystCiA0IGZpbGVzIGNoYW5nZWQsIDY4IGluc2VydGlvbnMo KyksIDEgZGVsZXRpb24oLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCBiMTNjNTUyLi5m MGUxZjJlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTg4MSw2ICs4ODEsOCBAQCBzdHJ1 Y3QgaTkxNV9wc3IgewogCXN0cnVjdCBkZWxheWVkX3dvcmsgd29yazsKIAl1bnNpZ25lZCBidXN5 X2Zyb250YnVmZmVyX2JpdHM7CiAJYm9vbCBsaW5rX3N0YW5kYnk7CisJYm9vbCBwc3IyX3N1cHBv cnQ7CisJYm9vbCBhdXhfZnJhbWVfc3luYzsKIH07CiAKIGVudW0gaW50ZWxfcGNoIHsKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVnLmggYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X3JlZy5oCmluZGV4IGIxMzRmYTMuLjU5ZTliMmQgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVnLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9yZWcuaApAQCAtMjc0OCw2ICsyNzQ4LDIwIEBAIGVudW0gc2tsX2Rpc3BfcG93ZXJfd2VsbHMg ewogI2RlZmluZSAgIEVEUF9QU1JfREVCVUdfTUFTS19NRU1VUAkoMTw8MjYpCiAjZGVmaW5lICAg RURQX1BTUl9ERUJVR19NQVNLX0hQRAkoMTw8MjUpCiAKKyNkZWZpbmUgRURQX1BTUjJfQ1RMCQkJ MHg2ZjkwMAorI2RlZmluZSAgIEVEUF9QU1IyX0VOQUJMRQkJKDE8PDMxKQorI2RlZmluZSAgIEVE UF9TVV9UUkFDS19FTkFCTEUJCSgxPDwzMCkKKyNkZWZpbmUgICBFRFBfTUFYX1NVX0RJU0FCTEVf VElNRSh0KQkoKHQpPDwyMCkKKyNkZWZpbmUgICBFRFBfTUFYX1NVX0RJU0FCTEVfVElNRV9NQVNL CSgweDFmPDwyMCkKKyNkZWZpbmUgICBFRFBfUFNSMl9UUDJfVElNRV81MDAJCSgwPDw4KQorI2Rl ZmluZSAgIEVEUF9QU1IyX1RQMl9USU1FXzEwMAkJKDE8PDgpCisjZGVmaW5lICAgRURQX1BTUjJf VFAyX1RJTUVfMjUwMAkoMjw8OCkKKyNkZWZpbmUgICBFRFBfUFNSMl9UUDJfVElNRV81MAkJKDM8 PDgpCisjZGVmaW5lICAgRURQX1BTUjJfVFAyX1RJTUVfTUFTSwkoMzw8OCkKKyNkZWZpbmUgICBF RFBfUFNSMl9GUkFNRV9CRUZPUkVfU1VfU0hJRlQgNAorI2RlZmluZSAgIEVEUF9QU1IyX0ZSQU1F X0JFRk9SRV9TVV9NQVNLCSgweGY8PDQpCisjZGVmaW5lICAgRURQX1BTUjJfSURMRV9NQVNLCQkw eGYKKwogLyogVkdBIHBvcnQgY29udHJvbCAqLwogI2RlZmluZSBBRFBBCQkJMHg2MTEwMAogI2Rl ZmluZSBQQ0hfQURQQSAgICAgICAgICAgICAgICAweGUxMTAwCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAu YwppbmRleCA3OTM2MTU1Li5hNjUxZGJhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kcC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMKQEAgLTM3 ODUsNiArMzc4NSwyMSBAQCBpbnRlbF9kcF9nZXRfZHBjZChzdHJ1Y3QgaW50ZWxfZHAgKmludGVs X2RwKQogCQkJZGV2X3ByaXYtPnBzci5zaW5rX3N1cHBvcnQgPSB0cnVlOwogCQkJRFJNX0RFQlVH X0tNUygiRGV0ZWN0ZWQgRURQIFBTUiBQYW5lbC5cbiIpOwogCQl9CisKKwkJaWYgKElOVEVMX0lO Rk8oZGV2KS0+Z2VuID49IDkgJiYKKwkJCShpbnRlbF9kcC0+cHNyX2RwY2RbMF0gJiBEUF9QU1Iy X0lTX1NVUFBPUlRFRCkpIHsKKwkJCXVpbnQ4X3QgZnJhbWVfc3luY19jYXA7CisKKwkJCWRldl9w cml2LT5wc3Iuc2lua19zdXBwb3J0ID0gdHJ1ZTsKKwkJCWludGVsX2RwX2RwY2RfcmVhZF93YWtl KCZpbnRlbF9kcC0+YXV4LAorCQkJCQlEUF9TSU5LX0RFVklDRV9BVVhfRlJBTUVfU1lOQ19DQVAs CisJCQkJCSZmcmFtZV9zeW5jX2NhcCwgMSk7CisJCQlkZXZfcHJpdi0+cHNyLmF1eF9mcmFtZV9z eW5jID0gZnJhbWVfc3luY19jYXAgPyB0cnVlIDogZmFsc2U7CisJCQkvKiBQU1IyIG5lZWRzIGZy YW1lIHN5bmMgYXMgd2VsbCAqLworCQkJZGV2X3ByaXYtPnBzci5wc3IyX3N1cHBvcnQgPSBkZXZf cHJpdi0+cHNyLmF1eF9mcmFtZV9zeW5jOworCQkJRFJNX0RFQlVHX0tNUygiUFNSMiAlcyBvbiBz aW5rIiwKKwkJCQlkZXZfcHJpdi0+cHNyLnBzcjJfc3VwcG9ydCA/ICJzdXBwb3J0ZWQiIDogIm5v dCBzdXBwb3J0ZWQiKTsKKwkJfQogCX0KIAogCS8qIFRyYWluaW5nIFBhdHRlcm4gMyBzdXBwb3J0 LCBib3RoIHNvdXJjZSBhbmQgc2luayAqLwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfcHNyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wc3IuYwppbmRleCA5 NjY4NzM1Li4yNzYwOGNlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9w c3IuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wc3IuYwpAQCAtMTE3LDYgKzEx NywxOSBAQCBzdGF0aWMgdm9pZCB2bHZfcHNyX3NldHVwX3ZzYyhzdHJ1Y3QgaW50ZWxfZHAgKmlu dGVsX2RwKQogCUk5MTVfV1JJVEUoVkxWX1ZTQ1NEUChwaXBlKSwgdmFsKTsKIH0KIAorc3RhdGlj IHZvaWQgc2tsX3Bzcl9zZXR1cF9zdV92c2Moc3RydWN0IGludGVsX2RwICppbnRlbF9kcCkKK3sK KwlzdHJ1Y3QgZWRwX3ZzY19wc3IgcHNyX3ZzYzsKKworCS8qIFByZXBhcmUgVlNDIEhlYWRlciBm b3IgU1UgYXMgcGVyIEVEUCAxLjQgc3BlYywgVGFibGUgNi4xMSAqLworCW1lbXNldCgmcHNyX3Zz YywgMCwgc2l6ZW9mKHBzcl92c2MpKTsKKwlwc3JfdnNjLnNkcF9oZWFkZXIuSEIwID0gMDsKKwlw c3JfdnNjLnNkcF9oZWFkZXIuSEIxID0gMHg3OworCXBzcl92c2Muc2RwX2hlYWRlci5IQjIgPSAw eDM7CisJcHNyX3ZzYy5zZHBfaGVhZGVyLkhCMyA9IDB4YjsKKwlpbnRlbF9wc3Jfd3JpdGVfdnNj KGludGVsX2RwLCAmcHNyX3ZzYyk7Cit9CisKIHN0YXRpYyB2b2lkIGhzd19wc3Jfc2V0dXBfdnNj KHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHApCiB7CiAJc3RydWN0IGVkcF92c2NfcHNyIHBzcl92 c2M7CkBAIC0xNjUsNiArMTc4LDEyIEBAIHN0YXRpYyB2b2lkIGhzd19wc3JfZW5hYmxlX3Npbmso c3RydWN0IGludGVsX2RwICppbnRlbF9kcCkKIAkJZHJtX2RwX2RwY2Rfd3JpdGViKCZpbnRlbF9k cC0+YXV4LCBEUF9QU1JfRU5fQ0ZHLAogCQkJCSAgIERQX1BTUl9FTkFCTEUgJiB+RFBfUFNSX01B SU5fTElOS19BQ1RJVkUpOwogCisJLyogRW5hYmxlIEFVWCBmcmFtZSBzeW5jIGF0IHNpbmsgKi8K KwlpZiAoZGV2X3ByaXYtPnBzci5hdXhfZnJhbWVfc3luYykKKwkJZHJtX2RwX2RwY2Rfd3JpdGVi KCZpbnRlbF9kcC0+YXV4LAorCQkJCURQX1NJTktfREVWSUNFX0FVWF9GUkFNRV9TWU5DX0NPTkYs CisJCQkJRFBfQVVYX0ZSQU1FX1NZTkNfRU5BQkxFKTsKKwogCWF1eF9kYXRhX3JlZyA9IChJTlRF TF9JTkZPKGRldiktPmdlbiA+PSA5KSA/CiAJCQkJRFBBX0FVWF9DSF9EQVRBMSA6IEVEUF9QU1Jf QVVYX0RBVEExKGRldik7CiAJYXV4X2N0bF9yZWcgPSAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPj0g OSkgPwpAQCAtMTgzLDggKzIwMiwxMCBAQCBzdGF0aWMgdm9pZCBoc3dfcHNyX2VuYWJsZV9zaW5r KHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHApCiAJCXZhbCB8PSBEUF9BVVhfQ0hfQ1RMX1RJTUVf T1VUXzE2MDB1czsKIAkJdmFsICY9IH5EUF9BVVhfQ0hfQ1RMX01FU1NBR0VfU0laRV9NQVNLOwog CQl2YWwgfD0gKHNpemVvZihhdXhfbXNnKSA8PCBEUF9BVVhfQ0hfQ1RMX01FU1NBR0VfU0laRV9T SElGVCk7Ci0JCS8qIFVzZSBoYXJkY29kZWQgZGF0YSB2YWx1ZXMgZm9yIFBTUiAqLworCQkvKiBV c2UgaGFyZGNvZGVkIGRhdGEgdmFsdWVzIGZvciBQU1IsIGZyYW1lIHN5bmMgYW5kIEdUQyAqLwog CQl2YWwgJj0gfkRQX0FVWF9DSF9DVExfUFNSX0RBVEFfQVVYX1JFR19TS0w7CisJCXZhbCAmPSB+ RFBfQVVYX0NIX0NUTF9GU19EQVRBX0FVWF9SRUdfU0tMOworCQl2YWwgJj0gfkRQX0FVWF9DSF9D VExfR1RDX0RBVEFfQVVYX1JFR19TS0w7CiAJCUk5MTVfV1JJVEUoYXV4X2N0bF9yZWcsIHZhbCk7 CiAJfSBlbHNlIHsKIAkJSTkxNV9XUklURShhdXhfY3RsX3JlZywKQEAgLTIzMiw2ICsyNTMsNyBA QCBzdGF0aWMgdm9pZCBoc3dfcHNyX2VuYWJsZV9zb3VyY2Uoc3RydWN0IGludGVsX2RwICppbnRl bF9kcCkKIAlzdHJ1Y3QgaW50ZWxfZGlnaXRhbF9wb3J0ICpkaWdfcG9ydCA9IGRwX3RvX2RpZ19w b3J0KGludGVsX2RwKTsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gZGlnX3BvcnQtPmJhc2Uu YmFzZS5kZXY7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZf cHJpdmF0ZTsKKwogCXVpbnQzMl90IG1heF9zbGVlcF90aW1lID0gMHgxZjsKIAkvKiBMYXRlbHkg aXQgd2FzIGlkZW50aWZpZWQgdGhhdCBkZXBlbmRpbmcgb24gcGFuZWwgaWRsZSBmcmFtZSBjb3Vu dAogCSAqIGNhbGN1bGF0ZWQgYXQgSFcgY2FuIGJlIG9mZiBieSAxLiBTbyBsZXQncyB1c2Ugd2hh dCBjYW1lCkBAIC0yNTUsNiArMjc3LDEwIEBAIHN0YXRpYyB2b2lkIGhzd19wc3JfZW5hYmxlX3Nv dXJjZShzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwKQogCQkgICBtYXhfc2xlZXBfdGltZSA8PCBF RFBfUFNSX01BWF9TTEVFUF9USU1FX1NISUZUIHwKIAkJICAgaWRsZV9mcmFtZXMgPDwgRURQX1BT Ul9JRExFX0ZSQU1FX1NISUZUIHwKIAkJICAgRURQX1BTUl9FTkFCTEUpOworCisJaWYgKGRldl9w cml2LT5wc3IucHNyMl9zdXBwb3J0KQorCQlJOTE1X1dSSVRFKEVEUF9QU1IyX0NUTCwgRURQX1BT UjJfRU5BQkxFIHwKKwkJCQlFRFBfU1VfVFJBQ0tfRU5BQkxFIHwgRURQX1BTUjJfVFAyX1RJTUVf MTAwKTsKIH0KIAogc3RhdGljIGJvb2wgaW50ZWxfcHNyX21hdGNoX2NvbmRpdGlvbnMoc3RydWN0 IGludGVsX2RwICppbnRlbF9kcCkKQEAgLTMzMiw2ICszNTgsNyBAQCB2b2lkIGludGVsX3Bzcl9l bmFibGUoc3RydWN0IGludGVsX2RwICppbnRlbF9kcCkKIAlzdHJ1Y3QgaW50ZWxfZGlnaXRhbF9w b3J0ICppbnRlbF9kaWdfcG9ydCA9IGRwX3RvX2RpZ19wb3J0KGludGVsX2RwKTsKIAlzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2ID0gaW50ZWxfZGlnX3BvcnQtPmJhc2UuYmFzZS5kZXY7CiAJc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKKwlzdHJ1Y3Qg aW50ZWxfY3J0YyAqY3J0YyA9IHRvX2ludGVsX2NydGMoaW50ZWxfZGlnX3BvcnQtPmJhc2UuYmFz ZS5jcnRjKTsKIAogCWlmICghSEFTX1BTUihkZXYpKSB7CiAJCURSTV9ERUJVR19LTVMoIlBTUiBu b3Qgc3VwcG9ydGVkIG9uIHRoaXMgcGxhdGZvcm1cbiIpOwpAQCAtMzY0LDYgKzM5MSwxNSBAQCB2 b2lkIGludGVsX3Bzcl9lbmFibGUoc3RydWN0IGludGVsX2RwICppbnRlbF9kcCkKIAlpZiAoSEFT X0RESShkZXYpKSB7CiAJCWhzd19wc3Jfc2V0dXBfdnNjKGludGVsX2RwKTsKIAorCQlpZiAoZGV2 X3ByaXYtPnBzci5wc3IyX3N1cHBvcnQpIHsKKwkJCS8qIFBTUjIgaXMgcmVzdHJpY3RlZCB0byB3 b3JrIHdpdGggcGFuZWwgcmVzb2x1dGlvbnMgdXB0byAzMjAweDIwMDAgKi8KKwkJCWlmIChjcnRj LT5jb25maWctPnBpcGVfc3JjX3cgPiAzMjAwIHx8CisJCQkJY3J0Yy0+Y29uZmlnLT5waXBlX3Ny Y19oID4gMjAwMCkKKwkJCQlkZXZfcHJpdi0+cHNyLnBzcjJfc3VwcG9ydCA9IGZhbHNlOworCQkJ ZWxzZQorCQkJCXNrbF9wc3Jfc2V0dXBfc3VfdnNjKGludGVsX2RwKTsKKwkJfQorCiAJCS8qIEF2 b2lkIGNvbnRpbnVvdXMgUFNSIGV4aXQgYnkgbWFza2luZyBtZW11cCBhbmQgaHBkICovCiAJCUk5 MTVfV1JJVEUoRURQX1BTUl9ERUJVR19DVEwoZGV2KSwgRURQX1BTUl9ERUJVR19NQVNLX01FTVVQ IHwKIAkJCSAgIEVEUF9QU1JfREVCVUdfTUFTS19IUEQgfCBFRFBfUFNSX0RFQlVHX01BU0tfTFBT UCk7Ci0tIAoxLjcuMTAuNAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0 b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRl bC1nZngK