From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: Re: [PATCH 2/7] drm/i915: Unbreak gpu reset vs. modeset locking Date: Mon, 17 Jul 2017 19:14:38 +0200 Message-ID: <404d1a2e-e6e3-8361-8210-79afed61536c@linux.intel.com> References: <20170715114006.6380-1-daniel.vetter@ffwll.ch> <20170715114006.6380-3-daniel.vetter@ffwll.ch> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id A08EE890C2 for ; Mon, 17 Jul 2017 17:14:40 +0000 (UTC) In-Reply-To: <20170715114006.6380-3-daniel.vetter@ffwll.ch> Content-Language: en-US List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Daniel Vetter , Intel Graphics Development Cc: Daniel Vetter List-Id: intel-gfx@lists.freedesktop.org T3AgMTUtMDctMTcgb20gMTM6NDAgc2NocmVlZiBEYW5pZWwgVmV0dGVyOgo+IFRha2luZyB0aGUg bW9kZXNldCBsb2NrcyB1bmNvbmRpdGlvbmFsbHkgaXNuJ3QgdGhlIGdyZWF0ZXN0IGlkZWEsCj4g YmVjYXVzZSBhdG0gdGhhdCBwYXJ0IGlzIHN0aWxsIGJyb2tlbiBhbmQgdGltZXMgb3V0IChhbmQg dGhlbiBhdG9taWMKPiBrZWVscyBvdmVyKS4gQW5kIHRoZXJlJ3MgcmVhbGx5IG5vIHJlYXNvbiB0 byBkbyBzbywgdGhlIG9sZCBjb2RlCj4gZGlkbid0IGRvIHRoYXQgZWl0aGVyLgo+Cj4gVG8gbWFr ZSB0aGUgcGF0Y2ggYSBiaXQgc2ltcGxlciBsZXQncyBhbHNvIG51a2UgMiBjYXNlcyB0aGF0IGFy ZSBvbmx5Cj4gYXJvdW5kIGZvciB0aGUgb2xkIG1taW9mbGlwIHBhdGhzLiBBdG9taWMgbm9uYmxv Y2tpbmcgd29ya2VycyB3aWxsIG5vdAo+IGRpZSAobWludXMgYnVncykgd2hlbiBhIGdwdSByZXNl dCBoYXBwZW5zLgo+Cj4gQW5kIG9mIGNvdXJzZSB0aGlzIGRvZXNuJ3QgZml4IGFueSBvZiB0aGUg Z3B1IHJlc2V0IHZzLiBtb2Rlc2V0Cj4gZGVhZGxvY2sgZnVuLCBidXQgaXQgYXQgbGVhc3Qgc3Rv cCBtb2Rlcm4gQ0kgbWFjaGluZXMgZnJvbSBrZWVsaW5nCj4gb3ZlciBhbGwgb3ZlciB0aGUgcGxh Y2UgZm9yIG5vIHJlYXNvbiBhdCBhbGwuCj4KPiBBbmQgd2Ugc3RpbGwgaGF2ZSB0aGUgZXhwbGlj aXQgdGVzdGNhc2VzIHRvIHJ1biB0aGUgZmFrZSBncHUgcmVzZXQsIHNvCj4gY292ZXJhZ2UgaXNu J3QgdGhhdCBtdWNoIHdvcnNlLgo+Cj4gdjI6IFNwbGl0IG91dCBhZGRpdGlvbmFsIGNoYW5nZXMg b24gdG9wLCByZXN0cmljdCB0aGlzIHRvIHB1cmVseSByZWR1Y2luZwo+IHRoZSBjcml0aWNhbCBz ZWN0aW9uIG9mIG1vZGVzZXQgbG9ja3MuCj4KPiBGaXhlczogNzM5NzQ4OTM5OTc0ICgiZHJtL2k5 MTU6IEZpeCBtb2Rlc2V0IGhhbmRsaW5nIGR1cmluZyBncHUgcmVzZXQsIHY1LiIpCj4gQ2M6IE1h YXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+Cj4gQ2M6 IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+Cj4gU2lnbmVk LW9mZi1ieTogRGFuaWVsIFZldHRlciA8ZGFuaWVsLnZldHRlckBpbnRlbC5jb20+Cj4gLS0tCj4g IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8IDUzICsrKysrKysrKy0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLQo+ICAxIGZpbGUgY2hhbmdlZCwgMTMgaW5zZXJ0aW9ucygr KSwgNDAgZGVsZXRpb25zKC0pCj4KPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCj4g aW5kZXggZjY5MzMzYjg5OTVjLi5lM2M1NWE5OTZmNmIgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZGlzcGxheS5jCj4gQEAgLTM0MTMsMjYgKzM0MTMsNiBAQCBzdGF0aWMgdm9pZCBpbnRl bF9jb21wbGV0ZV9wYWdlX2ZsaXBzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikK PiAgCQlpbnRlbF9maW5pc2hfcGFnZV9mbGlwX2NzKGRldl9wcml2LCBjcnRjLT5waXBlKTsKPiAg fQo+ICAKPiAtc3RhdGljIHZvaWQgaW50ZWxfdXBkYXRlX3ByaW1hcnlfcGxhbmVzKHN0cnVjdCBk cm1fZGV2aWNlICpkZXYpCj4gLXsKPiAtCXN0cnVjdCBkcm1fY3J0YyAqY3J0YzsKPiAtCj4gLQlm b3JfZWFjaF9jcnRjKGRldiwgY3J0Yykgewo+IC0JCXN0cnVjdCBpbnRlbF9wbGFuZSAqcGxhbmUg PSB0b19pbnRlbF9wbGFuZShjcnRjLT5wcmltYXJ5KTsKPiAtCQlzdHJ1Y3QgaW50ZWxfcGxhbmVf c3RhdGUgKnBsYW5lX3N0YXRlID0KPiAtCQkJdG9faW50ZWxfcGxhbmVfc3RhdGUocGxhbmUtPmJh c2Uuc3RhdGUpOwo+IC0KPiAtCQlpZiAocGxhbmVfc3RhdGUtPmJhc2UudmlzaWJsZSkgewo+IC0J CQl0cmFjZV9pbnRlbF91cGRhdGVfcGxhbmUoJnBsYW5lLT5iYXNlLAo+IC0JCQkJCQkgdG9faW50 ZWxfY3J0YyhjcnRjKSk7Cj4gLQo+IC0JCQlwbGFuZS0+dXBkYXRlX3BsYW5lKHBsYW5lLAo+IC0J CQkJCSAgICB0b19pbnRlbF9jcnRjX3N0YXRlKGNydGMtPnN0YXRlKSwKPiAtCQkJCQkgICAgcGxh bmVfc3RhdGUpOwo+IC0JCX0KPiAtCX0KPiAtfQo+IC0KPiAgc3RhdGljIGludAo+ICBfX2ludGVs X2Rpc3BsYXlfcmVzdW1lKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCj4gIAkJICAgICAgIHN0cnVj dCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSwKPiBAQCAtMzQ4NSw2ICszNDY1LDEyIEBAIHZvaWQg aW50ZWxfcHJlcGFyZV9yZXNldChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCj4g IAlzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGU7Cj4gIAlpbnQgcmV0Owo+ICAKPiArCj4g KwkvKiByZXNldCBkb2Vzbid0IHRvdWNoIHRoZSBkaXNwbGF5LCBidXQgZmxpcHMgbWlnaHQgZ2V0 IG51a2VkIGFueXdheSwgKi8KSSB0aGluayB0aGlzIGNvbW1lbnQgd2FzIG1lYW50IHRvIGFkZHJl c3MgdGhlIHJlYXNvbmluZyBmb3IgdGFraW5nIGFsbCBsb2NrcywKc28gdGhlIHBhcnQgYWJvdXQg ZmxpcHMgYmVpbmcgbnVrZWQgbm8gbG9uZ2VyIGFwcGxpZXMgd2l0aCBtbWlvIGZsaXBzIGdvbmUu Cj4gKwlpZiAoIWk5MTUuZm9yY2VfcmVzZXRfbW9kZXNldF90ZXN0ICYmCj4gKwkgICAgIWdwdV9y ZXNldF9jbG9iYmVyc19kaXNwbGF5KGRldl9wcml2KSkKPiArCQlyZXR1cm47Cj4gKwo+ICAJLyoK PiAgCSAqIE5lZWQgbW9kZV9jb25maWcubXV0ZXggc28gdGhhdCB3ZSBkb24ndAo+ICAJICogdHJh bXBsZSBvbmdvaW5nIC0+ZGV0ZWN0KCkgYW5kIHdoYXRub3QuCj4gQEAgLTM0OTgsMTIgKzM0ODQs NiBAQCB2b2lkIGludGVsX3ByZXBhcmVfcmVzZXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2KQo+ICAKPiAgCQlkcm1fbW9kZXNldF9iYWNrb2ZmKGN0eCk7Cj4gIAl9Cj4gLQo+IC0J LyogcmVzZXQgZG9lc24ndCB0b3VjaCB0aGUgZGlzcGxheSwgYnV0IGZsaXBzIG1pZ2h0IGdldCBu dWtlZCBhbnl3YXksICovCj4gLQlpZiAoIWk5MTUuZm9yY2VfcmVzZXRfbW9kZXNldF90ZXN0ICYm Cj4gLQkgICAgIWdwdV9yZXNldF9jbG9iYmVyc19kaXNwbGF5KGRldl9wcml2KSkKPiAtCQlyZXR1 cm47Cj4gLQo+ICAJLyoKPiAgCSAqIERpc2FibGluZyB0aGUgY3J0Y3MgZ3JhY2VmdWxseSBzZWVt cyBuaWNlci4gQWxzbyB0aGUKPiAgCSAqIGczMyBkb2NzIHNheSB3ZSBzaG91bGQgYXQgbGVhc3Qg ZGlzYWJsZSBhbGwgdGhlIHBsYW5lcy4KPiBAQCAtMzUzMyw2ICszNTEzLDExIEBAIHZvaWQgaW50 ZWxfZmluaXNoX3Jlc2V0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKPiAgCXN0 cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSA9IGRldl9wcml2LT5tb2Rlc2V0X3Jlc3RvcmVf c3RhdGU7Cj4gIAlpbnQgcmV0Owo+ICAKPiArCS8qIHJlc2V0IGRvZXNuJ3QgdG91Y2ggdGhlIGRp c3BsYXksIGJ1dCBmbGlwcyBtaWdodCBnZXQgbnVrZWQgYW55d2F5LCAqLwo+ICsJaWYgKCFpOTE1 LmZvcmNlX3Jlc2V0X21vZGVzZXRfdGVzdCAmJgo+ICsJICAgICFncHVfcmVzZXRfY2xvYmJlcnNf ZGlzcGxheShkZXZfcHJpdikpCj4gKwkJcmV0dXJuOwpTYW1lIHRoaW5nIGFib3V0IGNvbW1lbnQg aGVyZS4gUGVyaGFwcyBjaGFuZ2UgdGhlCgppZiAoIWk5MTUuZm9yY2VfcmVzZXRfbW9kZXNldF90 ZXN0ICYmICFncHVfcmVzZXRfY2xvYmJlcnNfZGlzcGxheSgpKQoKdG8KCmlmICghc3RhdGUgJiYg IWdwdV9yZXNldF9jbG9iYmVyc19kaXNwbGF5KCkpCgpzbyB3ZSBkb24ndCBydW4gaW50byBhIGtl cm5lbCBwYW5pYyBpZiB3ZSBjaGFuZ2UgdGhlIHBhcmFtZXRlciBkdXJpbmcgcmVzZXQ/CgpIbSBw ZXJoYXBzIGFsc28gZWl0aGVyIGFkZCBpZiAoc3RhdGUpIHRvIHRoZSBfX2ludGVsX2Rpc3BsYXlf cmVzdW1lIGNhbGwgZm9yIDxnNHgsCm9yIHJlbW92ZSB0aGUgb25lIGZvciBkcm1fYXRvbWljX3N0 YXRlX3B1dC4KCldpdGggdGhvc2UgY2hhbmdlcyBJJ20gaGFwcHksIGFuZCB5b3UgY2FuIGFkZApS ZXZpZXdlZC1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4Lmlu dGVsLmNvbT4KCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f CkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpo dHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=