From: Imre Deak Subject: [PATCH] drm/i915: Fix hibernation with ACPI S0 target state Date: Thu, 22 Mar 2018 16:36:42 +0200 Message-ID: <20180322143642.26883-1-imre.deak@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1513F6EC3A for ; Thu, 22 Mar 2018 14:37:15 +0000 (UTC) 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: stable@vger.kernel.org, amn-bas@hotmail.com List-Id: intel-gfx@lists.freedesktop.org QWZ0ZXIKCmNvbW1pdCBkZDlmMzFjN2EzODg3OTUwY2JkMGQ0OWViOWQ0M2Y3YTE1MThhMzU2CkF1 dGhvcjogSW1yZSBEZWFrIDxpbXJlLmRlYWtAaW50ZWwuY29tPgpEYXRlOiAgIFdlZCBBdWcgMTYg MTc6NDY6MDcgMjAxNyArMDMwMAoKICAgIGRybS9pOTE1L2dlbjkrOiBTZXQgc2FtZSBwb3dlciBz dGF0ZSBiZWZvcmUgaGliZXJuYXRpb24gaW1hZ2UKICAgIHNhdmUvcmVzdG9yZQoKZHVyaW5nIGhp YmVybmF0aW9uL3N1c3BlbmQgdGhlIHBvd2VyIGRvbWFpbiBmdW5jdGlvbmFsaXR5IGdvdCBkaXNh YmxlZCwKYWZ0ZXIgd2hpY2ggcmVzdW1lIGNvdWxkIGxlYXZlIGl0IGluY29ycmVjdGx5IGRpc2Fi bGVkIGlmIHRoZSBBQ1BJCnRhcmdldCBzdGF0ZSB3YXMgUzAgZHVyaW5nIHN1c3BlbmQgYW5kIGk5 MTUgd2FzIG5vdCBsb2FkZWQgYnkgdGhlIGxvYWRlcgprZXJuZWwuCgpUaGlzIHdhcyBjYXVzZWQg Ynkgbm90IGNvbnNpZGVyaW5nIGlmIHdlIHJlc3VtZWQgZnJvbSBoaWJlcm5hdGlvbiBhcyB0aGUK Y29uZGl0aW9uIGZvciBwb3dlciBkb21haW5zIHJlaW5pdGluZy4KCkZpeCB0aGlzIGJ5IHNpbXBs eSB0cmFja2luZyBpZiB3ZSBzdXNwZW5kZWQgcG93ZXIgZG9tYWlucyBkdXJpbmcgc3lzdGVtCnN1 c3BlbmQgYW5kIHJlaW5pdCBwb3dlciBkb21haW5zIGFjY29yZGluZ2x5IGR1cmluZyByZXN1bWUu IFRoaXMgd2lsbApyZXN1bHQgaW4gcmVpbml0aW5nIHBvd2VyIGRvbWFpbnMgYWx3YXlzIHdoZW4g cmVzdW1pbmcgZnJvbSBoaWJlcm5hdGlvbiwKcmVnYXJkbGVzcyBvZiB0aGUgcGxhdGZvcm0gYW5k IHdoZXRoZXIgb3Igbm90IGk5MTUgaXMgbG9hZGVkIGJ5IHRoZQpsb2FkZXIga2VybmVsLgoKVGhl IHJlYXNvbiB3ZSBkaWRuJ3QgY2F0Y2ggdGhpcyBlYXJsaWVyIGlzIHRoYXQgdGhlIGVuYWJsZWQv ZGlzYWJsZWQKc3RhdGUgb2YgcG93ZXIgZG9tYWlucyBkdXJpbmcgUE1TR19GUkVFWkUvUE1TR19R VUlFU0NFIGlzIHBsYXRmb3JtCmFuZCBrZXJuZWwgY29uZmlnIGRlcGVuZGVudDogb24gbXkgU0tM IHRoZSB0YXJnZXQgc3RhdGUgaXMgUzQKZHVyaW5nIFBNU0dfRlJFRVpFIGFuZCAod2l0aCB0aGUg ZHJpdmVyIGxvYWRlZCBpbiB0aGUgbG9hZGVyIGtlcm5lbCkKUzAgZHVyaW5nIFBNU0dfUVVJRVND RS4gT24gdGhlIHJlcG9ydGVyJ3MgbWFjaGluZSBpdCdzIFMwIGR1cmluZwpQTVNHX0ZSRUVaRSBi dXQgKGNvbnRyYXJ5IHRvIHRoaXMpIHBvd2VyIGRvbWFpbnMgYXJlIG5vdCBpbml0aWFsaXplZApk dXJpbmcgUE1TR19RVUlFU0NFIHNpbmNlIGk5MTUgaXMgbm90IGxvYWRlZCBpbiB0aGUgbG9hZGVy IGtlcm5lbCwgb3IKaXQncyBsb2FkZWQgYnV0IHdpdGhvdXQgdGhlIERNQyBmaXJtd2FyZSBiZWlu ZyBhdmFpbGFibGUuCgpCdWd6aWxsYTogaHR0cHM6Ly9idWdzLmZyZWVkZXNrdG9wLm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTA1MTk2ClJlcG9ydGVkLWFuZC10ZXN0ZWQtYnk6IGFtbi1iYXNAaG90bWFp bC5jb20KRml4ZXM6IGRkOWYzMWM3YTM4OCAoImRybS9pOTE1L2dlbjkrOiBTZXQgc2FtZSBwb3dl ciBzdGF0ZSBiZWZvcmUgaGliZXJuYXRpb24gaW1hZ2Ugc2F2ZS9yZXN0b3JlIikKQ2M6IGFtbi1i YXNAaG90bWFpbC5jb20KQ2M6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5p bnRlbC5jb20+CkNjOiA8c3RhYmxlQHZnZXIua2VybmVsLm9yZz4KU2lnbmVkLW9mZi1ieTogSW1y ZSBEZWFrIDxpbXJlLmRlYWtAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZHJ2LmMgfCAyMiArKysrKysrKysrLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2Rydi5oIHwgIDIgKy0KIDIgZmlsZXMgY2hhbmdlZCwgMTEgaW5zZXJ0aW9ucygrKSwg MTMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k cnYuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKaW5kZXggYTdkMzI3NWY0NWQy Li5mNzA2Y2ZmNGYwMWIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2 LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYwpAQCAtMTYxMiwxNSArMTYx MiwxMiBAQCBzdGF0aWMgaW50IGk5MTVfZHJtX3N1c3BlbmRfbGF0ZShzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2LCBib29sIGhpYmVybmF0aW9uKQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKIAlzdHJ1Y3QgcGNpX2RldiAqcGRldiA9IGRldl9wcml2 LT5kcm0ucGRldjsKLQlib29sIGZ3X2NzcjsKIAlpbnQgcmV0OwogCiAJZGlzYWJsZV9ycG1fd2Fr ZXJlZl9hc3NlcnRzKGRldl9wcml2KTsKIAogCWludGVsX2Rpc3BsYXlfc2V0X2luaXRfcG93ZXIo ZGV2X3ByaXYsIGZhbHNlKTsKIAotCWZ3X2NzciA9ICFJU19HRU45X0xQKGRldl9wcml2KSAmJiAh aGliZXJuYXRpb24gJiYKLQkJc3VzcGVuZF90b19pZGxlKGRldl9wcml2KSAmJiBkZXZfcHJpdi0+ Y3NyLmRtY19wYXlsb2FkOwogCS8qCiAJICogSW4gY2FzZSBvZiBmaXJtd2FyZSBhc3Npc3RlZCBj b250ZXh0IHNhdmUvcmVzdG9yZSBkb24ndCBtYW51YWxseQogCSAqIGRlaW5pdCB0aGUgcG93ZXIg ZG9tYWlucy4gVGhpcyBhbHNvIG1lYW5zIHRoZSBDU1IvRE1DIGZpcm13YXJlIHdpbGwKQEAgLTE2 MjgsOCArMTYyNSwxMSBAQCBzdGF0aWMgaW50IGk5MTVfZHJtX3N1c3BlbmRfbGF0ZShzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2LCBib29sIGhpYmVybmF0aW9uKQogCSAqIGFsc28gZW5hYmxlIGRlZXBl ciBzeXN0ZW0gcG93ZXIgc3RhdGVzIHRoYXQgd291bGQgYmUgYmxvY2tlZCBpZiB0aGUKIAkgKiBm aXJtd2FyZSB3YXMgaW5hY3RpdmUuCiAJICovCi0JaWYgKCFmd19jc3IpCisJaWYgKElTX0dFTjlf TFAoZGV2X3ByaXYpIHx8IGhpYmVybmF0aW9uIHx8ICFzdXNwZW5kX3RvX2lkbGUoZGV2X3ByaXYp IHx8CisJICAgIGRldl9wcml2LT5jc3IuZG1jX3BheWxvYWQgPT0gTlVMTCkgewogCQlpbnRlbF9w b3dlcl9kb21haW5zX3N1c3BlbmQoZGV2X3ByaXYpOworCQlkZXZfcHJpdi0+cG93ZXJfZG9tYWlu c19zdXNwZW5kZWQgPSB0cnVlOworCX0KIAogCXJldCA9IDA7CiAJaWYgKElTX0dFTjlfTFAoZGV2 X3ByaXYpKQpAQCAtMTY0MSw4ICsxNjQxLDEwIEBAIHN0YXRpYyBpbnQgaTkxNV9kcm1fc3VzcGVu ZF9sYXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIGJvb2wgaGliZXJuYXRpb24pCiAKIAlpZiAo cmV0KSB7CiAJCURSTV9FUlJPUigiU3VzcGVuZCBjb21wbGV0ZSBmYWlsZWQ6ICVkXG4iLCByZXQp OwotCQlpZiAoIWZ3X2NzcikKKwkJaWYgKGRldl9wcml2LT5wb3dlcl9kb21haW5zX3N1c3BlbmRl ZCkgewogCQkJaW50ZWxfcG93ZXJfZG9tYWluc19pbml0X2h3KGRldl9wcml2LCB0cnVlKTsKKwkJ CWRldl9wcml2LT5wb3dlcl9kb21haW5zX3N1c3BlbmRlZCA9IGZhbHNlOworCQl9CiAKIAkJZ290 byBvdXQ7CiAJfQpAQCAtMTY2Myw4ICsxNjY1LDYgQEAgc3RhdGljIGludCBpOTE1X2RybV9zdXNw ZW5kX2xhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgYm9vbCBoaWJlcm5hdGlvbikKIAlpZiAo IShoaWJlcm5hdGlvbiAmJiBJTlRFTF9HRU4oZGV2X3ByaXYpIDwgNikpCiAJCXBjaV9zZXRfcG93 ZXJfc3RhdGUocGRldiwgUENJX0QzaG90KTsKIAotCWRldl9wcml2LT5zdXNwZW5kZWRfdG9faWRs ZSA9IHN1c3BlbmRfdG9faWRsZShkZXZfcHJpdik7Ci0KIG91dDoKIAllbmFibGVfcnBtX3dha2Vy ZWZfYXNzZXJ0cyhkZXZfcHJpdik7CiAKQEAgLTE4MzEsOCArMTgzMSw3IEBAIHN0YXRpYyBpbnQg aTkxNV9kcm1fcmVzdW1lX2Vhcmx5KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJaW50ZWxfdW5j b3JlX3Jlc3VtZV9lYXJseShkZXZfcHJpdik7CiAKIAlpZiAoSVNfR0VOOV9MUChkZXZfcHJpdikp IHsKLQkJaWYgKCFkZXZfcHJpdi0+c3VzcGVuZGVkX3RvX2lkbGUpCi0JCQlnZW45X3Nhbml0aXpl X2RjX3N0YXRlKGRldl9wcml2KTsKKwkJZ2VuOV9zYW5pdGl6ZV9kY19zdGF0ZShkZXZfcHJpdik7 CiAJCWJ4dF9kaXNhYmxlX2RjOShkZXZfcHJpdik7CiAJfSBlbHNlIGlmIChJU19IQVNXRUxMKGRl dl9wcml2KSB8fCBJU19CUk9BRFdFTEwoZGV2X3ByaXYpKSB7CiAJCWhzd19kaXNhYmxlX3BjOChk ZXZfcHJpdik7CkBAIC0xODQwLDggKzE4MzksNyBAQCBzdGF0aWMgaW50IGk5MTVfZHJtX3Jlc3Vt ZV9lYXJseShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCiAJaW50ZWxfdW5jb3JlX3Nhbml0aXpl KGRldl9wcml2KTsKIAotCWlmIChJU19HRU45X0xQKGRldl9wcml2KSB8fAotCSAgICAhKGRldl9w cml2LT5zdXNwZW5kZWRfdG9faWRsZSAmJiBkZXZfcHJpdi0+Y3NyLmRtY19wYXlsb2FkKSkKKwlp ZiAoZGV2X3ByaXYtPnBvd2VyX2RvbWFpbnNfc3VzcGVuZGVkKQogCQlpbnRlbF9wb3dlcl9kb21h aW5zX2luaXRfaHcoZGV2X3ByaXYsIHRydWUpOwogCWVsc2UKIAkJaW50ZWxfZGlzcGxheV9zZXRf aW5pdF9wb3dlcihkZXZfcHJpdiwgdHJ1ZSk7CkBAIC0xODUxLDcgKzE4NDksNyBAQCBzdGF0aWMg aW50IGk5MTVfZHJtX3Jlc3VtZV9lYXJseShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCWVuYWJs ZV9ycG1fd2FrZXJlZl9hc3NlcnRzKGRldl9wcml2KTsKIAogb3V0OgotCWRldl9wcml2LT5zdXNw ZW5kZWRfdG9faWRsZSA9IGZhbHNlOworCWRldl9wcml2LT5wb3dlcl9kb21haW5zX3N1c3BlbmRl ZCA9IGZhbHNlOwogCiAJcmV0dXJuIHJldDsKIH0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4 IGM5YzNiMmJhNmE4Ni4uM2FjYzRiYmVjNmIyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAg LTE4NTEsNyArMTg1MSw3IEBAIHN0cnVjdCBkcm1faTkxNV9wcml2YXRlIHsKIAl1MzIgYnh0X3Bo eV9ncmM7CiAKIAl1MzIgc3VzcGVuZF9jb3VudDsKLQlib29sIHN1c3BlbmRlZF90b19pZGxlOwor CWJvb2wgcG93ZXJfZG9tYWluc19zdXNwZW5kZWQ7CiAJc3RydWN0IGk5MTVfc3VzcGVuZF9zYXZl ZF9yZWdpc3RlcnMgcmVnZmlsZTsKIAlzdHJ1Y3Qgdmx2X3MwaXhfc3RhdGUgdmx2X3MwaXhfc3Rh dGU7CiAKLS0gCjIuMTMuMgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0 b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50 ZWwtZ2Z4Cg==