From: Rodrigo Vivi Subject: [PATCH 2/3] drm/i915/psr: Kill scheduled work for Core platforms. Date: Tue, 27 Feb 2018 16:14:09 -0800 Message-ID: <20180228001410.21706-2-rodrigo.vivi@intel.com> References: <20180228001410.21706-1-rodrigo.vivi@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 ESMTPS id 678C26E857 for ; Wed, 28 Feb 2018 00:14:12 +0000 (UTC) In-Reply-To: <20180228001410.21706-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 SXQgaXMgYSBmYWN0IHRoYXQgc2NoZWR1bGVkIHdvcmsgaXMgbm93IGltcHJvdmVkLgoKQnV0IGl0 IGlzIGFsc28gYSBmYWN0IHRoYXQgb24gY29yZSBwbGF0Zm9ybXMgdGhhdCBzaG91bGRuJ3QKYmUg bmVlZGVkLiBXZSBvbmx5IG5lZWQgdG8gYWN0dWFsbHkgd2FpdCBvbiBWTFYvQ0hWLgoKVGhlIGlt bWVkaWF0ZSBlbmFibGluZyBpcyBhY3R1YWxseSBub3QgYW4gaXNzdWUgZm9yIHRoZQpIVyBwZXJz cGVjdGl2ZSBmb3IgY29yZSBwbGF0Zm9ybXMgdGhhdCBoYXZlIEhXIHRyYWNraW5nLgpIVyB3aWxs IHdhaXQgZmV3IGlkZW50aWNhbCBpZGxlIGZyYW1lcyBiZWZvcmUgdHJhbnNpdGlvbmluZwp0byBh Y3R1YWwgcHNyIGFjdGl2ZSBhbnl3YXlzLgoKTm90ZSB0aGF0IHRoaXMgcGF0Y2ggYWxzbyByZW1v dmUgdGhlIGRlbGF5ZWQgYWN0aXZhdGlvbgpvbiBIU1cgYW5kIEJEVyBpbnRyb2R1Y2VkIGJ5IGNv bW1pdCAnZDBhYzg5NmE0NzdkCigiZHJtL2k5MTU6IERlbGF5IGZpcnN0IFBTUiBhY3RpdmF0aW9u LiIpJy4gVGhpcyB3YXMKaW50cm9kdWNlZCB0byBmaXggYSBibGFuayBzY3JlZW4gb24gVkxWL0NI ViBhbmQgYWxzbwptYXNrZWQgc29tZSBmcm96ZW4gc2NyZWVucyBvbiBvdGhlciBjb3JlIHBsYXRm b3Jtcy4KUHJvYmFibHkgdGhlIHNhbWUgdGhhdCB3ZSBhcmUgbm93IHByb3Blcmx5IGh1bnRpbmcg YW5kIGZpeGluZy4KCkZ1cnRoZXJtb3JlLCBpZiB3ZSBzdG9wIHVzaW5nIGRlbGF5ZWQgYWN0aXZh dGlvbiBvbiBjb3JlCnBsYXRmb3JtcyB3ZSB3aWxsIGJlIGFibGUsIG9uIGZvbGxvd2luZyB1cCBw YXRjaGVzLAp0byB1c2UgYXZhaWxhYmxlIHdvcmthcm91bmRzIHRvIG1ha2UgSFcgdHJhY2tpbmcg cHJvcGVybHkKZXhpdCBQU1IgaW5zdGVhZCBvZiB0aGUgYmlnIG51a2Ugb2YgZGlzYWJsaW5nIHBz ciBhbmQKcmUtZW5hYmxlIG9uIGV4aXQgYW5kIGFjdGl2YXRlIHJlc3BlY3RpdmVseS4KQXQgbGVh c3Qgb24gZmV3IHJlbGlhYmxlIGNhc2VzLgoKdjI6KERLKTogUmVtb3ZlIHVubmVjZXNzYXJ5IFdB Uk5fT05zIGFuZCBtYWtlIHNvbWUgb3RoZXIKCSBWTFYgfCBDSFYgbW9yZSByZWFkYWJsZS4KCkNj OiBEaGluYWthcmFuIFBhbmRpeWFuIDxkaGluYWthcmFuLnBhbmRpeWFuQGludGVsLmNvbT4KU2ln bmVkLW9mZi1ieTogUm9kcmlnbyBWaXZpIDxyb2RyaWdvLnZpdmlAaW50ZWwuY29tPgotLS0KIGRy aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jIHwgMjIgKysrKysrKysrKystLS0tLS0t LS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcHNyLmMgICAgfCAyOCArKysrKysrKysr KysrKysrKystLS0tLS0tLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDI5IGluc2VydGlvbnMoKyksIDIx IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVi dWdmcy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKaW5kZXggMWFjOTQy ZDE3NDJlLi5mYjEwNmI0YTNlYWYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZGVidWdmcy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jCkBA IC0yNTczLDE5ICsyNTczLDE0IEBAIHN0YXRpYyBpbnQgaTkxNV9lZHBfcHNyX3N0YXR1cyhzdHJ1 Y3Qgc2VxX2ZpbGUgKm0sIHZvaWQgKmRhdGEpCiAJc2VxX3ByaW50ZihtLCAiQnVzeSBmcm9udGJ1 ZmZlciBiaXRzOiAweCUwM3hcbiIsCiAJCSAgIGRldl9wcml2LT5wc3IuYnVzeV9mcm9udGJ1ZmZl cl9iaXRzKTsKIAotCWlmICh0aW1lcl9wZW5kaW5nKCZkZXZfcHJpdi0+cHNyLmFjdGl2YXRlX3Rp bWVyKSkKLQkJc2VxX3ByaW50ZihtLCAiQWN0aXZhdGUgc2NoZWR1bGVkOiB5ZXMsIGluICVsZG1z XG4iLAotCQkJICAgKGxvbmcpKGRldl9wcml2LT5wc3IuZWFybGllc3RfYWN0aXZhdGUgLSBqaWZm aWVzKSAqCisJaWYgKElTX1ZBTExFWVZJRVcoZGV2X3ByaXYpIHx8IElTX0NIRVJSWVZJRVcoZGV2 X3ByaXYpKSB7CisJCWlmICh0aW1lcl9wZW5kaW5nKCZkZXZfcHJpdi0+cHNyLmFjdGl2YXRlX3Rp bWVyKSkKKwkJCXNlcV9wcmludGYobSwgIkFjdGl2YXRlIHNjaGVkdWxlZDogeWVzLCBpbiAlbGRt c1xuIiwKKwkJCQkgICAobG9uZykoZGV2X3ByaXYtPnBzci5lYXJsaWVzdF9hY3RpdmF0ZSAtIGpp ZmZpZXMpICoKIAkJCSAgIDEwMDAgLyBIWik7Ci0JZWxzZQotCQlzZXFfcHJpbnRmKG0sICJSZS1l bmFibGUgc2NoZWR1bGVkOiBub1xuIik7Ci0KLQlpZiAoSEFTX0RESShkZXZfcHJpdikpIHsKLQkJ aWYgKGRldl9wcml2LT5wc3IucHNyMl9zdXBwb3J0KQotCQkJZW5hYmxlZCA9IEk5MTVfUkVBRChF RFBfUFNSMl9DVEwpICYgRURQX1BTUjJfRU5BQkxFOwogCQllbHNlCi0JCQllbmFibGVkID0gSTkx NV9SRUFEKEVEUF9QU1JfQ1RMKSAmIEVEUF9QU1JfRU5BQkxFOwotCX0gZWxzZSB7CisJCQlzZXFf cHJpbnRmKG0sICJSZS1lbmFibGUgc2NoZWR1bGVkOiBub1xuIik7CisKIAkJZm9yX2VhY2hfcGlw ZShkZXZfcHJpdiwgcGlwZSkgewogCQkJZW51bSB0cmFuc2NvZGVyIGNwdV90cmFuc2NvZGVyID0K IAkJCQlpbnRlbF9waXBlX3RvX2NwdV90cmFuc2NvZGVyKGRldl9wcml2LCBwaXBlKTsKQEAgLTI2 MDQsNiArMjU5OSwxMSBAQCBzdGF0aWMgaW50IGk5MTVfZWRwX3Bzcl9zdGF0dXMoc3RydWN0IHNl cV9maWxlICptLCB2b2lkICpkYXRhKQogCiAJCQlpbnRlbF9kaXNwbGF5X3Bvd2VyX3B1dChkZXZf cHJpdiwgcG93ZXJfZG9tYWluKTsKIAkJfQorCX0gZWxzZSB7CisJCWlmIChkZXZfcHJpdi0+cHNy LnBzcjJfc3VwcG9ydCkKKwkJCWVuYWJsZWQgPSBJOTE1X1JFQUQoRURQX1BTUjJfQ1RMKSAmIEVE UF9QU1IyX0VOQUJMRTsKKwkJZWxzZQorCQkJZW5hYmxlZCA9IEk5MTVfUkVBRChFRFBfUFNSX0NU TCkgJiBFRFBfUFNSX0VOQUJMRTsKIAl9CiAKIAlzZXFfcHJpbnRmKG0sICJNYWluIGxpbmsgaW4g c3RhbmRieSBtb2RlOiAlc1xuIiwKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3Bzci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcHNyLmMKaW5kZXggYzEwZDUy MjVkYzdjLi42ZDQxM2E3YmIzOWYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3Bzci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Bzci5jCkBAIC01NzUs NiArNTc1LDkgQEAgc3RhdGljIHZvaWQgaW50ZWxfcHNyX3NjaGVkdWxlKHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiwKIHsKIAl1bnNpZ25lZCBsb25nIG5leHQ7CiAKKwlpZiAoV0FS Tl9PTighKElTX1ZBTExFWVZJRVcoZGV2X3ByaXYpIHx8IElTX0NIRVJSWVZJRVcoZGV2X3ByaXYp KSkpCisJCXJldHVybjsKKwogCWxvY2tkZXBfYXNzZXJ0X2hlbGQoJmRldl9wcml2LT5wc3IubG9j ayk7CiAKIAkvKgpAQCAtNjY3LDkgKzY3MCw3IEBAIHZvaWQgaW50ZWxfcHNyX2VuYWJsZShzdHJ1 Y3QgaW50ZWxfZHAgKmludGVsX2RwLAogCWRldl9wcml2LT5wc3IuZW5hYmxlX3NvdXJjZShpbnRl bF9kcCwgY3J0Y19zdGF0ZSk7CiAJZGV2X3ByaXYtPnBzci5lbmFibGVkID0gaW50ZWxfZHA7CiAK LQlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA5KSB7Ci0JCWludGVsX3Bzcl9hY3RpdmF0ZShp bnRlbF9kcCk7Ci0JfSBlbHNlIHsKKwlpZiAoSVNfVkFMTEVZVklFVyhkZXZfcHJpdikgfHwgSVNf Q0hFUlJZVklFVyhkZXZfcHJpdikpIHsKIAkJLyoKIAkJICogRklYTUU6IEFjdGl2YXRpb24gc2hv dWxkIGhhcHBlbiBpbW1lZGlhdGVseSBzaW5jZSB0aGlzCiAJCSAqIGZ1bmN0aW9uIGlzIGp1c3Qg Y2FsbGVkIGFmdGVyIHBpcGUgaXMgZnVsbHkgdHJhaW5lZCBhbmQKQEAgLTY3NywxMCArNjc4LDEw IEBAIHZvaWQgaW50ZWxfcHNyX2VuYWJsZShzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwLAogCQkg KiBIb3dldmVyIG9uIHNvbWUgcGxhdGZvcm1zIHdlIGZhY2UgaXNzdWVzIHdoZW4gZmlyc3QKIAkJ ICogYWN0aXZhdGlvbiBmb2xsb3dzIGEgbW9kZXNldCBzbyBxdWlja2x5LgogCQkgKiAgICAgLSBP biBWTFYvQ0hWIHdlIGdldCBiYW5rIHNjcmVlbiBvbiBmaXJzdCBhY3RpdmF0aW9uCi0JCSAqICAg ICAtIE9uIEhTVy9CRFcgd2UgZ2V0IGEgcmVjb3ZlcmFibGUgZnJvemVuIHNjcmVlbiB1bnRpbAot CQkgKiAgICAgICBuZXh0IGV4aXQtYWN0aXZhdGUgc2VxdWVuY2UuCiAJCSAqLwogCQlpbnRlbF9w c3Jfc2NoZWR1bGUoZGV2X3ByaXYsIGludGVsX2RwLT5wYW5lbF9wb3dlcl9jeWNsZV9kZWxheSAq IDUpOworCX0gZWxzZSB7CisJCWludGVsX3Bzcl9hY3RpdmF0ZShpbnRlbF9kcCk7CiAJfQogCiB1 bmxvY2s6CkBAIC0xMDcyLDkgKzEwNzMsMTIgQEAgdm9pZCBpbnRlbF9wc3JfZmx1c2goc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCWlmIChmcm9udGJ1ZmZlcl9iaXRzKQogCQlp bnRlbF9wc3JfZXhpdChkZXZfcHJpdik7CiAKLQlpZiAoIWRldl9wcml2LT5wc3IuYWN0aXZlICYm ICFkZXZfcHJpdi0+cHNyLmJ1c3lfZnJvbnRidWZmZXJfYml0cykKLQkJaW50ZWxfcHNyX3NjaGVk dWxlKGRldl9wcml2LCAxMDApOwotCisJaWYgKCFkZXZfcHJpdi0+cHNyLmFjdGl2ZSAmJiAhZGV2 X3ByaXYtPnBzci5idXN5X2Zyb250YnVmZmVyX2JpdHMpIHsKKwkJaWYgKElTX1ZBTExFWVZJRVco ZGV2X3ByaXYpIHx8IElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpKQorCQkJaW50ZWxfcHNyX3NjaGVk dWxlKGRldl9wcml2LCAxMDApOworCQllbHNlCisJCQlpbnRlbF9wc3JfYWN0aXZhdGUoZGV2X3By aXYtPnBzci5lbmFibGVkKTsKKwl9CiAJbXV0ZXhfdW5sb2NrKCZkZXZfcHJpdi0+cHNyLmxvY2sp OwogfQogCkBAIC0xMTIxLDggKzExMjUsMTIgQEAgdm9pZCBpbnRlbF9wc3JfaW5pdChzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJCWRldl9wcml2LT5wc3IubGlua19zdGFuZGJ5 ID0gZmFsc2U7CiAJfQogCi0JdGltZXJfc2V0dXAoJmRldl9wcml2LT5wc3IuYWN0aXZhdGVfdGlt ZXIsIGludGVsX3Bzcl90aW1lcl9mbiwgMCk7Ci0JSU5JVF9XT1JLKCZkZXZfcHJpdi0+cHNyLmFj dGl2YXRlX3dvcmssIGludGVsX3Bzcl93b3JrKTsKKwlpZiAoSVNfVkFMTEVZVklFVyhkZXZfcHJp dikgfHwgSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpIHsKKwkJdGltZXJfc2V0dXAoJmRldl9wcml2 LT5wc3IuYWN0aXZhdGVfdGltZXIsCisJCQkgICAgaW50ZWxfcHNyX3RpbWVyX2ZuLCAwKTsKKwkJ SU5JVF9XT1JLKCZkZXZfcHJpdi0+cHNyLmFjdGl2YXRlX3dvcmssIGludGVsX3Bzcl93b3JrKTsK Kwl9CisKIAltdXRleF9pbml0KCZkZXZfcHJpdi0+cHNyLmxvY2spOwogCiAJaWYgKElTX1ZBTExF WVZJRVcoZGV2X3ByaXYpIHx8IElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpKSB7Ci0tIAoyLjEzLjYK Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdm eCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xp c3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=