From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH 05/18] drm/i915: Only sanitize GEM from late suspend Date: Fri, 25 May 2018 10:31:53 +0100 Message-ID: <20180525093206.1919-6-chris@chris-wilson.co.uk> References: <20180525093206.1919-1-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from fireflyinternet.com (mail.fireflyinternet.com [109.228.58.192]) by gabe.freedesktop.org (Postfix) with ESMTPS id A309A6E8F8 for ; Fri, 25 May 2018 09:32:26 +0000 (UTC) In-Reply-To: <20180525093206.1919-1-chris@chris-wilson.co.uk> 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 List-Id: intel-gfx@lists.freedesktop.org RHVyaW5nIHRlc3Rpbmcgd2UgZW5jb3VudGVyIGEgY29uZmxpY3QgYmV0d2VlbiBTVVNQRU5EX1RF U1RfREVWSUNFUyBhbmQKZGlzYWJsaW5nIHJlc2V0IChnZW1fZWlvL3N1c3BlbmQpLiBUaGlzIHJl c3VsdHMgaW4gdGhlIGRldmljZSBjb250aW51aW5nCm9uIHdpdGhvdXQgYmVpbmcgcmVzZXQsIGJ1 dCBzaW5jZSBpdCBoYXMgZ29uZSB0aHJvdWdoIEhXIHNhbml0aXphdGlvbiB0bwphY2NvdW50IGZv ciB0aGUgc3VzcGVuZC9yZXN1bWUgY3ljbGUsIHdlIGhhdmUgdG8gYXNzdW1lIHRoZSBkZXZpY2Ug aGFzCmJlZW4gcmVzZXQgdG8gaXRzIGRlZmF1bHRzLiBBIHNpbXBsZSB3YXkgYXJvdW5kIHRoaXMg aXMgdG8gc2tpcCB0aGUKc2FuaXRpemUgcGhhc2UgZm9yIFNVU1BFTkRfVEVTVF9ERVZJQ0VTIGJ5 IG1vdmluZyBpdCB0byBzdXNwZW5kLWxhdGUuCgpTaWduZWQtb2ZmLWJ5OiBDaHJpcyBXaWxzb24g PGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2Rydi5jIHwgIDYgKysrKystCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIHwgIDEg KwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyB8IDIwICsrKysrKysrKysrKy0tLS0t LS0tCiAzIGZpbGVzIGNoYW5nZWQsIDE4IGluc2VydGlvbnMoKyksIDkgZGVsZXRpb25zKC0pCgpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZHJ2LmMKaW5kZXggOWQ2YWM3ZjQ0ODEyLi5iZTgxMzdiOTBhNTEgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9kcnYuYwpAQCAtNjM2LDYgKzYzNiw4IEBAIHN0YXRpYyBjb25zdCBz dHJ1Y3QgdmdhX3N3aXRjaGVyb29fY2xpZW50X29wcyBpOTE1X3N3aXRjaGVyb29fb3BzID0gewog CiBzdGF0aWMgdm9pZCBpOTE1X2dlbV9maW5pKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdikKIHsKKwlpOTE1X2dlbV9zdXNwZW5kX2xhdGUoZGV2X3ByaXYpOworCiAJLyogRmx1c2gg YW55IG91dHN0YW5kaW5nIHVucGluX3dvcmsuICovCiAJaTkxNV9nZW1fZHJhaW5fd29ya3F1ZXVl KGRldl9wcml2KTsKIApAQCAtMTYwNSw3ICsxNjA3LDYgQEAgc3RhdGljIGludCBpOTE1X2RybV9z dXNwZW5kKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJb3ByZWdpb25fdGFyZ2V0X3N0YXRlID0g c3VzcGVuZF90b19pZGxlKGRldl9wcml2KSA/IFBDSV9EMSA6IFBDSV9EM2NvbGQ7CiAJaW50ZWxf b3ByZWdpb25fbm90aWZ5X2FkYXB0ZXIoZGV2X3ByaXYsIG9wcmVnaW9uX3RhcmdldF9zdGF0ZSk7 CiAKLQlpbnRlbF91bmNvcmVfc3VzcGVuZChkZXZfcHJpdik7CiAJaW50ZWxfb3ByZWdpb25fdW5y ZWdpc3RlcihkZXZfcHJpdik7CiAKIAlpbnRlbF9mYmRldl9zZXRfc3VzcGVuZChkZXYsIEZCSU5G T19TVEFURV9TVVNQRU5ERUQsIHRydWUpOwpAQCAtMTYyNyw3ICsxNjI4LDEwIEBAIHN0YXRpYyBp bnQgaTkxNV9kcm1fc3VzcGVuZF9sYXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIGJvb2wgaGli ZXJuYXRpb24pCiAKIAlkaXNhYmxlX3JwbV93YWtlcmVmX2Fzc2VydHMoZGV2X3ByaXYpOwogCisJ aTkxNV9nZW1fc3VzcGVuZF9sYXRlKGRldl9wcml2KTsKKwogCWludGVsX2Rpc3BsYXlfc2V0X2lu aXRfcG93ZXIoZGV2X3ByaXYsIGZhbHNlKTsKKwlpbnRlbF91bmNvcmVfc3VzcGVuZChkZXZfcHJp dik7CiAKIAkvKgogCSAqIEluIGNhc2Ugb2YgZmlybXdhcmUgYXNzaXN0ZWQgY29udGV4dCBzYXZl L3Jlc3RvcmUgZG9uJ3QgbWFudWFsbHkKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IDQ4Nzky MmY4OGI3Ni4uNDI1N2ZmYzFiYWUxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTMxNjks NiArMzE2OSw3IEBAIHZvaWQgaTkxNV9nZW1fY2xlYW51cF9lbmdpbmVzKHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdik7CiBpbnQgaTkxNV9nZW1fd2FpdF9mb3JfaWRsZShzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCQkgICB1bnNpZ25lZCBpbnQgZmxhZ3MpOwog aW50IF9fbXVzdF9jaGVjayBpOTE1X2dlbV9zdXNwZW5kKHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdik7Cit2b2lkIGk5MTVfZ2VtX3N1c3BlbmRfbGF0ZShzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYpOwogdm9pZCBpOTE1X2dlbV9yZXN1bWUoc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2KTsKIGludCBpOTE1X2dlbV9mYXVsdChzdHJ1Y3Qgdm1fZmF1bHQg KnZtZik7CiBpbnQgaTkxNV9nZW1fb2JqZWN0X3dhaXQoc3RydWN0IGRybV9pOTE1X2dlbV9vYmpl Y3QgKm9iaiwKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCmluZGV4IDVhN2UwYjM4OGFkMC4uYjA5ODBi MzE4NmU3IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKQEAgLTUwNTEsNiArNTA1MSwxNyBAQCBp bnQgaTkxNV9nZW1fc3VzcGVuZChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJ aWYgKFdBUk5fT04oIWludGVsX2VuZ2luZXNfYXJlX2lkbGUoZGV2X3ByaXYpKSkKIAkJaTkxNV9n ZW1fc2V0X3dlZGdlZChkZXZfcHJpdik7IC8qIG5vIGhvcGUsIGRpc2NhcmQgZXZlcnl0aGluZyAq LwogCisJaW50ZWxfcnVudGltZV9wbV9wdXQoZGV2X3ByaXYpOworCXJldHVybiAwOworCitlcnJf dW5sb2NrOgorCW11dGV4X3VubG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOworCWludGVsX3J1bnRp bWVfcG1fcHV0KGRldl9wcml2KTsKKwlyZXR1cm4gcmV0OworfQorCit2b2lkIGk5MTVfZ2VtX3N1 c3BlbmRfbGF0ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCit7CiAJLyoKIAkg KiBOZWl0aGVyIHRoZSBCSU9TLCBvdXJzZWx2ZXMgb3IgYW55IG90aGVyIGtlcm5lbAogCSAqIGV4 cGVjdHMgdGhlIHN5c3RlbSB0byBiZSBpbiBleGVjbGlzdHMgbW9kZSBvbiBzdGFydHVwLApAQCAt NTA3MCwxNiArNTA4MSw5IEBAIGludCBpOTE1X2dlbV9zdXNwZW5kKHN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdikKIAkgKiBtYWNoaW5lcyBpcyBhIGdvb2QgaWRlYSwgd2UgZG9uJ3Qg LSBqdXN0IGluIGNhc2UgaXQgbGVhdmVzIHRoZQogCSAqIG1hY2hpbmUgaW4gYW4gdW51c2FibGUg Y29uZGl0aW9uLgogCSAqLworCiAJaW50ZWxfdWNfc2FuaXRpemUoZGV2X3ByaXYpOwogCWk5MTVf Z2VtX3Nhbml0aXplKGRldl9wcml2KTsKLQotCWludGVsX3J1bnRpbWVfcG1fcHV0KGRldl9wcml2 KTsKLQlyZXR1cm4gMDsKLQotZXJyX3VubG9jazoKLQltdXRleF91bmxvY2soJmRldi0+c3RydWN0 X211dGV4KTsKLQlpbnRlbF9ydW50aW1lX3BtX3B1dChkZXZfcHJpdik7Ci0JcmV0dXJuIHJldDsK IH0KIAogdm9pZCBpOTE1X2dlbV9yZXN1bWUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUp Ci0tIAoyLjE3LjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9y ZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdm eAo=