From: Rodrigo Vivi Subject: [PATCH 12/12] drm/i915/psr: Use more PSR HW tracking. Date: Wed, 12 Jul 2017 12:20:42 -0700 Message-ID: <20170712192042.19782-13-rodrigo.vivi@intel.com> References: <20170712192042.19782-1-rodrigo.vivi@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id B2B8A6E4D3 for ; Wed, 12 Jul 2017 19:20:43 +0000 (UTC) In-Reply-To: <20170712192042.19782-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 U28gZmFyIHdlIGFyZSB1c2luZyBmcm9udGJ1ZmZlciB0cmFja2luZyBmb3IgZXZlcnl0aGluZwph bmQgaWdub3JpbmcgdGhhdCBQU1IgaGFzIGEgSFcgY2FwYWJsZSBIVyB0cmFja2luZyBmb3IgbWFu eQptb2Rlcm4gdXNhZ2VzIG9mIEdQVSBvbiBDb3JlIHBsYXRmb3JtcyBhbmQgbmV3ZXIgQXRvbSBv bmVzLgoKT25lIHJlYXNvbiBmb3IgdGhhdCBpcyB0aGF0IHdlIHdlcmUgdHJ5aW5nIHRvIGtlZXAg c2FtZQppbmZyYXN0cnVjdHVyZSBpbiBwbGFjZSBmb3IgVkxWL0NIViB0aGFuIHRoZSByZXN0IG9m IHBsYXRmb3Jtcy4KQnV0IGFsc28gYmVjYXVzZSB3aGVuIHRoaXMgaW5mcmFzdHJ1Y3R1cmUgd2Fz IGNyZWF0ZWQKdGhlIGZyb250LWJ1ZmZlci10cmFja2luZyBvcmlnaW4gd2Fzbid0IHRoYXQgZ29v ZCBhbmQgc3RhYmxlCmhvdyBpdCBpcyB0b2RheSBhZnRlciBQYXVsbyByZXdvcmtlZCBpdCB0byBh dHRlbmQgRkJDIGNhc2VzLgoKSG93ZXZlciB0aGlzIFBTUiBpbXBsZW1lbnRhdGlvbiB3aXRob3V0 IEhXIHRyYWNraW5nIGRpZWQKb24gZ2VuOExQLiBBbmQgbmV3ZXIgcGxhdGZvcm1zIGFyZSBzdGFy dGluZyB0byBkZW1hbmQgbW9yZSBIVwp0cmFja2luZyBzcGVjaWFsbHkgd2l0aCBQU1IyIGNhc2Vz IGluIG1pbmQuCgpCeSBkaXNhYmxpbmcgYW5kIHJlLWVuYWJsaW5nIFBTUiB0b3RhbGx5IGV2ZXJ5 IHRpbWUgd2UgYmVsaWV2ZQpzb21lb25lIGlzIGdvaW5nIHRvIGNoYW5nZSB0aGUgZnJvbnQgYnVm ZmVyIGNvbnRlbnQgd2UgZG9uJ3QKYWxsb3cgUFNSIEhXIHRyYWNraW5nIHRvIGRvIHRoaXMgam9i IGFuZCBzcGVjaWFsbHkgY29tcHJvbWlzaW5nCnRoZSB3aG9sZSBpZGVhIG9mIFBTUjIgY2FzZSB3 aGVyZSB0aGUgSFcgdHJhY2tpbmcgZGV0ZWN0IG9ubHkKdGhlIGRhbWFnZWQgYXJlYSBhbmQgZG8g YSBwYXJ0aWFsIHNjcmVlbiB1cGRhdGUuCgpTbywgZnJvbSBub3cgb24sIG9uIHRoZSBwbGF0Zm9y bXMgdGhhdCBoYXMgaHdfdHJhY2tpbmcgbGV0J3MKcmVseSBtb3JlIG9uIEhXIHRyYWNraW5nLgoK VGhpcyBhbHNvIGlzIHRoZSBjYXNlIGluIHVzZWQgYnkgb3RoZXIgZHJpdmVycyBhbmQgbW9yZSB2 YWxpZGF0ZWQKYnkgU1YgdGVhbXMuIFNvIEkgaG9wZSB0aGF0IHRoaXMgd2lsbCBsZWFkIHVzIHRv IGxlc3MgbWlzdGVyaW91cwpidWdzLgoKdjI6IE9ubHkgZG8gdGhpcyBmb3IgcGxhdGZvcm0gdGhh dCBhY3R1YWxseSBoYXMgaHcgdHJhY2tpbmcuCgpDYzogRGhpbmFrYXJhbiBQYW5kaXlhbiA8ZGhp bmFrYXJhbi5wYW5kaXlhbkBpbnRlbC5jb20+CkNjOiBKaW0gQnJpZGUgPGppbS5icmlkZUBsaW51 eC5pbnRlbC5jb20+CkNjOiBWYXRoc2FsYSBOQWdhcmFqdSA8dmF0aHNhbGEubmFnYXJhanVAaW50 ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBSb2RyaWdvIFZpdmkgPHJvZHJpZ28udml2aUBpbnRlbC5j b20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgICAgICB8ICAxICsK IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oICAgICAgICAgfCAgMyArKy0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Zyb250YnVmZmVyLmMgfCAgMiArLQogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfcHNyLmMgICAgICAgICB8IDEyICsrKysrKysrKysrLQogNCBmaWxlcyBj aGFuZ2VkLCAxNSBpbnNlcnRpb25zKCspLCAzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2Rydi5oCmluZGV4IDZhNGQ5NzNlN2ZlOS4uYThjM2EzMTUxMjc1IDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZHJ2LmgKQEAgLTExNDUsNiArMTE0NSw3IEBAIHN0cnVjdCBpOTE1X3BzciB7CiAJYm9vbCB5 X2NvcmRfc3VwcG9ydDsKIAlib29sIGNvbG9yaW1ldHJ5X3N1cHBvcnQ7CiAJYm9vbCBhbHBtOwor CWJvb2wgaGFzX2h3X3RyYWNraW5nOwogCiAJdm9pZCAoKmVuYWJsZV9zb3VyY2UpKHN0cnVjdCBp bnRlbF9kcCAqKTsKIAl2b2lkICgqZGlzYWJsZV9zb3VyY2UpKHN0cnVjdCBpbnRlbF9kcCAqKTsK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKaW5kZXggZDE3YTMyNDM3ZjA3Li4wZmY1YjE3NDFiOTgg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCkBAIC0xNzM4LDcgKzE3MzgsOCBAQCBzdGF0aWMg aW5saW5lIHZvaWQgaW50ZWxfYmFja2xpZ2h0X2RldmljZV91bnJlZ2lzdGVyKHN0cnVjdCBpbnRl bF9jb25uZWN0b3IgKmNvbgogdm9pZCBpbnRlbF9wc3JfZW5hYmxlKHN0cnVjdCBpbnRlbF9kcCAq aW50ZWxfZHApOwogdm9pZCBpbnRlbF9wc3JfZGlzYWJsZShzdHJ1Y3QgaW50ZWxfZHAgKmludGVs X2RwKTsKIHZvaWQgaW50ZWxfcHNyX2ludmFsaWRhdGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2LAotCQkJICB1bnNpZ25lZCBmcm9udGJ1ZmZlcl9iaXRzKTsKKwkJCSAgdW5zaWdu ZWQgZnJvbnRidWZmZXJfYml0cywKKwkJCSAgZW51bSBmYl9vcF9vcmlnaW4gb3JpZ2luKTsKIHZv aWQgaW50ZWxfcHNyX2ZsdXNoKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJ ICAgICB1bnNpZ25lZCBmcm9udGJ1ZmZlcl9iaXRzLAogCQkgICAgIGVudW0gZmJfb3Bfb3JpZ2lu IG9yaWdpbik7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9mcm9udGJ1 ZmZlci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZnJvbnRidWZmZXIuYwppbmRleCBm Y2ZjMjE3ZTc1NGUuLmVmZGExYWY5YTViMyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZnJvbnRidWZmZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9m cm9udGJ1ZmZlci5jCkBAIC03OSw3ICs3OSw3IEBAIHZvaWQgX19pbnRlbF9mYl9vYmpfaW52YWxp ZGF0ZShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqLAogCQlzcGluX3VubG9jaygmZGV2 X3ByaXYtPmZiX3RyYWNraW5nLmxvY2spOwogCX0KIAotCWludGVsX3Bzcl9pbnZhbGlkYXRlKGRl dl9wcml2LCBmcm9udGJ1ZmZlcl9iaXRzKTsKKwlpbnRlbF9wc3JfaW52YWxpZGF0ZShkZXZfcHJp diwgZnJvbnRidWZmZXJfYml0cywgb3JpZ2luKTsKIAlpbnRlbF9lZHBfZHJyc19pbnZhbGlkYXRl KGRldl9wcml2LCBmcm9udGJ1ZmZlcl9iaXRzKTsKIAlpbnRlbF9mYmNfaW52YWxpZGF0ZShkZXZf cHJpdiwgZnJvbnRidWZmZXJfYml0cywgb3JpZ2luKTsKIH0KZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3Bzci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcHNy LmMKaW5kZXggZjRjZWRhNmQ2ZmQzLi41MDAzNWYyNGM2M2YgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3Bzci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3Bzci5jCkBAIC04MzUsNiArODM1LDcgQEAgdm9pZCBpbnRlbF9wc3Jfc2luZ2xlX2ZyYW1lX3Vw ZGF0ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAgKiBpbnRlbF9wc3JfaW52 YWxpZGF0ZSAtIEludmFsaWRhZGUgUFNSCiAgKiBAZGV2X3ByaXY6IGk5MTUgZGV2aWNlCiAgKiBA ZnJvbnRidWZmZXJfYml0czogZnJvbnRidWZmZXIgcGxhbmUgdHJhY2tpbmcgYml0cworICogQG9y aWdpbjogd2hpY2ggb3BlcmF0aW9uIGNhdXNlZCB0aGUgaW52YWxpZGF0ZWQKICAqCiAgKiBTaW5j ZSB0aGUgaGFyZHdhcmUgZnJvbnRidWZmZXIgdHJhY2tpbmcgaGFzIGdhcHMgd2UgbmVlZCB0byBp bnRlZ3JhdGUKICAqIHdpdGggdGhlIHNvZnR3YXJlIGZyb250YnVmZmVyIHRyYWNraW5nLiBUaGlz IGZ1bmN0aW9uIGdldHMgY2FsbGVkIGV2ZXJ5CkBAIC04NDQsNyArODQ1LDcgQEAgdm9pZCBpbnRl bF9wc3Jfc2luZ2xlX2ZyYW1lX3VwZGF0ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYsCiAgKiBEaXJ0eSBmcm9udGJ1ZmZlcnMgcmVsZXZhbnQgdG8gUFNSIGFyZSB0cmFja2VkIGlu IGJ1c3lfZnJvbnRidWZmZXJfYml0cy4iCiAgKi8KIHZvaWQgaW50ZWxfcHNyX2ludmFsaWRhdGUo c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAotCQkJICB1bnNpZ25lZCBmcm9udGJ1 ZmZlcl9iaXRzKQorCQkJICB1bnNpZ25lZCBmcm9udGJ1ZmZlcl9iaXRzLCBlbnVtIGZiX29wX29y aWdpbiBvcmlnaW4pCiB7CiAJc3RydWN0IGRybV9jcnRjICpjcnRjOwogCWVudW0gcGlwZSBwaXBl OwpAQCAtODUyLDYgKzg1MywxMCBAQCB2b2lkIGludGVsX3Bzcl9pbnZhbGlkYXRlKHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAlpZiAoIUhBU19QU1IoZGV2X3ByaXYpKQogCQly ZXR1cm47CiAKKwlpZiAoZGV2X3ByaXYtPnBzci5oYXNfaHdfdHJhY2tpbmcgJiYKKwkgICAgKG9y aWdpbiA9PSBPUklHSU5fRkxJUCB8fCBvcmlnaW4gPT0gT1JJR0lOX0NTKSkKKwkJcmV0dXJuOwor CiAJbXV0ZXhfbG9jaygmZGV2X3ByaXYtPnBzci5sb2NrKTsKIAlpZiAoIWRldl9wcml2LT5wc3Iu ZW5hYmxlZCkgewogCQltdXRleF91bmxvY2soJmRldl9wcml2LT5wc3IubG9jayk7CkBAIC04OTIs NiArODk3LDEwIEBAIHZvaWQgaW50ZWxfcHNyX2ZsdXNoKHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdiwKIAlpZiAoIUhBU19QU1IoZGV2X3ByaXYpKQogCQlyZXR1cm47CiAKKwlpZiAo ZGV2X3ByaXYtPnBzci5oYXNfaHdfdHJhY2tpbmcgJiYKKwkgICAgKG9yaWdpbiA9PSBPUklHSU5f RkxJUCB8fCBvcmlnaW4gPT0gT1JJR0lOX0NTKSkKKwkJcmV0dXJuOworCiAJbXV0ZXhfbG9jaygm ZGV2X3ByaXYtPnBzci5sb2NrKTsKIAlpZiAoIWRldl9wcml2LT5wc3IuZW5hYmxlZCkgewogCQlt dXRleF91bmxvY2soJmRldl9wcml2LT5wc3IubG9jayk7CkBAIC05NjUsNiArOTc0LDcgQEAgdm9p ZCBpbnRlbF9wc3JfaW5pdChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJCWRl dl9wcml2LT5wc3IuYWN0aXZhdGUgPSB2bHZfcHNyX2FjdGl2YXRlOwogCQlkZXZfcHJpdi0+cHNy LnNldHVwX3ZzYyA9IHZsdl9wc3Jfc2V0dXBfdnNjOwogCX0gZWxzZSB7CisJCWRldl9wcml2LT5w c3IuaGFzX2h3X3RyYWNraW5nID0gdHJ1ZTsKIAkJZGV2X3ByaXYtPnBzci5lbmFibGVfc291cmNl ID0gaHN3X3Bzcl9lbmFibGVfc291cmNlOwogCQlkZXZfcHJpdi0+cHNyLmRpc2FibGVfc291cmNl ID0gaHN3X3Bzcl9kaXNhYmxlOwogCQlkZXZfcHJpdi0+cHNyLmVuYWJsZV9zaW5rID0gaHN3X3Bz cl9lbmFibGVfc2luazsKLS0gCjIuMTMuMgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMu ZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlz dGluZm8vaW50ZWwtZ2Z4Cg==