From mboxrd@z Thu Jan 1 00:00:00 1970 From: Imre Deak Subject: Re: [PATCH v2] drm/i915: Mark all objects as having being written to following hibernation Date: Wed, 11 May 2016 17:11:55 +0300 Message-ID: <1462975915.4033.21.camel@intel.com> References: <1461173210-5540-1-git-send-email-chris@chris-wilson.co.uk> <1461178833-8640-1-git-send-email-chris@chris-wilson.co.uk> Reply-To: imre.deak@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 ESMTP id 0646C6E737 for ; Wed, 11 May 2016 14:12:11 +0000 (UTC) In-Reply-To: <1461178833-8640-1-git-send-email-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: Chris Wilson , intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org T24gV2VkLCAyMDE2LTA0LTIwIGF0IDIwOjAwICswMTAwLCBDaHJpcyBXaWxzb24gd3JvdGU6Cj4g RHVyaW5nIGhpYmVybmF0aW9uLCBhbGwgb2JqZWN0cyB3aWxsIGhhdmUgaGFkIHRoZWlyIHBhZ2Ug Y29udGVudHMKPiB3cml0dGVuIHRvIGRpc2sgYW5kIHRoZW4gcmVzdG9yZWQgdXBvbiByZXN1bWUu IFRoaXMgbWVhbnMgdGhhdCBldmVyeQo+IHBhZ2Ugd2lsbCBiZSBkaXJ0eSBhbmQgd2UgbmVlZCB0 byB0cmVhdCBhbGwgb2JqZWN0cyBhcyBiZWluZyBpbiB0aGUgQ1BVCj4gZG9tYWluIGFuZCByZXF1 aXJlIHRoZWlyIGNvbnRlbnRzIHRvIGJlIGZsdXNoZWQgYmVmb3JlIHVzZS4KPiAKPiBBdCBwcmVz ZW50IHdlIG9ubHkgZG8gc28gZm9yIHRob3NlIG9iamVjdHMgYm91bmQgaW50byB0aGUgR2xvYmFs IEdUVCwKPiBob3dldmVyIHdlIG5lZWQgdG8gbWFyayBhbGwgYWxsb2NhdGVkIG9iamVjdHMgYXMg YmVpbmcgdW5jbGVhbi4KPiAKPiB2MjogQWN0dWFsbHkgcmVzdHJpY3QgdGhlIGNsZmx1c2hpbmcg b2Ygb2JqZWN0IGNvbnRlbnQgdG8gcG9zdC1oaWJlcm5hdGUKPiBhcyB3ZSBhbHdheXMgY2FsbCBy ZXN0b3JlX2d0dF9tYXBwaW5ncyBiZWNhdXNlIHdlIGNhbm5vdCB0cnVzdCB0aGUgQklPUwo+IG5v dCB0byBzY3JpYmJsZSBvdmVyIHRoZSBHR1RUIChidXQgd2UgY2FuIGJlIGNvbmZpZGVudCB0aGF0 IHRoZXkgd2lsbAo+IG5vdCB0b3VjaCBzeXN0ZW0gcGFnZXMgaS5lLiBub3JtYWwgc2htZW1mcyBv YmplY3RzKS4KClRoZW4gaXQgc2hvdWxkIGJlIChhbHNvKSBkb25lIGZyb20gdGhlIFBNIHJlc3Rv cmUgaG9vayBhcyB0aGF0J3MgdGhlCm9uZSBjYWxsZWQgZHVyaW5nIHJlc3VtaW5nIGZyb20gaGli ZXJuYXRpb24uIFRoZSB0aGF3IGhvb2sgaXMgY2FsbGVkCnJpZ2h0IGFmdGVyIGNyZWF0aW5nIHRo ZSBoaWJlcm5hdGlvbiBpbWFnZSAoYmVmb3JlIHdyaXRpbmcgaXQgdG8gZGlzayksCnNvIHlvdSds bCBoYXZlIChub3QtZGlydHkpIGNhY2hlZCBkYXRhIGluIHRoYXQgY2FzZSB0b28sIGJ1dCBwcm9j ZXNzZXMKYXJlIGZyZWV6ZWQgc28gbm90aGluZyBzaG91bGQgdXNlIHRoZSBjb3JyZXNwb25kaW5n IG9iamVjdHMuCgpQZXJoYXBzIHRoZSBiZXN0IHdvdWxkIGJlIHRvIG1vdmUgdGhlIG9iamVjdHMg dG8gdGhlIENQVSBkb21haW4gYWxyZWFkeQppbiB0aGUgZnJlZXplIGhvb2sgKGNhbGxlZCByaWdo dCBiZWZvcmUgY3JlYXRpbmcgdGhlIGhpYmVybmF0aW9uIGltYWdlKQphcyB0aGF0IGNvdmVycyBi b3RoIHRoZSBhYm92ZSByZXN0b3JlIGFuZCB0aGF3IGNhc2VzIGFuZCB0aGF0IHdvdWxkCmFsc28g bWFrZSByZXN1bWUgYSBiaXQgZmFzdGVyLgoKLS1JbXJlCgo+IFNpZ25lZC1vZmYtYnk6IENocmlz IFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgo+IC0tLQo+IMKgZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9kcnYuY8KgwqDCoMKgwqB8IDIyICsrKysrKysrKysrKysrKystLS0tLS0K PiDCoGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jIHwgMjkgKysrKysrKysrKysr KysrKysrKysrKy0tLS0tLS0KPiDCoGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5o IHzCoMKgMiArLQo+IMKgMyBmaWxlcyBjaGFuZ2VkLCAzOSBpbnNlcnRpb25zKCspLCAxNCBkZWxl dGlvbnMoLSkKPiAKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYu YyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKPiBpbmRleCA0MDEzMzczY2EyOTMu LjQyNTNjYTFjY2VmZiAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Ry di5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYwo+IEBAIC03MDEsNyAr NzAxLDcgQEAgaW50IGk5MTVfc3VzcGVuZF9zd2l0Y2hlcm9vKHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYsIHBtX21lc3NhZ2VfdCBzdGF0ZSkKPiDCoAlyZXR1cm4gaTkxNV9kcm1fc3VzcGVuZF9sYXRl KGRldiwgZmFsc2UpOwo+IMKgfQo+IMKgCj4gLXN0YXRpYyBpbnQgaTkxNV9kcm1fcmVzdW1lKHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYpCj4gK3N0YXRpYyBpbnQgaTkxNV9kcm1fcmVzdW1lKHN0cnVj dCBkcm1fZGV2aWNlICpkZXYsIGJvb2wgdGhhdykKPiDCoHsKPiDCoAlzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwo+IMKgCj4gQEAgLTcxMCw3ICs3 MTAsNyBAQCBzdGF0aWMgaW50IGk5MTVfZHJtX3Jlc3VtZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 KQo+IMKgCWludGVsX2Nzcl91Y29kZV9yZXN1bWUoZGV2X3ByaXYpOwo+IMKgCj4gwqAJbXV0ZXhf bG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwo+IC0JaTkxNV9nZW1fcmVzdG9yZV9ndHRfbWFwcGlu Z3MoZGV2KTsKPiArCWk5MTVfZ2VtX3Jlc3RvcmVfZ3R0X21hcHBpbmdzKGRldiwgdGhhdyk7Cj4g wqAJbXV0ZXhfdW5sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7Cj4gwqAKPiDCoAlpOTE1X3Jlc3Rv cmVfc3RhdGUoZGV2KTsKPiBAQCAtODY3LDcgKzg2Nyw3IEBAIGludCBpOTE1X3Jlc3VtZV9zd2l0 Y2hlcm9vKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCj4gwqAJaWYgKHJldCkKPiDCoAkJcmV0dXJu IHJldDsKPiDCoAo+IC0JcmV0dXJuIGk5MTVfZHJtX3Jlc3VtZShkZXYpOwo+ICsJcmV0dXJuIGk5 MTVfZHJtX3Jlc3VtZShkZXYsIGZhbHNlKTsKPiDCoH0KPiDCoAo+IMKgLyoqCj4gQEAgLTEwNTQs MTQgKzEwNTQsMjQgQEAgc3RhdGljIGludCBpOTE1X3BtX3Jlc3VtZV9lYXJseShzdHJ1Y3QgZGV2 aWNlICpkZXYpCj4gwqAJcmV0dXJuIGk5MTVfZHJtX3Jlc3VtZV9lYXJseShkcm1fZGV2KTsKPiDC oH0KPiDCoAo+IC1zdGF0aWMgaW50IGk5MTVfcG1fcmVzdW1lKHN0cnVjdCBkZXZpY2UgKmRldikK PiArc3RhdGljIGludCBfX2k5MTVfcG1fcmVzdW1lKHN0cnVjdCBkZXZpY2UgKmRldiwgYm9vbCB0 aGF3KQo+IMKgewo+IMKgCXN0cnVjdCBkcm1fZGV2aWNlICpkcm1fZGV2ID0gZGV2X3RvX2k5MTUo ZGV2KS0+ZGV2Owo+IMKgCj4gwqAJaWYgKGRybV9kZXYtPnN3aXRjaF9wb3dlcl9zdGF0ZSA9PSBE Uk1fU1dJVENIX1BPV0VSX09GRikKPiDCoAkJcmV0dXJuIDA7Cj4gwqAKPiAtCXJldHVybiBpOTE1 X2RybV9yZXN1bWUoZHJtX2Rldik7Cj4gKwlyZXR1cm4gaTkxNV9kcm1fcmVzdW1lKGRybV9kZXYs IHRoYXcpOwo+ICt9Cj4gKwo+ICtzdGF0aWMgaW50IGk5MTVfcG1fcmVzdW1lKHN0cnVjdCBkZXZp Y2UgKmRldikKPiArewo+ICsJcmV0dXJuIF9faTkxNV9wbV9yZXN1bWUoZGV2LCBmYWxzZSk7Cj4g K30KPiArCj4gK3N0YXRpYyBpbnQgaTkxNV9wbV90aGF3KHN0cnVjdCBkZXZpY2UgKmRldikKPiAr ewo+ICsJcmV0dXJuIF9faTkxNV9wbV9yZXN1bWUoZGV2LCB0cnVlKTsKPiDCoH0KPiDCoAo+IMKg c3RhdGljIGludCBoc3dfc3VzcGVuZF9jb21wbGV0ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYpCj4gQEAgLTE2MjgsNyArMTYzOCw3IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgZGV2 X3BtX29wcyBpOTE1X3BtX29wcyA9IHsKPiDCoAkuZnJlZXplID0gaTkxNV9wbV9zdXNwZW5kLAo+ IMKgCS5mcmVlemVfbGF0ZSA9IGk5MTVfcG1fc3VzcGVuZF9sYXRlLAo+IMKgCS50aGF3X2Vhcmx5 ID0gaTkxNV9wbV9yZXN1bWVfZWFybHksCj4gLQkudGhhdyA9IGk5MTVfcG1fcmVzdW1lLAo+ICsJ LnRoYXcgPSBpOTE1X3BtX3RoYXcsCj4gwqAJLnBvd2Vyb2ZmID0gaTkxNV9wbV9zdXNwZW5kLAo+ IMKgCS5wb3dlcm9mZl9sYXRlID0gaTkxNV9wbV9wb3dlcm9mZl9sYXRlLAo+IMKgCS5yZXN0b3Jl X2Vhcmx5ID0gaTkxNV9wbV9yZXN1bWVfZWFybHksCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1f Z3R0LmMKPiBpbmRleCA2YTRkZmRiNWVjMjcuLjliNGE1NTY2N2VhZiAxMDA2NDQKPiAtLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtX2d0dC5jCj4gQEAgLTI4NjMsMTMgKzI4NjMsMTIgQEAgb3V0X2d0dF9j bGVhbnVwOgo+IMKgCXJldHVybiByZXQ7Cj4gwqB9Cj4gwqAKPiAtdm9pZCBpOTE1X2dlbV9yZXN0 b3JlX2d0dF9tYXBwaW5ncyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQo+ICt2b2lkIGk5MTVfZ2Vt X3Jlc3RvcmVfZ3R0X21hcHBpbmdzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIGJvb2wgdGhhdykK PiDCoHsKPiDCoAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRl dik7Cj4gwqAJc3RydWN0IGk5MTVfZ2d0dCAqZ2d0dCA9ICZkZXZfcHJpdi0+Z2d0dDsKPiDCoAlz dHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqOwo+IMKgCXN0cnVjdCBpOTE1X3ZtYSAqdm1h Owo+IC0JYm9vbCBmbHVzaDsKPiDCoAo+IMKgCWk5MTVfY2hlY2tfYW5kX2NsZWFyX2ZhdWx0cyhk ZXYpOwo+IMKgCj4gQEAgLTI4NzcsMjEgKzI4NzYsMzcgQEAgdm9pZCBpOTE1X2dlbV9yZXN0b3Jl X2d0dF9tYXBwaW5ncyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQo+IMKgCWdndHQtPmJhc2UuY2xl YXJfcmFuZ2UoJmdndHQtPmJhc2UsIGdndHQtPmJhc2Uuc3RhcnQsIGdndHQtPmJhc2UudG90YWws Cj4gwqAJCQnCoMKgwqDCoMKgwqDCoHRydWUpOwo+IMKgCj4gKwkvKiBDb21pbmcgZnJvbSBhIGhp YmVybmF0aW9uIGltYWdlLCB0aGUgcGFnZXMgd2lsbCBoYXZlCj4gKwnCoCogYmVlbiB3cml0dGVu IHRvIGJ5IHRoZSBjcHUgYW5kIHRodXMgaW4gQ1BVIGRvbWFpbi4gTWFyayB0aGVtCj4gKwnCoCog c28gdGhhdCB3ZSByZW1lbWJlciB0byBjbGVhbiB0aGUgb2JqZWN0cywgaWYgd2UgbmVlZCB0bywg YmVmb3JlCj4gKwnCoCogdXNlIGJ5IHRoZSBHUFUuCj4gKwnCoCovCj4gKwlpZiAodGhhdykgewo+ ICsJCWxpc3RfZm9yX2VhY2hfZW50cnkob2JqLAo+ICsJCQkJwqDCoMKgwqAmZGV2X3ByaXYtPm1t LnVuYm91bmRfbGlzdCwKPiArCQkJCcKgwqDCoMKgZ2xvYmFsX2xpc3QpIHsKPiArCQkJb2JqLT5i YXNlLnJlYWRfZG9tYWlucyA9IEk5MTVfR0VNX0RPTUFJTl9DUFU7Cj4gKwkJCW9iai0+YmFzZS53 cml0ZV9kb21haW4gPSBJOTE1X0dFTV9ET01BSU5fQ1BVOwo+ICsJCX0KPiArCX0KPiArCj4gwqAJ LyogQ2FjaGUgZmx1c2ggb2JqZWN0cyBib3VuZCBpbnRvIEdHVFQgYW5kIHJlYmluZCB0aGVtLiAq Lwo+IMKgCWxpc3RfZm9yX2VhY2hfZW50cnkob2JqLCAmZGV2X3ByaXYtPm1tLmJvdW5kX2xpc3Qs IGdsb2JhbF9saXN0KSB7Cj4gLQkJZmx1c2ggPSBmYWxzZTsKPiArCQlpZiAodGhhdykgewo+ICsJ CQlvYmotPmJhc2UucmVhZF9kb21haW5zID0gSTkxNV9HRU1fRE9NQUlOX0NQVTsKPiArCQkJb2Jq LT5iYXNlLndyaXRlX2RvbWFpbiA9IEk5MTVfR0VNX0RPTUFJTl9DUFU7Cj4gKwkJfQo+ICsKPiDC oAkJbGlzdF9mb3JfZWFjaF9lbnRyeSh2bWEsICZvYmotPnZtYV9saXN0LCBvYmpfbGluaykgewo+ IMKgCQkJaWYgKCF2bWEtPmlzX2dndHQpCj4gwqAJCQkJYnJlYWs7Cj4gwqAKPiDCoAkJCVdBUk5f T04oaTkxNV92bWFfYmluZCh2bWEsIG9iai0+Y2FjaGVfbGV2ZWwsCj4gwqAJCQkJCcKgwqDCoMKg wqDCoFBJTl9VUERBVEUpKTsKPiAtCj4gLQkJCWZsdXNoID0gdHJ1ZTsKPiDCoAkJfQo+IMKgCj4g LQkJaWYgKGZsdXNoKQo+IC0JCQlpOTE1X2dlbV9jbGZsdXNoX29iamVjdChvYmosIG9iai0+cGlu X2Rpc3BsYXkpOwo+ICsJCWlmIChvYmotPnBpbl9kaXNwbGF5KQo+ICsJCQlXQVJOX09OKGk5MTVf Z2VtX29iamVjdF9zZXRfdG9fZ3R0X2RvbWFpbihvYmosIGZhbHNlKSk7Cj4gwqAJfQo+IMKgCj4g wqAJaWYgKElOVEVMX0lORk8oZGV2KS0+Z2VuID49IDgpIHsKPiBkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2dlbV9ndHQuaAo+IGluZGV4IDAwMWUyMjRjNGM0NC4uYjQzMjZmYzk0MDNhIDEwMDY0NAo+IC0t LSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5oCj4gKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmgKPiBAQCAtNjA2LDcgKzYwNiw3IEBAIHN0YXRpYyBp bmxpbmUgdm9pZCBpOTE1X3BwZ3R0X3B1dChzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQpCj4g wqAKPiDCoHZvaWQgaTkxNV9jaGVja19hbmRfY2xlYXJfZmF1bHRzKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYpOwo+IMKgdm9pZCBpOTE1X2dlbV9zdXNwZW5kX2d0dF9tYXBwaW5ncyhzdHJ1Y3QgZHJt X2RldmljZSAqZGV2KTsKPiAtdm9pZCBpOTE1X2dlbV9yZXN0b3JlX2d0dF9tYXBwaW5ncyhzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2KTsKPiArdm9pZCBpOTE1X2dlbV9yZXN0b3JlX2d0dF9tYXBwaW5n cyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBib29sIHRoYXcpOwo+IMKgCj4gwqBpbnQgX19tdXN0 X2NoZWNrIGk5MTVfZ2VtX2d0dF9wcmVwYXJlX3BhZ2VzKHN0cnVjdCBkcm1faTkxNV9nZW1fb2Jq ZWN0ICpvYmosCj4gwqAJCQkJCcKgwqDCoMKgc3RydWN0IHNnX3RhYmxlICpwYWdlcyk7Cl9fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWls aW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZy ZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=