From: Imre Deak Subject: [PATCH v2] drm/i915: gen4: work around hang during hibernation Date: Mon, 2 Mar 2015 13:04:41 +0200 Message-ID: <1425294281-7297-1-git-send-email-imre.deak@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: 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: Jani Nikula , Daniel Vetter , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, =?UTF-8?q?Bj=C3=B8rn=20Mork?= List-Id: dri-devel@lists.freedesktop.org QmrDuHJuIHJlcG9ydGVkIHRoYXQgaGlzIG1hY2hpbmUgaGFuZyBkdXJpbmcgaGliZXJuYXRpb24g YW5kIGV2ZW50dWFsbHkKYmlzZWN0ZWQgdGhlIHByb2JsZW0gdG8gdGhlIGZvbGxvd2luZyBjb21t aXQ6Cgpjb21taXQgZGEyYmMxYjlkYjMzNTFhZGRkMjkzZTViODI3NTdlZmUxZjc3ZWQxZApBdXRo b3I6IEltcmUgRGVhayA8aW1yZS5kZWFrQGludGVsLmNvbT4KRGF0ZTogICBUaHUgT2N0IDIzIDE5 OjIzOjI2IDIwMTQgKzAzMDAKCiAgICBkcm0vaTkxNTogYWRkIHBvd2Vyb2ZmX2xhdGUgaGFuZGxl cgoKVGhlIHByb2JsZW0gc2VlbXMgdG8gYmUgdGhhdCBhZnRlciB0aGUga2VybmVsIHB1dHMgdGhl IGRldmljZSBpbnRvIEQzCnRoZSBCSU9TIHN0aWxsIHRyaWVzIHRvIGFjY2VzcyBpdCwgb3Igb3Ro ZXJ3aXNlIGFzc3VtZXMgdGhhdCBpdCdzIGluIEQwLgpUaGlzIGlzIGNsZWFybHkgYm9ndXMsIHNp bmNlIEFDUEkgbWFuZGF0ZXMgdGhhdCBkZXZpY2VzIGFyZSBwdXQgaW50byBEMwpieSB0aGUgT1NQ TSBpZiB0aGV5IGFyZSBub3Qgd2FrZS11cCBzb3VyY2VzLiBJbiB0aGUgZnV0dXJlIHdlIHdhbnQg dG8KdW5pZnkgbW9yZSBvZiB0aGUgZHJpdmVyJ3MgcnVudGltZSBhbmQgc3lzdGVtIHN1c3BlbmQg cGF0aHMsIGZvciBleGFtcGxlCmJ5IHNraXBwaW5nIGFsbCB0aGUgc3lzdGVtIHN1c3BlbmQvaGli ZXJuYXRpb24gaG9va3MgaWYgdGhlIGRldmljZSBpcwpydW50aW1lIHN1c3BlbmRlZCBhbHJlYWR5 LiBBY2NvcmRpbmdseSBmb3IgYWxsIG90aGVyIHBsYXRmb3JtcyB0aGUgZ29hbAppcyBzdGlsbCB0 byBwcm9wZXJseSBwb3dlciBkb3duIHRoZSBkZXZpY2UgZHVyaW5nIGhpYmVybmF0aW9uLgoKdjI6 Ci0gQW5vdGhlciBHRU40IExlbm92byBsYXB0b3AgaGFkIHRoZSBzYW1lIGlzc3VlLCB3aGlsZSBw bGF0Zm9ybXMgZnJvbQogIG90aGVyIHZlbmRvcnMgKGluY2x1ZGluZyBtb2JpbGUgYW5kIGRlc2t0 b3AsIEdFTjQgYW5kIG5vbi1HRU40KSBzZWVtCiAgdG8gd29yayBmaW5lLiBCYXNlZCBvbiB0aGlz IGFwcGx5IHRoZSB3b3JrYXJvdW5kIG9uIGFsbCBHRU40IExlbm92bwogIHBsYXRmb3Jtcy4KLSBh ZGQgY29kZSBjb21tZW50IGFib3V0IGZhaWxpbmcgcGxhdGZvcm1zIChWaWxsZSkKClJlZmVyZW5j ZTogaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9hcmNoaXZlcy9pbnRlbC1nZngvMjAxNS1G ZWJydWFyeS8wNjA2MzMuaHRtbApSZXBvcnRlZC1hbmQtYmlzZWN0ZWQtYnk6IEJqw7hybiBNb3Jr IDxiam9ybkBtb3JrLm5vPgpTaWduZWQtb2ZmLWJ5OiBJbXJlIERlYWsgPGltcmUuZGVha0BpbnRl bC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYyB8IDMwICsrKysrKysr KysrKysrKysrKysrKysrKystLS0tLQogMSBmaWxlIGNoYW5nZWQsIDI1IGluc2VydGlvbnMoKyks IDUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k cnYuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKaW5kZXggNGJhZGIyMy4uZmYz NjYyZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYworKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCkBAIC02MzcsNyArNjM3LDcgQEAgc3RhdGlj IGludCBpOTE1X2RybV9zdXNwZW5kKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJcmV0dXJuIDA7 CiB9CiAKLXN0YXRpYyBpbnQgaTkxNV9kcm1fc3VzcGVuZF9sYXRlKHN0cnVjdCBkcm1fZGV2aWNl ICpkcm1fZGV2KQorc3RhdGljIGludCBpOTE1X2RybV9zdXNwZW5kX2xhdGUoc3RydWN0IGRybV9k ZXZpY2UgKmRybV9kZXYsIGJvb2wgaGliZXJuYXRpb24pCiB7CiAJc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2ID0gZHJtX2Rldi0+ZGV2X3ByaXZhdGU7CiAJaW50IHJldDsKQEAgLTY1 MSw3ICs2NTEsMTcgQEAgc3RhdGljIGludCBpOTE1X2RybV9zdXNwZW5kX2xhdGUoc3RydWN0IGRy bV9kZXZpY2UgKmRybV9kZXYpCiAJfQogCiAJcGNpX2Rpc2FibGVfZGV2aWNlKGRybV9kZXYtPnBk ZXYpOwotCXBjaV9zZXRfcG93ZXJfc3RhdGUoZHJtX2Rldi0+cGRldiwgUENJX0QzaG90KTsKKwkv KgorCSAqIER1cmluZyBoaWJlcm5hdGlvbiBvbiBzb21lIEdFTjQgcGxhdGZvcm1zIHRoZSBCSU9T IG1heSB0cnkgdG8gYWNjZXNzCisJICogdGhlIGRldmljZSBldmVuIHRob3VnaCBpdCdzIGFscmVh ZHkgaW4gRDMgYW5kIGhhbmcgdGhlIG1hY2hpbmUuIFNvCisJICogbGVhdmUgdGhlIGRldmljZSBp biBEMCBvbiB0aG9zZSBwbGF0Zm9ybXMgYW5kIGhvcGUgdGhlIEJJT1Mgd2lsbAorCSAqIHBvd2Vy IGRvd24gdGhlIGRldmljZSBwcm9wZXJseS4gUGxhdGZvcm1zIHdoZXJlIHRoaXMgd2FzIHNlZW46 CisJICogTGVub3ZvIFRoaW5rcGFkIFgzMDEsIFg2MXMKKwkgKi8KKwlpZiAoIShoaWJlcm5hdGlv biAmJgorCSAgICAgIGRybV9kZXYtPnBkZXYtPnN1YnN5c3RlbV92ZW5kb3IgPT0gUENJX1ZFTkRP Ul9JRF9MRU5PVk8gJiYKKwkgICAgICBJTlRFTF9JTkZPKGRldl9wcml2KS0+Z2VuID09IDQpKQor CQlwY2lfc2V0X3Bvd2VyX3N0YXRlKGRybV9kZXYtPnBkZXYsIFBDSV9EM2hvdCk7CiAKIAlyZXR1 cm4gMDsKIH0KQEAgLTY3Nyw3ICs2ODcsNyBAQCBpbnQgaTkxNV9zdXNwZW5kX2xlZ2FjeShzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2LCBwbV9tZXNzYWdlX3Qgc3RhdGUpCiAJaWYgKGVycm9yKQogCQly ZXR1cm4gZXJyb3I7CiAKLQlyZXR1cm4gaTkxNV9kcm1fc3VzcGVuZF9sYXRlKGRldik7CisJcmV0 dXJuIGk5MTVfZHJtX3N1c3BlbmRfbGF0ZShkZXYsIGZhbHNlKTsKIH0KIAogc3RhdGljIGludCBp OTE1X2RybV9yZXN1bWUoc3RydWN0IGRybV9kZXZpY2UgKmRldikKQEAgLTk2NSw3ICs5NzUsMTcg QEAgc3RhdGljIGludCBpOTE1X3BtX3N1c3BlbmRfbGF0ZShzdHJ1Y3QgZGV2aWNlICpkZXYpCiAJ aWYgKGRybV9kZXYtPnN3aXRjaF9wb3dlcl9zdGF0ZSA9PSBEUk1fU1dJVENIX1BPV0VSX09GRikK IAkJcmV0dXJuIDA7CiAKLQlyZXR1cm4gaTkxNV9kcm1fc3VzcGVuZF9sYXRlKGRybV9kZXYpOwor CXJldHVybiBpOTE1X2RybV9zdXNwZW5kX2xhdGUoZHJtX2RldiwgZmFsc2UpOworfQorCitzdGF0 aWMgaW50IGk5MTVfcG1fcG93ZXJvZmZfbGF0ZShzdHJ1Y3QgZGV2aWNlICpkZXYpCit7CisJc3Ry dWN0IGRybV9kZXZpY2UgKmRybV9kZXYgPSBkZXZfdG9faTkxNShkZXYpLT5kZXY7CisKKwlpZiAo ZHJtX2Rldi0+c3dpdGNoX3Bvd2VyX3N0YXRlID09IERSTV9TV0lUQ0hfUE9XRVJfT0ZGKQorCQly ZXR1cm4gMDsKKworCXJldHVybiBpOTE1X2RybV9zdXNwZW5kX2xhdGUoZHJtX2RldiwgdHJ1ZSk7 CiB9CiAKIHN0YXRpYyBpbnQgaTkxNV9wbV9yZXN1bWVfZWFybHkoc3RydWN0IGRldmljZSAqZGV2 KQpAQCAtMTUzNSw3ICsxNTU1LDcgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBkZXZfcG1fb3BzIGk5 MTVfcG1fb3BzID0gewogCS50aGF3X2Vhcmx5ID0gaTkxNV9wbV9yZXN1bWVfZWFybHksCiAJLnRo YXcgPSBpOTE1X3BtX3Jlc3VtZSwKIAkucG93ZXJvZmYgPSBpOTE1X3BtX3N1c3BlbmQsCi0JLnBv d2Vyb2ZmX2xhdGUgPSBpOTE1X3BtX3N1c3BlbmRfbGF0ZSwKKwkucG93ZXJvZmZfbGF0ZSA9IGk5 MTVfcG1fcG93ZXJvZmZfbGF0ZSwKIAkucmVzdG9yZV9lYXJseSA9IGk5MTVfcG1fcmVzdW1lX2Vh cmx5LAogCS5yZXN0b3JlID0gaTkxNV9wbV9yZXN1bWUsCiAKLS0gCjIuMS4wCgpfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBs aXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNr dG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=