From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH v2 1/2] drm/i915: Fix modeset handling during gpu reset. Date: Mon, 25 Apr 2016 19:10:54 +0300 Message-ID: <20160425161054.GD4329@intel.com> References: <57039ADC.4010601@linux.intel.com> <1460355814-3599-1-git-send-email-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline In-Reply-To: <1460355814-3599-1-git-send-email-maarten.lankhorst@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Maarten Lankhorst Cc: intel-gfx@lists.freedesktop.org, drm-intel-fixes@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org T24gTW9uLCBBcHIgMTEsIDIwMTYgYXQgMDg6MjM6MzNBTSArMDIwMCwgTWFhcnRlbiBMYW5raG9y c3Qgd3JvdGU6Cj4gVGhpcyBmdW5jdGlvbiB3b3VsZCBjYWxsIGRybV9tb2Rlc2V0X2xvY2tfYWxs LCB3aGlsZSB0aGUgc3VzcGVuZC9yZXN1bWUKPiBmdW5jdGlvbnMgYWxyZWFkeSBoYXZlIHRoZWly IG93biBsb2NraW5nLiBGaXggdGhpcyBieSBmYWN0b3Jpbmcgb3V0Cj4gX19pbnRlbF9kaXNwbGF5 X3Jlc3VtZSwgYW5kIGNhbGxpbmcgdGhlIGF0b21pYyBoZWxwZXJzIGZvciBkdXBsaWNhdGluZwo+ IGF0b21pYyBzdGF0ZSBhbmQgZGlzYWJsaW5nIGFsbCBjcnRjJ3MgZHVyaW5nIHN1c3BlbmQuCj4g Cj4gU2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxp bnV4LmludGVsLmNvbT4KPiBGaXhlczogZTJjOGI4NzAxZTJkICgiZHJtL2k5MTU6IFVzZSBhdG9t aWMgaGVscGVycyBmb3Igc3VzcGVuZCwgdjIuIikKPiBDYzogZHJtLWludGVsLWZpeGVzQGxpc3Rz LmZyZWVkZXNrdG9wLm9yZwo+IC0tLQo+ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNw bGF5LmMgfCAxMjMgKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0KPiAgMSBmaWxl IGNoYW5nZWQsIDgzIGluc2VydGlvbnMoKyksIDQwIGRlbGV0aW9ucygtKQo+IAo+IGRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKPiBpbmRleCBmZWI3MDI4MzQxYjguLjJmNzZlZmM4NjQx NyAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKPiAr KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKPiBAQCAtMzEyNiw4ICsz MTI2LDQ0IEBAIHN0YXRpYyB2b2lkIGludGVsX3VwZGF0ZV9wcmltYXJ5X3BsYW5lcyhzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2KQo+ICAJfQo+ICB9Cj4gIAo+ICtzdGF0aWMgaW50Cj4gK19faW50ZWxf ZGlzcGxheV9yZXN1bWUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKPiArCQkgICAgICAgc3RydWN0 IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlLAo+ICsJCSAgICAgICBib29sICpzZXR1cCkKPiArewo+ ICsJc3RydWN0IGRybV9jcnRjX3N0YXRlICpjcnRjX3N0YXRlOwo+ICsJc3RydWN0IGRybV9jcnRj ICpjcnRjOwo+ICsJaW50IGk7Cj4gKwo+ICsJaWYgKCFzZXR1cCB8fCAhKnNldHVwKSB7Cj4gKwkJ aWYgKHNldHVwKQo+ICsJCQkqc2V0dXAgPSB0cnVlOwoKVGhpcyBpcyBnZXR0aW5nIG5hc3R5LiBI b3cgYWJvdXQgZGVhbGluZyB3aXRoIC1FREVBRExLIHJpZ2h0IGFmdGVyIHRoZQptb2Rlc2V0X2xv Y2tfYWxsKCkgaW4gdGhlIGNhbGxlciwgc28gdGhhdCB3ZSBkb24ndCBoYXZlIHRvIGJlIGNvbmNl cm5lZAp3aXRoIGdldHRpbmcgY2FsbGVkIG11dGlwbGUgdGltZXMgaGVyZT8KCj4gKwo+ICsJCWlu dGVsX21vZGVzZXRfc2V0dXBfaHdfc3RhdGUoZGV2KTsKPiArCQlpOTE1X3JlZGlzYWJsZV92Z2Eo ZGV2KTsKPiArCX0KPiArCj4gKwlpZiAoIXN0YXRlKQo+ICsJCXJldHVybiAwOwo+ICsKPiArCWZv cl9lYWNoX2NydGNfaW5fc3RhdGUoc3RhdGUsIGNydGMsIGNydGNfc3RhdGUsIGkpIHsKPiArCQkv Kgo+ICsJCSAqIEZvcmNlIHJlY2FsY3VsYXRpb24gZXZlbiBpZiB3ZSByZXN0b3JlCj4gKwkJICog Y3VycmVudCBzdGF0ZS4gV2l0aCBmYXN0IG1vZGVzZXQgdGhpcyBtYXkgbm90IHJlc3VsdAo+ICsJ CSAqIGluIGEgbW9kZXNldCB3aGVuIHRoZSBzdGF0ZSBpcyBjb21wYXRpYmxlLgo+ICsJCSAqLwo+ ICsJCWNydGNfc3RhdGUtPm1vZGVfY2hhbmdlZCA9IHRydWU7Cj4gKwl9Cj4gKwo+ICsJcmV0dXJu IGRybV9hdG9taWNfY29tbWl0KHN0YXRlKTsKClRvIGdvIGFsb25nIHdpdGggbXkgc3VnZ2VzdGlv biBhYm91dCBkZWFsaW5nIHdpdGggLUVERUFETEsgdXBmcm9udCwKd2UgY291bGQgdGhlbiBoYXZl IGEgV0FSTl9PTihyZXQgPT0gLUVERUFETEspIGhlcmUgdG8gbWFrZSBzdXJlIHdlCmRpZG4ndCBt YWtlIGEgbWVzcyBvZiB0aGluZ3MuCgo+ICt9Cj4gKwo+ICB2b2lkIGludGVsX3ByZXBhcmVfcmVz ZXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKPiAgewo+ICsJc3RydWN0IGRybV9hdG9taWNfc3Rh dGUgKnN0YXRlOwo+ICsJc3RydWN0IGRybV9tb2Rlc2V0X2FjcXVpcmVfY3R4ICpwY3R4Owo+ICsJ aW50IHJldDsKPiArCj4gIAkvKiBubyByZXNldCBzdXBwb3J0IGZvciBnZW4yICovCj4gIAlpZiAo SVNfR0VOMihkZXYpKQo+ICAJCXJldHVybjsKPiBAQCAtMzEzNywxNiArMzE3MywzOSBAQCB2b2lk IGludGVsX3ByZXBhcmVfcmVzZXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKPiAgCQlyZXR1cm47 Cj4gIAo+ICAJZHJtX21vZGVzZXRfbG9ja19hbGwoZGV2KTsKPiArCXBjdHggPSBkZXYtPm1vZGVf Y29uZmlnLmFjcXVpcmVfY3R4OwoKU3RpbGwgbG9va3MgbGlrZSAicG93ZXIgY29udGV4dCIgdG8g bWUuCgpJIHdhcyB3b25kZXJpbmcgaWYgd2Ugc2hvdWxkIGhhdmUgYSBwcml2YXRlIGNvbnRleHQg aGVyZSwgYnV0IEkgZ3Vlc3MKdGhhdCB3b3VsZCBmYWxsIG92ZXIgd2l0aCBzb21lIG1vZGVfY29u ZmlnLmFjcXVpcmVfY3R4IHVzYWdlIGluIHRoZQpkaXNwbGF5IGluaXQgY29kZT8KCj4gKwo+ICAJ LyoKPiAgCSAqIERpc2FibGluZyB0aGUgY3J0Y3MgZ3JhY2VmdWxseSBzZWVtcyBuaWNlci4gQWxz byB0aGUKPiAgCSAqIGczMyBkb2NzIHNheSB3ZSBzaG91bGQgYXQgbGVhc3QgZGlzYWJsZSBhbGwg dGhlIHBsYW5lcy4KPiAgCSAqLwo+IC0JaW50ZWxfZGlzcGxheV9zdXNwZW5kKGRldik7Cj4gKwo+ ICsJc3RhdGUgPSBkcm1fYXRvbWljX2hlbHBlcl9kdXBsaWNhdGVfc3RhdGUoZGV2LCBwY3R4KTsK PiArCWlmIChJU19FUlIoc3RhdGUpKSB7Cj4gKwkJcmV0ID0gUFRSX0VSUihzdGF0ZSk7Cj4gKwkJ c3RhdGUgPSBOVUxMOwo+ICsJCURSTV9FUlJPUigiRHVwbGljYXRpbmcgc3RhdGUgZmFpbGVkIHdp dGggJWlcbiIsIHJldCk7Cj4gKwkJZ290byBlcnI7Cj4gKwl9Cj4gKwo+ICsJcmV0ID0gZHJtX2F0 b21pY19oZWxwZXJfZGlzYWJsZV9hbGwoZGV2LCBwY3R4KTsKPiArCWlmIChyZXQpIHsKPiArCQlE Uk1fRVJST1IoIlN1c3BlbmRpbmcgY3J0YydzIGZhaWxlZCB3aXRoICVpXG4iLCByZXQpOwo+ICsJ CWdvdG8gZXJyOwo+ICsJfQo+ICsKPiArCXRvX2k5MTUoZGV2KS0+bW9kZXNldF9yZXN0b3JlX3N0 YXRlID0gc3RhdGU7Cj4gKwlyZXR1cm47Cj4gKwo+ICtlcnI6Cj4gKwlkcm1fYXRvbWljX3N0YXRl X2ZyZWUoc3RhdGUpOwo+ICB9Cj4gIAo+ICB2b2lkIGludGVsX2ZpbmlzaF9yZXNldChzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2KQo+ICB7Cj4gIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYgPSB0b19pOTE1KGRldik7Cj4gKwlzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUgPSBk ZXZfcHJpdi0+bW9kZXNldF9yZXN0b3JlX3N0YXRlOwo+ICsJaW50IHJldDsKPiAgCj4gIAkvKgo+ ICAJICogRmxpcHMgaW4gdGhlIHJpbmdzIHdpbGwgYmUgbnVrZWQgYnkgdGhlIHJlc2V0LAo+IEBA IC0zMTcyLDIzICszMjMxLDI5IEBAIHZvaWQgaW50ZWxfZmluaXNoX3Jlc2V0KHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYpCj4gIAkJICovCj4gIAkJaW50ZWxfdXBkYXRlX3ByaW1hcnlfcGxhbmVzKGRl dik7Cj4gIAkJcmV0dXJuOwo+IC0JfQo+ICsJfSBlbHNlIHsKPiArCQkvKgo+ICsJCSAqIFRoZSBk aXNwbGF5IGhhcyBiZWVuIHJlc2V0IGFzIHdlbGwsCj4gKwkJICogc28gbmVlZCBhIGZ1bGwgcmUt aW5pdGlhbGl6YXRpb24uCj4gKwkJICovCj4gKwkJaW50ZWxfcnVudGltZV9wbV9kaXNhYmxlX2lu dGVycnVwdHMoZGV2X3ByaXYpOwo+ICsJCWludGVsX3J1bnRpbWVfcG1fZW5hYmxlX2ludGVycnVw dHMoZGV2X3ByaXYpOwo+ICAKPiAtCS8qCj4gLQkgKiBUaGUgZGlzcGxheSBoYXMgYmVlbiByZXNl dCBhcyB3ZWxsLAo+IC0JICogc28gbmVlZCBhIGZ1bGwgcmUtaW5pdGlhbGl6YXRpb24uCj4gLQkg Ki8KPiAtCWludGVsX3J1bnRpbWVfcG1fZGlzYWJsZV9pbnRlcnJ1cHRzKGRldl9wcml2KTsKPiAt CWludGVsX3J1bnRpbWVfcG1fZW5hYmxlX2ludGVycnVwdHMoZGV2X3ByaXYpOwo+ICsJCWludGVs X21vZGVzZXRfaW5pdF9odyhkZXYpOwo+ICAKPiAtCWludGVsX21vZGVzZXRfaW5pdF9odyhkZXYp Owo+ICsJCXNwaW5fbG9ja19pcnEoJmRldl9wcml2LT5pcnFfbG9jayk7Cj4gKwkJaWYgKGRldl9w cml2LT5kaXNwbGF5LmhwZF9pcnFfc2V0dXApCj4gKwkJCWRldl9wcml2LT5kaXNwbGF5LmhwZF9p cnFfc2V0dXAoZGV2KTsKPiArCQlzcGluX3VubG9ja19pcnEoJmRldl9wcml2LT5pcnFfbG9jayk7 Cj4gKwl9CgpUaGlzIHNlZW1zIGxpa2UgYW4gdW5yZWxhdGVkIGNoYW5nZS4gTW9yZSB0byBkbyB3 aXRoIHRoZSBzZWNvbmQgcGF0Y2ggSQpndWVzcywgdGhvdWdoIEknbSBzdGlsbCB3b25kZXJpbmcg aWYgd2UgY2FuJ3QganVzdCBydW4gdGhyb3VnaCB0aGUKd2hvbGUgdGhpbmcgZXZlcnkgdGltZT8K Cj4gIAo+IC0Jc3Bpbl9sb2NrX2lycSgmZGV2X3ByaXYtPmlycV9sb2NrKTsKPiAtCWlmIChkZXZf cHJpdi0+ZGlzcGxheS5ocGRfaXJxX3NldHVwKQo+IC0JCWRldl9wcml2LT5kaXNwbGF5LmhwZF9p cnFfc2V0dXAoZGV2KTsKPiAtCXNwaW5fdW5sb2NrX2lycSgmZGV2X3ByaXYtPmlycV9sb2NrKTsK PiArCWRldl9wcml2LT5tb2Rlc2V0X3Jlc3RvcmVfc3RhdGUgPSBOVUxMOwo+ICsJaWYgKHN0YXRl KQo+ICsJCXN0YXRlLT5hY3F1aXJlX2N0eCA9IGRldi0+bW9kZV9jb25maWcuYWNxdWlyZV9jdHg7 Cj4gIAo+IC0JaW50ZWxfZGlzcGxheV9yZXN1bWUoZGV2KTsKPiArCXJldCA9IF9faW50ZWxfZGlz cGxheV9yZXN1bWUoZGV2LCBzdGF0ZSwgTlVMTCk7Cj4gKwlpZiAocmV0KQo+ICsJCURSTV9FUlJP UigiUmVzdG9yaW5nIG9sZCBzdGF0ZSBmYWlsZWQgd2l0aCAlaVxuIiwgcmV0KTsKPiAgCj4gIAlp bnRlbF9ocGRfaW5pdChkZXZfcHJpdik7Cj4gIAo+IEBAIC0xNTg4NSw2ICsxNTk1MCw4IEBAIHZv aWQgaW50ZWxfZGlzcGxheV9yZXN1bWUoc3RydWN0IGRybV9kZXZpY2UgKmRldikKPiAgCWJvb2wg c2V0dXAgPSBmYWxzZTsKPiAgCj4gIAlkZXZfcHJpdi0+bW9kZXNldF9yZXN0b3JlX3N0YXRlID0g TlVMTDsKPiArCWlmIChzdGF0ZSkKPiArCQlzdGF0ZS0+YWNxdWlyZV9jdHggPSAmY3R4Owo+ICAK PiAgCS8qCj4gIAkgKiBUaGlzIGlzIGEgY2x1ZGdlIGJlY2F1c2Ugd2l0aCByZWFsIGF0b21pYyBt b2Rlc2V0IG1vZGVfY29uZmlnLm11dGV4Cj4gQEAgLTE1ODk3LDMyICsxNTk2NCw4IEBAIHZvaWQg aW50ZWxfZGlzcGxheV9yZXN1bWUoc3RydWN0IGRybV9kZXZpY2UgKmRldikKPiAgCj4gIHJldHJ5 Ogo+ICAJcmV0ID0gZHJtX21vZGVzZXRfbG9ja19hbGxfY3R4KGRldiwgJmN0eCk7Cj4gLQo+IC0J aWYgKHJldCA9PSAwICYmICFzZXR1cCkgewo+IC0JCXNldHVwID0gdHJ1ZTsKPiAtCj4gLQkJaW50 ZWxfbW9kZXNldF9zZXR1cF9od19zdGF0ZShkZXYpOwo+IC0JCWk5MTVfcmVkaXNhYmxlX3ZnYShk ZXYpOwo+IC0JfQo+IC0KPiAtCWlmIChyZXQgPT0gMCAmJiBzdGF0ZSkgewo+IC0JCXN0cnVjdCBk cm1fY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZTsKPiAtCQlzdHJ1Y3QgZHJtX2NydGMgKmNydGM7Cj4g LQkJaW50IGk7Cj4gLQo+IC0JCXN0YXRlLT5hY3F1aXJlX2N0eCA9ICZjdHg7Cj4gLQo+IC0JCWZv cl9lYWNoX2NydGNfaW5fc3RhdGUoc3RhdGUsIGNydGMsIGNydGNfc3RhdGUsIGkpIHsKPiAtCQkJ LyoKPiAtCQkJICogRm9yY2UgcmVjYWxjdWxhdGlvbiBldmVuIGlmIHdlIHJlc3RvcmUKPiAtCQkJ ICogY3VycmVudCBzdGF0ZS4gV2l0aCBmYXN0IG1vZGVzZXQgdGhpcyBtYXkgbm90IHJlc3VsdAo+ IC0JCQkgKiBpbiBhIG1vZGVzZXQgd2hlbiB0aGUgc3RhdGUgaXMgY29tcGF0aWJsZS4KPiAtCQkJ ICovCj4gLQkJCWNydGNfc3RhdGUtPm1vZGVfY2hhbmdlZCA9IHRydWU7Cj4gLQkJfQo+IC0KPiAt CQlyZXQgPSBkcm1fYXRvbWljX2NvbW1pdChzdGF0ZSk7Cj4gLQl9Cj4gKwlpZiAoIXJldCkKPiAr CQlyZXQgPSBfX2ludGVsX2Rpc3BsYXlfcmVzdW1lKGRldiwgc3RhdGUsICZzZXR1cCk7Cj4gIAo+ ICAJaWYgKHJldCA9PSAtRURFQURMSykgewo+ICAJCWRybV9tb2Rlc2V0X2JhY2tvZmYoJmN0eCk7 Cj4gLS0gCj4gMi4xLjAKCi0tIApWaWxsZSBTeXJqw6Rsw6QKSW50ZWwgT1RDCl9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxp c3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNr dG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=