From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mika Kuoppala Subject: Re: [PATCH 5/6] drm/i915: Only recover active engines Date: Wed, 26 Jun 2019 17:44:56 +0300 Message-ID: <87r27g4d93.fsf@gaia.fi.intel.com> References: <20190626065303.31624-1-chris@chris-wilson.co.uk> <20190626065303.31624-5-chris@chris-wilson.co.uk> 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 5CCBD6E451 for ; Wed, 26 Jun 2019 14:45:15 +0000 (UTC) In-Reply-To: <20190626065303.31624-5-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 Q2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+IHdyaXRlczoKCj4gSWYgd2Ug aXNzdWUgYSByZXNldCB0byBhIGN1cnJlbnRseSBpZGxlIGVuZ2luZSwgbGVhdmUgaXQgaWRsZQo+ IGFmdGVyd2FyZHMuIFRoaXMgaXMgdXNlZnVsIHRvIGV4Y2lzZSBhIGxpbmthZ2UgYmV0d2VlbiBy ZXNldCBhbmQgdGhlCj4gc2hyaW5rZXIuIFdoZW4gd2FraW5nIHRoZSBlbmdpbmUsIHdlIG5lZWQg dG8gcGluIHRoZSBkZWZhdWx0IGNvbnRleHQKCmRlZmF1bHQgY29udGV4dCwga2VybmVsIGNvbnRl eHQsIGdvbGRlbiBjb250ZXh0Li4uCmlmIHdlIGV2ZXIgcmV2aXNpdCB0aGUgbmFtaW5nLCBJIHdp bGwgYWR2b2NhdGUgZm9yIHByb3RvIGNvbnRleHQuCgo+IGltYWdlIHdoaWNoIHdlIHVzZSBmb3Ig b3ZlcndyaXRpbmcgYSBndWlsdHkgY29udGV4dCAtLSBpZiB0aGUgZW5naW5lIGlzCj4gaWRsZSB3 ZSBkbyBub3QgbmVlZCB0aGlzIHBpbm5lZCBpbWFnZSEgSG93ZXZlciwgdGhpcyBwaW5uaW5nIG1l YW5zIHRoYXQKPiB3YWtpbmcgdGhlIGVuZ2luZSBhY3F1aXJlcyB0aGUgRlNfUkVDTEFJTSwgYW5k IHNvIG1heSB0cmlnZ2VyIHRoZQo+IHNocmlua2VyLiBUaGUgc2hyaW5rZXIgaXRzZWxmIG1heSBu ZWVkIHRvIHdhaXQgdXBvbiB0aGUgR1BVIHRvIHVuYmluZAo+IGFuZCBvYmplY3QgYW5kIHNvIG1h eSByZXF1aXJlIHNlcnZpY2VzIG9mIHJlc2V0OyBlcmdvIHdlIHNob3VsZCBhdm9pZAo+IHRoZSBl bmdpbmUgd2FrZSB1cCBwYXRoLgo+Cj4gVGhlIGRhbmdlciBpbiBza2lwcGluZyB0aGUgcmVjb3Zl cnkgZm9yIGlkbGUgZW5naW5lcyBpcyB0aGF0IHdlIGxlYXZlIHRoZQo+IGVuZ2luZSB3aXRoIG5v IGNvbnRleHQgZGVmaW5lZCwgd2hpY2ggbWF5IGludGVyZmVyZSB3aXRoIHRoZSBvcGVyYXRpb24g b2YKPiB0aGUgcG93ZXIgY29udGV4dCBvbiBzb21lIG9sZGVyIHBsYXRmb3Jtcy4gSW4gcHJhY3Rp Y2UsIHdlIHNob3VsZCBvbmx5Cj4gYmUgcmVzZXR0aW5nIGFuIGFjdGl2ZSBHUFUgYnV0IGl0IHNv bWV0aGluZyB0byBsb29rIG91dCBmb3Igb24gSXJvbmxha2UKPiAoaWYgbWVtb3J5IHNlcnZlcyku Cj4KCkkgd2lsbCBwbGFjZSBteSBiZXQgb24gYmR3LgoKUmV2aWV3ZWQtYnk6IE1pa2EgS3VvcHBh bGEgPG1pa2Eua3VvcHBhbGFAbGludXguaW50ZWwuY29tPgoKPiBTaWduZWQtb2ZmLWJ5OiBDaHJp cyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KPiAtLS0KPiAgZHJpdmVycy9ncHUv ZHJtL2k5MTUvZ3QvaW50ZWxfcmVzZXQuYyAgICB8IDM3ICsrKysrKysrKysrKysrLS0tLS0tLS0t LQo+ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9ndC9zZWxmdGVzdF9yZXNldC5jIHwgIDYgKystLQo+ ICAyIGZpbGVzIGNoYW5nZWQsIDI2IGluc2VydGlvbnMoKyksIDE3IGRlbGV0aW9ucygtKQo+Cj4g ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2d0L2ludGVsX3Jlc2V0LmMgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9ndC9pbnRlbF9yZXNldC5jCj4gaW5kZXggOGNlOTJjNTE1NjRlLi5l N2NiZDljZjg1YzEgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZ3QvaW50ZWxf cmVzZXQuYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2d0L2ludGVsX3Jlc2V0LmMKPiBA QCAtNjc4LDcgKzY3OCw2IEBAIHN0YXRpYyB2b2lkIHJlc2V0X3ByZXBhcmVfZW5naW5lKHN0cnVj dCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKPiAgCSAqIHdyaXR0ZW4gdG8gdGhlIHBvd2VyY29u dGV4dCBpcyB1bmRlZmluZWQgYW5kIHNvIHdlIG1heSBsb3NlCj4gIAkgKiBHUFUgc3RhdGUgdXBv biByZXN1bWUsIGkuZS4gZmFpbCB0byByZXN0YXJ0IGFmdGVyIGEgcmVzZXQuCj4gIAkgKi8KPiAt CWludGVsX2VuZ2luZV9wbV9nZXQoZW5naW5lKTsKPiAgCWludGVsX3VuY29yZV9mb3JjZXdha2Vf Z2V0KGVuZ2luZS0+dW5jb3JlLCBGT1JDRVdBS0VfQUxMKTsKPiAgCWVuZ2luZS0+cmVzZXQucHJl cGFyZShlbmdpbmUpOwo+ICB9Cj4gQEAgLTcwOSwxNiArNzA4LDIxIEBAIHN0YXRpYyB2b2lkIHJl dm9rZV9tbWFwcyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSkKPiAgCX0KPiAgfQo+ICAK PiAtc3RhdGljIHZvaWQgcmVzZXRfcHJlcGFyZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkx NSkKPiArc3RhdGljIGludGVsX2VuZ2luZV9tYXNrX3QgcmVzZXRfcHJlcGFyZShzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqaTkxNSkKPiAgewo+ICAJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5n aW5lOwo+ICsJaW50ZWxfZW5naW5lX21hc2tfdCBhd2FrZSA9IDA7Cj4gIAllbnVtIGludGVsX2Vu Z2luZV9pZCBpZDsKPiAgCj4gLQlpbnRlbF9ndF9wbV9nZXQoJmk5MTUtPmd0KTsKPiAtCWZvcl9l YWNoX2VuZ2luZShlbmdpbmUsIGk5MTUsIGlkKQo+ICsJZm9yX2VhY2hfZW5naW5lKGVuZ2luZSwg aTkxNSwgaWQpIHsKPiArCQlpZiAoaW50ZWxfZW5naW5lX3BtX2dldF9pZl9hd2FrZShlbmdpbmUp KQo+ICsJCQlhd2FrZSB8PSBlbmdpbmUtPm1hc2s7Cj4gIAkJcmVzZXRfcHJlcGFyZV9lbmdpbmUo ZW5naW5lKTsKPiArCX0KPiAgCj4gIAlpbnRlbF91Y19yZXNldF9wcmVwYXJlKGk5MTUpOwo+ICsK PiArCXJldHVybiBhd2FrZTsKPiAgfQo+ICAKPiAgc3RhdGljIHZvaWQgZ3RfcmV2b2tlKHN0cnVj dCBkcm1faTkxNV9wcml2YXRlICppOTE1KQo+IEBAIC03NTIsMjAgKzc1NiwyMiBAQCBzdGF0aWMg aW50IGd0X3Jlc2V0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1LAo+ICBzdGF0aWMgdm9p ZCByZXNldF9maW5pc2hfZW5naW5lKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKPiAg ewo+ICAJZW5naW5lLT5yZXNldC5maW5pc2goZW5naW5lKTsKPiAtCWludGVsX2VuZ2luZV9wbV9w dXQoZW5naW5lKTsKPiAgCWludGVsX3VuY29yZV9mb3JjZXdha2VfcHV0KGVuZ2luZS0+dW5jb3Jl LCBGT1JDRVdBS0VfQUxMKTsKPiArCj4gKwlpbnRlbF9lbmdpbmVfc2lnbmFsX2JyZWFkY3J1bWJz KGVuZ2luZSk7Cj4gIH0KPiAgCj4gLXN0YXRpYyB2b2lkIHJlc2V0X2ZpbmlzaChzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqaTkxNSkKPiArc3RhdGljIHZvaWQgcmVzZXRfZmluaXNoKHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICppOTE1LAo+ICsJCQkgaW50ZWxfZW5naW5lX21hc2tfdCBhd2FrZSkK PiAgewo+ICAJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lOwo+ICAJZW51bSBpbnRlbF9l bmdpbmVfaWQgaWQ7Cj4gIAo+ICAJZm9yX2VhY2hfZW5naW5lKGVuZ2luZSwgaTkxNSwgaWQpIHsK PiAgCQlyZXNldF9maW5pc2hfZW5naW5lKGVuZ2luZSk7Cj4gLQkJaW50ZWxfZW5naW5lX3NpZ25h bF9icmVhZGNydW1icyhlbmdpbmUpOwo+ICsJCWlmIChhd2FrZSAmIGVuZ2luZS0+bWFzaykKPiAr CQkJaW50ZWxfZW5naW5lX3BtX3B1dChlbmdpbmUpOwo+ICAJfQo+IC0JaW50ZWxfZ3RfcG1fcHV0 KCZpOTE1LT5ndCk7Cj4gIH0KPiAgCj4gIHN0YXRpYyB2b2lkIG5vcF9zdWJtaXRfcmVxdWVzdChz dHJ1Y3QgaTkxNV9yZXF1ZXN0ICpyZXF1ZXN0KQo+IEBAIC03ODksNiArNzk1LDcgQEAgc3RhdGlj IHZvaWQgX19pOTE1X2dlbV9zZXRfd2VkZ2VkKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1 KQo+ICB7Cj4gIAlzdHJ1Y3QgaTkxNV9ncHVfZXJyb3IgKmVycm9yID0gJmk5MTUtPmdwdV9lcnJv cjsKPiAgCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZTsKPiArCWludGVsX2VuZ2luZV9t YXNrX3QgYXdha2U7Cj4gIAllbnVtIGludGVsX2VuZ2luZV9pZCBpZDsKPiAgCj4gIAlpZiAodGVz dF9iaXQoSTkxNV9XRURHRUQsICZlcnJvci0+ZmxhZ3MpKQo+IEBAIC04MDgsNyArODE1LDcgQEAg c3RhdGljIHZvaWQgX19pOTE1X2dlbV9zZXRfd2VkZ2VkKHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICppOTE1KQo+ICAJICogcm9sbGluZyB0aGUgZ2xvYmFsIHNlcW5vIGZvcndhcmQgKHNpbmNlIHRo aXMgd291bGQgY29tcGxldGUgcmVxdWVzdHMKPiAgCSAqIGZvciB3aGljaCB3ZSBoYXZlbid0IHNl dCB0aGUgZmVuY2UgZXJyb3IgdG8gRUlPIHlldCkuCj4gIAkgKi8KPiAtCXJlc2V0X3ByZXBhcmUo aTkxNSk7Cj4gKwlhd2FrZSA9IHJlc2V0X3ByZXBhcmUoaTkxNSk7Cj4gIAo+ICAJLyogRXZlbiBp ZiB0aGUgR1BVIHJlc2V0IGZhaWxzLCBpdCBzaG91bGQgc3RpbGwgc3RvcCB0aGUgZW5naW5lcyAq Lwo+ICAJaWYgKCFJTlRFTF9JTkZPKGk5MTUpLT5ncHVfcmVzZXRfY2xvYmJlcnNfZGlzcGxheSkK PiBAQCAtODMyLDcgKzgzOSw3IEBAIHN0YXRpYyB2b2lkIF9faTkxNV9nZW1fc2V0X3dlZGdlZChz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSkKPiAgCWZvcl9lYWNoX2VuZ2luZShlbmdpbmUs IGk5MTUsIGlkKQo+ICAJCWVuZ2luZS0+Y2FuY2VsX3JlcXVlc3RzKGVuZ2luZSk7Cj4gIAo+IC0J cmVzZXRfZmluaXNoKGk5MTUpOwo+ICsJcmVzZXRfZmluaXNoKGk5MTUsIGF3YWtlKTsKPiAgCj4g IAlHRU1fVFJBQ0UoImVuZFxuIik7Cj4gIH0KPiBAQCAtOTY0LDYgKzk3MSw3IEBAIHZvaWQgaTkx NV9yZXNldChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSwKPiAgCQljb25zdCBjaGFyICpy ZWFzb24pCj4gIHsKPiAgCXN0cnVjdCBpOTE1X2dwdV9lcnJvciAqZXJyb3IgPSAmaTkxNS0+Z3B1 X2Vycm9yOwo+ICsJaW50ZWxfZW5naW5lX21hc2tfdCBhd2FrZTsKPiAgCWludCByZXQ7Cj4gIAo+ ICAJR0VNX1RSQUNFKCJmbGFncz0lbHhcbiIsIGVycm9yLT5mbGFncyk7Cj4gQEAgLTk4MCw3ICs5 ODgsNyBAQCB2b2lkIGk5MTVfcmVzZXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUsCj4g IAkJZGV2X25vdGljZShpOTE1LT5kcm0uZGV2LCAiUmVzZXR0aW5nIGNoaXAgZm9yICVzXG4iLCBy ZWFzb24pOwo+ICAJZXJyb3ItPnJlc2V0X2NvdW50Kys7Cj4gIAo+IC0JcmVzZXRfcHJlcGFyZShp OTE1KTsKPiArCWF3YWtlID0gcmVzZXRfcHJlcGFyZShpOTE1KTsKPiAgCj4gIAlpZiAoIWludGVs X2hhc19ncHVfcmVzZXQoaTkxNSkpIHsKPiAgCQlpZiAoaTkxNV9tb2RwYXJhbXMucmVzZXQpCj4g QEAgLTEwMjEsNyArMTAyOSw3IEBAIHZvaWQgaTkxNV9yZXNldChzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqaTkxNSwKPiAgCWk5MTVfcXVldWVfaGFuZ2NoZWNrKGk5MTUpOwo+ICAKPiAgZmluaXNo Ogo+IC0JcmVzZXRfZmluaXNoKGk5MTUpOwo+ICsJcmVzZXRfZmluaXNoKGk5MTUsIGF3YWtlKTsK PiAgdW5sb2NrOgo+ICAJbXV0ZXhfdW5sb2NrKCZlcnJvci0+d2VkZ2VfbXV0ZXgpOwo+ICAJcmV0 dXJuOwo+IEBAIC0xMDcyLDcgKzEwODAsNyBAQCBpbnQgaTkxNV9yZXNldF9lbmdpbmUoc3RydWN0 IGludGVsX2VuZ2luZV9jcyAqZW5naW5lLCBjb25zdCBjaGFyICptc2cpCj4gIAlHRU1fVFJBQ0Uo IiVzIGZsYWdzPSVseFxuIiwgZW5naW5lLT5uYW1lLCBlcnJvci0+ZmxhZ3MpOwo+ICAJR0VNX0JV R19PTighdGVzdF9iaXQoSTkxNV9SRVNFVF9FTkdJTkUgKyBlbmdpbmUtPmlkLCAmZXJyb3ItPmZs YWdzKSk7Cj4gIAo+IC0JaWYgKCFpbnRlbF9lbmdpbmVfcG1faXNfYXdha2UoZW5naW5lKSkKPiAr CWlmICghaW50ZWxfZW5naW5lX3BtX2dldF9pZl9hd2FrZShlbmdpbmUpKQo+ICAJCXJldHVybiAw Owo+ICAKPiAgCXJlc2V0X3ByZXBhcmVfZW5naW5lKGVuZ2luZSk7Cj4gQEAgLTExMDcsMTIgKzEx MTUsMTEgQEAgaW50IGk5MTVfcmVzZXRfZW5naW5lKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVu Z2luZSwgY29uc3QgY2hhciAqbXNnKQo+ICAJICogcHJvY2VzcyB0byBwcm9ncmFtIFJJTkdfTU9E RSwgSFdTUCBhbmQgcmUtZW5hYmxlIHN1Ym1pc3Npb24uCj4gIAkgKi8KPiAgCXJldCA9IGVuZ2lu ZS0+cmVzdW1lKGVuZ2luZSk7Cj4gLQlpZiAocmV0KQo+IC0JCWdvdG8gb3V0Owo+ICAKPiAgb3V0 Ogo+ICAJaW50ZWxfZW5naW5lX2NhbmNlbF9zdG9wX2NzKGVuZ2luZSk7Cj4gIAlyZXNldF9maW5p c2hfZW5naW5lKGVuZ2luZSk7Cj4gKwlpbnRlbF9lbmdpbmVfcG1fcHV0KGVuZ2luZSk7Cj4gIAly ZXR1cm4gcmV0Owo+ICB9Cj4gIAo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9n dC9zZWxmdGVzdF9yZXNldC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvZ3Qvc2VsZnRlc3RfcmVz ZXQuYwo+IGluZGV4IDY0MWNmM2FlZThkNS4uNjcyZTMyZTFlZjk1IDEwMDY0NAo+IC0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2d0L3NlbGZ0ZXN0X3Jlc2V0LmMKPiArKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9ndC9zZWxmdGVzdF9yZXNldC5jCj4gQEAgLTcxLDE1ICs3MSwxNyBAQCBzdGF0 aWMgaW50IGlndF9hdG9taWNfcmVzZXQodm9pZCAqYXJnKQo+ICAJCWdvdG8gdW5sb2NrOwo+ICAK PiAgCWZvciAocCA9IGlndF9hdG9taWNfcGhhc2VzOyBwLT5uYW1lOyBwKyspIHsKPiArCQlpbnRl bF9lbmdpbmVfbWFza190IGF3YWtlOwo+ICsKPiAgCQlHRU1fVFJBQ0UoImludGVsX2dwdV9yZXNl dCB1bmRlciAlc1xuIiwgcC0+bmFtZSk7Cj4gIAo+IC0JCXJlc2V0X3ByZXBhcmUoaTkxNSk7Cj4g KwkJYXdha2UgPSByZXNldF9wcmVwYXJlKGk5MTUpOwo+ICAJCXAtPmNyaXRpY2FsX3NlY3Rpb25f YmVnaW4oKTsKPiAgCj4gIAkJZXJyID0gaW50ZWxfZ3B1X3Jlc2V0KGk5MTUsIEFMTF9FTkdJTkVT KTsKPiAgCj4gIAkJcC0+Y3JpdGljYWxfc2VjdGlvbl9lbmQoKTsKPiAtCQlyZXNldF9maW5pc2go aTkxNSk7Cj4gKwkJcmVzZXRfZmluaXNoKGk5MTUsIGF3YWtlKTsKPiAgCj4gIAkJaWYgKGVycikg ewo+ICAJCQlwcl9lcnIoImludGVsX2dwdV9yZXNldCBmYWlsZWQgdW5kZXIgJXNcbiIsIHAtPm5h bWUpOwo+IC0tIAo+IDIuMjAuMQpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVz a3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9p bnRlbC1nZng=