From: =?UTF-8?q?Jakub=20Bartmi=C5=84ski?= Subject: [RFC] drm/i915: Don't reset on preemptible workloads Date: Wed, 1 Aug 2018 15:56:11 +0200 Message-ID: <20180801135611.20666-1-jakub.bartminski@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by gabe.freedesktop.org (Postfix) with ESMTPS id 03F2C6E462 for ; Wed, 1 Aug 2018 13:57:14 +0000 (UTC) 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 VGhlIGN1cnJlbnQgYmVoYXZpb3VyIG9mIHRoZSBoYW5nY2hlY2sgaXMgdGhhdCBpZiB3ZSBkZXRl Y3QgdGhhdCBhIHJlcXVlc3QKaXMgbm90IG1ha2luZyBhbnkgZm9yd2FyZCBwcm9ncmVzcywgdGhl IGRyaXZlciB3aWxsIGF0dGVtcHQgdGhlIGVuZ2luZQpyZXNldC4gSWYgdGhhdCdzIG5vdCBzdWNj ZXNzZnVsLCB3ZSBmYWxsIGJhY2sgdG8gYSBmdWxsIGRldmljZSByZXNldC4KClRoaXMgcGF0Y2gg d291bGQgY2hhbmdlIGl0IHNvIHRoYXQgaWYgaGFuZ2NoZWNrIGVuY291bnRlcnMgYSBsb3ctcHJp b3JpdHkKd29ya2xvYWQsIGl0IHdpbGwgYXR0ZW1wdCB0byBwcmVlbXB0IGl0IGJlZm9yZSBkZWNs YXJpbmcgYSBoYW5nLiBJZiB0aGUKcHJlZW1wdGlvbiBpcyBzdWNjZXNzZnVsLCB3ZSBhbGxvdyB0 aGUgd29ya2xvYWQgdG8gY29udGludWUgImluIGJhY2tncm91bmQiCih1bnRpbCB0aGUgbmV4dCBo YW5nY2hlY2sgcnVuLCBhbmQgdGhlIG5leHQgYXR0ZW1wdCB0byBwcmVlbXB0IGl0KS4gSWYgdGhl CmNvbnRleHQgd2FzIGNsb3NlZCwgd2UncmUgc2ltcGx5IHNraXBwaW5nIHRoZSB3b3JrbG9hZCdz IGV4ZWN1dGlvbi4KClRoaXMgbmV3IGJlaGF2aW91ciB3b3VsZCBhbGxvdyB0aGUgdXNlciB0byBk ZWZpbmUgaW50ZW50aW9uYWxseSBsYXJnZSBvcgpwYXNzaXZlIHdvcmtsb2FkcywgdGhhdCB3b3Vs ZCBub3JtYWxseSBiZSBhZmZlY3RlZCBieSB0aGUgaGFuZ2NoZWNrLAp3aXRob3V0IGhhdmluZyB0 byBkaXZpZGUgdGhlbSBpbnRvIHNtYWxsZXIgd29yay4KClN1Z2dlc3RlZC1ieTogTWljaGHFgiBX aW5pYXJza2kgPG1pY2hhbC53aW5pYXJza2lAaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBKYWt1 YiBCYXJ0bWnFhHNraSA8amFrdWIuYmFydG1pbnNraUBpbnRlbC5jb20+CkNjOiBDaHJpcyBXaWxz b24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KQ2M6IEpvb25hcyBMYWh0aW5lbiA8am9vbmFz LmxhaHRpbmVuQGxpbnV4LmludGVsLmNvbT4KQ2M6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJz dWxpbkBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaGFu Z2NoZWNrLmMgIHwgMjkgKysrKysrKysrKysrKysrKysrKwogZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfbHJjLmMgICAgICAgIHwgMzcgKysrKysrKysrKysrKysrKysrKysrKystLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmggICAgICAgIHwgIDEgKwogZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oIHwgIDEgKwogNCBmaWxlcyBjaGFuZ2VkLCA2NSBpbnNl cnRpb25zKCspLCAzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2hhbmdjaGVjay5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaGFuZ2No ZWNrLmMKaW5kZXggMmZjN2EwZGQwZGY5Li41ZWJkM2NhNzQ4NTUgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2hhbmdjaGVjay5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2hhbmdjaGVjay5jCkBAIC0zOTgsNiArMzk4LDI4IEBAIHN0YXRpYyB2b2lkIGhh bmdjaGVja19kZWNsYXJlX2hhbmcoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUsCiAJcmV0 dXJuIGk5MTVfaGFuZGxlX2Vycm9yKGk5MTUsIGh1bmcsIEk5MTVfRVJST1JfQ0FQVFVSRSwgIiVz IiwgbXNnKTsKIH0KIAorc3RhdGljIGJvb2wgaGFuZ2NoZWNrX3ByZWVtcHRfd29ya2xvYWQoc3Ry dWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQoreworCXN0cnVjdCBpOTE1X3JlcXVlc3QgKmFj dGl2ZV9yZXF1ZXN0OworCWludCB3b3JrbG9hZF9wcmlvcml0eTsKKworCS8qIFdlIGhhdmUgYWxy ZWFkeSB0cmllZCBwcmVlbXB0aW5nLCBidXQgdGhlIGhhcmR3YXJlIGRpZCBub3QgcmVhY3QgKi8K KwlpZiAoZW5naW5lLT5oYW5nY2hlY2sudHJ5X3ByZWVtcHQpCisJCXJldHVybiBmYWxzZTsKKwor CWFjdGl2ZV9yZXF1ZXN0ID0gaTkxNV9nZW1fZmluZF9hY3RpdmVfcmVxdWVzdChlbmdpbmUpOwor CXdvcmtsb2FkX3ByaW9yaXR5ID0gYWN0aXZlX3JlcXVlc3QtPmdlbV9jb250ZXh0LT5zY2hlZC5w cmlvcml0eTsKKworCWlmICh3b3JrbG9hZF9wcmlvcml0eSA9PSBJOTE1X0NPTlRFWFRfTUlOX1VT RVJfUFJJT1JJVFkpIHsKKwkJZW5naW5lLT5oYW5nY2hlY2sudHJ5X3ByZWVtcHQgPSB0cnVlOwor CQllbmdpbmUtPmhhbmdjaGVjay5hY3RpdmVfcmVxdWVzdCA9IGFjdGl2ZV9yZXF1ZXN0OworCQlp bnRlbF9scl9pbmplY3RfcHJlZW1wdF9jb250ZXh0KGVuZ2luZSk7CisJCXJldHVybiB0cnVlOwor CX0KKworCXJldHVybiBmYWxzZTsKK30KKwogLyoKICAqIFRoaXMgaXMgY2FsbGVkIHdoZW4gdGhl IGNoaXAgaGFzbid0IHJlcG9ydGVkIGJhY2sgd2l0aCBjb21wbGV0ZWQKICAqIGJhdGNoYnVmZmVy cyBpbiBhIGxvbmcgdGltZS4gV2Uga2VlcCB0cmFjayBwZXIgcmluZyBzZXFubyBwcm9ncmVzcyBh bmQKQEAgLTQ0MCw2ICs0NjIsMTMgQEAgc3RhdGljIHZvaWQgaTkxNV9oYW5nY2hlY2tfZWxhcHNl ZChzdHJ1Y3Qgd29ya19zdHJ1Y3QgKndvcmspCiAJCWhhbmdjaGVja19zdG9yZV9zYW1wbGUoZW5n aW5lLCAmaGMpOwogCiAJCWlmIChlbmdpbmUtPmhhbmdjaGVjay5zdGFsbGVkKSB7CisJCQkvKgor CQkJICogVHJ5IHByZWVtcHRpbmcgdGhlIGN1cnJlbnQgd29ya2xvYWQgYmVmb3JlCisJCQkgKiBk ZWNsYXJpbmcgdGhlIGVuZ2luZSBodW5nLgorCQkJICovCisJCQlpZiAoaGFuZ2NoZWNrX3ByZWVt cHRfd29ya2xvYWQoZW5naW5lKSkKKwkJCQljb250aW51ZTsKKwogCQkJaHVuZyB8PSBpbnRlbF9l bmdpbmVfZmxhZyhlbmdpbmUpOwogCQkJaWYgKGhjLmFjdGlvbiAhPSBFTkdJTkVfREVBRCkKIAkJ CQlzdHVjayB8PSBpbnRlbF9lbmdpbmVfZmxhZyhlbmdpbmUpOwpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9s cmMuYwppbmRleCBmYWQ2ODllZmI2N2EuLjNlYzhkY2Y2NDAwMCAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfbHJjLmMKQEAgLTMyNiwxNSArMzI2LDM5IEBAIHN0YXRpYyB2b2lkIF9fdW53aW5kX2luY29t cGxldGVfcmVxdWVzdHMoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogewogCXN0cnVj dCBpOTE1X3JlcXVlc3QgKnJxLCAqcm47CiAJc3RydWN0IGk5MTVfcHJpb2xpc3QgKnVuaW5pdGlh bGl6ZWRfdmFyKHApOworCXN0cnVjdCBpOTE1X2dlbV9jb250ZXh0ICphY3RpdmVfY29udGV4dCA9 IE5VTEw7CisJYm9vbCBza2lwX3NlcW5vID0gZmFsc2U7CisJdTMyIG5ld19zZXFubyA9IDA7CiAJ aW50IGxhc3RfcHJpbyA9IEk5MTVfUFJJT1JJVFlfSU5WQUxJRDsKIAogCWxvY2tkZXBfYXNzZXJ0 X2hlbGQoJmVuZ2luZS0+dGltZWxpbmUubG9jayk7CiAKKwlpZiAoZW5naW5lLT5oYW5nY2hlY2su dHJ5X3ByZWVtcHQpIHsKKwkJcnEgPSBlbmdpbmUtPmhhbmdjaGVjay5hY3RpdmVfcmVxdWVzdDsK KwkJR0VNX0JVR19PTighcnEpOworCisJCWFjdGl2ZV9jb250ZXh0ID0gcnEtPmdlbV9jb250ZXh0 OworCQlHRU1fQlVHX09OKCFhY3RpdmVfY29udGV4dCk7CisKKwkJLyoKKwkJICogSWYgdGhlIHdv cmtsb2FkIGlzIHByZWVtcHRpYmxlIGJ1dCBpdHMgY29udGV4dCB3YXMgY2xvc2VkCisJCSAqIHdl IGZvcmNlIHRoZSBlbmdpbmUgdG8gc2tpcCBpdHMgZXhlY3V0aW9uIGluc3RlYWQuCisJCSAqLwor CQlpZiAoaTkxNV9nZW1fY29udGV4dF9pc19jbG9zZWQoYWN0aXZlX2NvbnRleHQpKQorCQkJc2tp cF9zZXFubyA9IHRydWU7CisJfQorCiAJbGlzdF9mb3JfZWFjaF9lbnRyeV9zYWZlX3JldmVyc2Uo cnEsIHJuLAogCQkJCQkgJmVuZ2luZS0+dGltZWxpbmUucmVxdWVzdHMsCiAJCQkJCSBsaW5rKSB7 CiAJCWlmIChpOTE1X3JlcXVlc3RfY29tcGxldGVkKHJxKSkKLQkJCXJldHVybjsKKwkJCWJyZWFr OworCisJCWlmIChza2lwX3NlcW5vICYmIHJxLT5nZW1fY29udGV4dCA9PSBhY3RpdmVfY29udGV4 dCkgeworCQkJbmV3X3NlcW5vID0gbWF4KG5ld19zZXFubywKKwkJCQkJaTkxNV9yZXF1ZXN0X2ds b2JhbF9zZXFubyhycSkpOworCQkJY29udGludWU7CisJCX0KIAogCQlfX2k5MTVfcmVxdWVzdF91 bnN1Ym1pdChycSk7CiAJCXVud2luZF93YV90YWlsKHJxKTsKQEAgLTM0OCw2ICszNzIsMTEgQEAg c3RhdGljIHZvaWQgX191bndpbmRfaW5jb21wbGV0ZV9yZXF1ZXN0cyhzdHJ1Y3QgaW50ZWxfZW5n aW5lX2NzICplbmdpbmUpCiAJCUdFTV9CVUdfT04ocC0+cHJpb3JpdHkgIT0gcnFfcHJpbyhycSkp OwogCQlsaXN0X2FkZCgmcnEtPnNjaGVkLmxpbmssICZwLT5yZXF1ZXN0cyk7CiAJfQorCisJaWYg KHNraXBfc2Vxbm8pIHsKKwkJaW50ZWxfd3JpdGVfc3RhdHVzX3BhZ2UoZW5naW5lLCBJOTE1X0dF TV9IV1NfSU5ERVgsIG5ld19zZXFubyk7CisJCWVuZ2luZS0+dGltZWxpbmUuc2Vxbm8gPSBuZXdf c2Vxbm87CisJfQogfQogCiB2b2lkCkBAIC01MzIsNyArNTYxLDcgQEAgc3RhdGljIHZvaWQgcG9y dF9hc3NpZ24oc3RydWN0IGV4ZWNsaXN0X3BvcnQgKnBvcnQsIHN0cnVjdCBpOTE1X3JlcXVlc3Qg KnJxKQogCXBvcnRfc2V0KHBvcnQsIHBvcnRfcGFjayhpOTE1X3JlcXVlc3RfZ2V0KHJxKSwgcG9y dF9jb3VudChwb3J0KSkpOwogfQogCi1zdGF0aWMgdm9pZCBpbmplY3RfcHJlZW1wdF9jb250ZXh0 KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKK3ZvaWQgaW50ZWxfbHJfaW5qZWN0X3By ZWVtcHRfY29udGV4dChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiB7CiAJc3RydWN0 IGludGVsX2VuZ2luZV9leGVjbGlzdHMgKmV4ZWNsaXN0cyA9ICZlbmdpbmUtPmV4ZWNsaXN0czsK IAlzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY2UgPQpAQCAtNjMyLDcgKzY2MSw3IEBAIHN0YXRpYyB2 b2lkIGV4ZWNsaXN0c19kZXF1ZXVlKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIAkJ CXJldHVybjsKIAogCQlpZiAobmVlZF9wcmVlbXB0KGVuZ2luZSwgbGFzdCwgZXhlY2xpc3RzLT5x dWV1ZV9wcmlvcml0eSkpIHsKLQkJCWluamVjdF9wcmVlbXB0X2NvbnRleHQoZW5naW5lKTsKKwkJ CWludGVsX2xyX2luamVjdF9wcmVlbXB0X2NvbnRleHQoZW5naW5lKTsKIAkJCXJldHVybjsKIAkJ fQogCkBAIC05ODEsNiArMTAxMCw4IEBAIHN0YXRpYyB2b2lkIHByb2Nlc3NfY3NiKHN0cnVjdCBp bnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIAkJICAgIGJ1ZlsyKmhlYWQgKyAxXSA9PSBleGVjbGlz dHMtPnByZWVtcHRfY29tcGxldGVfc3RhdHVzKSB7CiAJCQlHRU1fVFJBQ0UoIiVzIHByZWVtcHQt aWRsZVxuIiwgZW5naW5lLT5uYW1lKTsKIAkJCWNvbXBsZXRlX3ByZWVtcHRfY29udGV4dChleGVj bGlzdHMpOworCQkJLyogV2UgdHJpZWQgYW5kIHN1Y2NlZWRlZCBpbiBwcmVlbXB0aW5nIHRoZSBl bmdpbmUgKi8KKwkJCWVuZ2luZS0+aGFuZ2NoZWNrLnRyeV9wcmVlbXB0ID0gZmFsc2U7CiAJCQlj b250aW51ZTsKIAkJfQogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9s cmMuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5oCmluZGV4IGY1YTU1MDJlY2Y3 MC4uMTY0Y2Q5ZTdjZTA1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9s cmMuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuaApAQCAtMTAxLDYgKzEw MSw3IEBAIHN0cnVjdCBkcm1faTkxNV9wcml2YXRlOwogc3RydWN0IGk5MTVfZ2VtX2NvbnRleHQ7 CiAKIHZvaWQgaW50ZWxfbHJfY29udGV4dF9yZXN1bWUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2KTsKK3ZvaWQgaW50ZWxfbHJfaW5qZWN0X3ByZWVtcHRfY29udGV4dChzdHJ1Y3Qg aW50ZWxfZW5naW5lX2NzICplbmdpbmUpOwogCiB2b2lkIGludGVsX2V4ZWNsaXN0c19zZXRfZGVm YXVsdF9zdWJtaXNzaW9uKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSk7CiAKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaCBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaAppbmRleCA1N2YzNzg3ZWQ2ZWMuLmViMzhj MWJlYzk2YiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZl ci5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaApAQCAtMTI0 LDYgKzEyNCw3IEBAIHN0cnVjdCBpbnRlbF9lbmdpbmVfaGFuZ2NoZWNrIHsKIAlzdHJ1Y3QgaTkx NV9yZXF1ZXN0ICphY3RpdmVfcmVxdWVzdDsKIAlib29sIHN0YWxsZWQ6MTsKIAlib29sIHdlZGdl ZDoxOworCWJvb2wgdHJ5X3ByZWVtcHQ6MTsKIH07CiAKIHN0cnVjdCBpbnRlbF9yaW5nIHsKLS0g CjIuMTcuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K SW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0 dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==