From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH 02/34] drm/i915/execlists: Suppress preempting self Date: Mon, 21 Jan 2019 22:20:45 +0000 Message-ID: <20190121222117.23305-3-chris@chris-wilson.co.uk> References: <20190121222117.23305-1-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from fireflyinternet.com (mail.fireflyinternet.com [109.228.58.192]) by gabe.freedesktop.org (Postfix) with ESMTPS id 329B46E246 for ; Mon, 21 Jan 2019 22:39:27 +0000 (UTC) In-Reply-To: <20190121222117.23305-1-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: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org SW4gb3JkZXIgdG8gYXZvaWQgcHJlZW1wdGluZyBvdXJzZWx2ZXMsIHdlIGN1cnJlbnRseSByZWZ1 c2UgdG8gc2NoZWR1bGUKdGhlIHRhc2tsZXQgaWYgd2UgcmVzY2hlZHVsZSBhbiBpbmZsaWdodCBj b250ZXh0LiBIb3dldmVyLCB0aGlzIGdsb3NzZXMKb3ZlciBhIGZldyBpc3N1ZXMgc3VjaCBhcyB3 aGF0IGhhcHBlbnMgYWZ0ZXIgYSBDUyBjb21wbGV0aW9uIGV2ZW50IGFuZAp3ZSB0aGVuIHByZWVt cHQgdGhlIG5ld2x5IGV4ZWN1dGluZyBjb250ZXh0IHdpdGggaXRzZWxmLCBvciBpZiBzb21ldGhp bmcKZWxzZSBjYXVzZXMgYSB0YXNrbGV0X3NjaGVkdWxlIHRyaWdnZXJpbmcgdGhlIHNhbWUgZXZh bHVhdGlvbiB0bwpwcmVlbXB0IHRoZSBhY3RpdmUgY29udGV4dCB3aXRoIGl0c2VsZi4KClRvIGF2 b2lkIHRoZSBleHRyYSBjb21wbGljYXRpb25zLCBhZnRlciBkZWNpZGluZyB0aGF0IHdlIGhhdmUK cG90ZW50aWFsbHkgcXVldWVkIGEgcmVxdWVzdCB3aXRoIGhpZ2hlciBwcmlvcml0eSB0aGFuIHRo ZSBjdXJyZW50bHkKZXhlY3V0aW5nIHJlcXVlc3QsIGluc3BlY3QgdGhlIGhlYWQgb2YgdGhlIHF1 ZXVlIHRvIHNlZSBpZiBpdCBpcyBpbmRlZWQKaGlnaGVyIHByaW9yaXR5IGZyb20gYW5vdGhlciBj b250ZXh0LgoKUmVmZXJlbmNlczogYTJiZjkyZThjYzE2ICgiZHJtL2k5MTUvZXhlY2xpc3RzOiBB dm9pZCBraWNraW5nIHByaW9yaXR5IG9uIHRoZSBjdXJyZW50IGNvbnRleHQiKQpTaWduZWQtb2Zm LWJ5OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KQ2M6IFR2cnRrbyBV cnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9zY2hlZHVsZXIuYyB8IDIwICsrKysrKysrKysrKysrLS0tLQogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfbHJjLmMgICAgICB8IDI5ICsrKysrKysrKysrKysrKysrKysrKysrKysr LQogMiBmaWxlcyBjaGFuZ2VkLCA0NCBpbnNlcnRpb25zKCspLCA1IGRlbGV0aW9ucygtKQoKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfc2NoZWR1bGVyLmMgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X3NjaGVkdWxlci5jCmluZGV4IDM0MGZhZWE2YzA4YS4uZmI1ZDk1 MzQzMGU1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3NjaGVkdWxlci5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfc2NoZWR1bGVyLmMKQEAgLTIzOSw2ICsy MzksMTggQEAgc2NoZWRfbG9ja19lbmdpbmUoc3RydWN0IGk5MTVfc2NoZWRfbm9kZSAqbm9kZSwg c3RydWN0IGludGVsX2VuZ2luZV9jcyAqbG9ja2VkKQogCXJldHVybiBlbmdpbmU7CiB9CiAKK3N0 YXRpYyBib29sIGluZmxpZ2h0KGNvbnN0IHN0cnVjdCBpOTE1X3JlcXVlc3QgKnJxLAorCQkgICAg IGNvbnN0IHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKK3sKKwljb25zdCBzdHJ1Y3Qg aTkxNV9yZXF1ZXN0ICphY3RpdmU7CisKKwlpZiAoIXJxLT5nbG9iYWxfc2Vxbm8pCisJCXJldHVy biBmYWxzZTsKKworCWFjdGl2ZSA9IHBvcnRfcmVxdWVzdChlbmdpbmUtPmV4ZWNsaXN0cy5wb3J0 KTsKKwlyZXR1cm4gYWN0aXZlLT5od19jb250ZXh0ID09IHJxLT5od19jb250ZXh0OworfQorCiBz dGF0aWMgdm9pZCBfX2k5MTVfc2NoZWR1bGUoc3RydWN0IGk5MTVfcmVxdWVzdCAqcnEsCiAJCQkg ICAgY29uc3Qgc3RydWN0IGk5MTVfc2NoZWRfYXR0ciAqYXR0cikKIHsKQEAgLTMyOCw2ICszNDAs NyBAQCBzdGF0aWMgdm9pZCBfX2k5MTVfc2NoZWR1bGUoc3RydWN0IGk5MTVfcmVxdWVzdCAqcnEs CiAJCUlOSVRfTElTVF9IRUFEKCZkZXAtPmRmc19saW5rKTsKIAogCQllbmdpbmUgPSBzY2hlZF9s b2NrX2VuZ2luZShub2RlLCBlbmdpbmUpOworCQlsb2NrZGVwX2Fzc2VydF9oZWxkKCZlbmdpbmUt PnRpbWVsaW5lLmxvY2spOwogCiAJCS8qIFJlY2hlY2sgYWZ0ZXIgYWNxdWlyaW5nIHRoZSBlbmdp bmUtPnRpbWVsaW5lLmxvY2sgKi8KIAkJaWYgKHByaW8gPD0gbm9kZS0+YXR0ci5wcmlvcml0eSB8 fCBub2RlX3NpZ25hbGVkKG5vZGUpKQpAQCAtMzU2LDE3ICszNjksMTYgQEAgc3RhdGljIHZvaWQg X19pOTE1X3NjaGVkdWxlKHN0cnVjdCBpOTE1X3JlcXVlc3QgKnJxLAogCQlpZiAocHJpbyA8PSBl bmdpbmUtPmV4ZWNsaXN0cy5xdWV1ZV9wcmlvcml0eSkKIAkJCWNvbnRpbnVlOwogCisJCWVuZ2lu ZS0+ZXhlY2xpc3RzLnF1ZXVlX3ByaW9yaXR5ID0gcHJpbzsKKwogCQkvKgogCQkgKiBJZiB3ZSBh cmUgYWxyZWFkeSB0aGUgY3VycmVudGx5IGV4ZWN1dGluZyBjb250ZXh0LCBkb24ndAogCQkgKiBi b3RoZXIgZXZhbHVhdGluZyBpZiB3ZSBzaG91bGQgcHJlZW1wdCBvdXJzZWx2ZXMuCiAJCSAqLwot CQlpZiAobm9kZV90b19yZXF1ZXN0KG5vZGUpLT5nbG9iYWxfc2Vxbm8gJiYKLQkJICAgIGk5MTVf c2Vxbm9fcGFzc2VkKHBvcnRfcmVxdWVzdChlbmdpbmUtPmV4ZWNsaXN0cy5wb3J0KS0+Z2xvYmFs X3NlcW5vLAotCQkJCSAgICAgIG5vZGVfdG9fcmVxdWVzdChub2RlKS0+Z2xvYmFsX3NlcW5vKSkK KwkJaWYgKGluZmxpZ2h0KG5vZGVfdG9fcmVxdWVzdChub2RlKSwgZW5naW5lKSkKIAkJCWNvbnRp bnVlOwogCiAJCS8qIERlZmVyICh0YXNrbGV0KSBzdWJtaXNzaW9uIHVudGlsIGFmdGVyIGFsbCBv ZiBvdXIgdXBkYXRlcy4gKi8KLQkJZW5naW5lLT5leGVjbGlzdHMucXVldWVfcHJpb3JpdHkgPSBw cmlvOwogCQl0YXNrbGV0X2hpX3NjaGVkdWxlKCZlbmdpbmUtPmV4ZWNsaXN0cy50YXNrbGV0KTsK IAl9CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKaW5kZXggYjc0ZjI1NDIwNjgzLi4yOGQxODM0 Mzk5NTIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCkBAIC0xOTAsNiArMTkwLDMwIEBAIHN0 YXRpYyBpbmxpbmUgYm9vbCBuZWVkX3ByZWVtcHQoY29uc3Qgc3RydWN0IGludGVsX2VuZ2luZV9j cyAqZW5naW5lLAogCQkhaTkxNV9yZXF1ZXN0X2NvbXBsZXRlZChsYXN0KSk7CiB9CiAKK3N0YXRp YyBpbmxpbmUgYm9vbCBjaGVja19wcmVlbXB0KGNvbnN0IHN0cnVjdCBpbnRlbF9lbmdpbmVfY3Mg KmVuZ2luZSwKKwkJCQkgY29uc3Qgc3RydWN0IGk5MTVfcmVxdWVzdCAqcnEpCit7CisJY29uc3Qg c3RydWN0IGludGVsX2NvbnRleHQgKmN0eCA9IHJxLT5od19jb250ZXh0OworCWNvbnN0IGludCBw cmlvID0gcnFfcHJpbyhycSk7CisJc3RydWN0IHJiX25vZGUgKnJiOworCWludCBpZHg7CisKKwls aXN0X2Zvcl9lYWNoX2VudHJ5X2NvbnRpbnVlKHJxLCAmZW5naW5lLT50aW1lbGluZS5yZXF1ZXN0 cywgbGluaykgeworCQlHRU1fQlVHX09OKHJxLT5od19jb250ZXh0ID09IGN0eCk7CisJCWlmIChy cV9wcmlvKHJxKSA+IHByaW8pCisJCQlyZXR1cm4gdHJ1ZTsKKwl9CisKKwlyYiA9IHJiX2ZpcnN0 X2NhY2hlZCgmZW5naW5lLT5leGVjbGlzdHMucXVldWUpOworCWlmICghcmIpCisJCXJldHVybiBm YWxzZTsKKworCXByaW9saXN0X2Zvcl9lYWNoX3JlcXVlc3QocnEsIHRvX3ByaW9saXN0KHJiKSwg aWR4KQorCQlyZXR1cm4gcnEtPmh3X2NvbnRleHQgIT0gY3R4ICYmIHJxX3ByaW8ocnEpID4gcHJp bzsKKworCXJldHVybiBmYWxzZTsKK30KKwogLyoKICAqIFRoZSBjb250ZXh0IGRlc2NyaXB0b3Ig ZW5jb2RlcyB2YXJpb3VzIGF0dHJpYnV0ZXMgb2YgYSBjb250ZXh0LAogICogaW5jbHVkaW5nIGl0 cyBHVFQgYWRkcmVzcyBhbmQgc29tZSBmbGFncy4gQmVjYXVzZSBpdCdzIGZhaXJseQpAQCAtNTgw LDcgKzYwNCw4IEBAIHN0YXRpYyB2b2lkIGV4ZWNsaXN0c19kZXF1ZXVlKHN0cnVjdCBpbnRlbF9l bmdpbmVfY3MgKmVuZ2luZSkKIAkJaWYgKCFleGVjbGlzdHNfaXNfYWN0aXZlKGV4ZWNsaXN0cywg RVhFQ0xJU1RTX0FDVElWRV9IV0FDSykpCiAJCQlyZXR1cm47CiAKLQkJaWYgKG5lZWRfcHJlZW1w dChlbmdpbmUsIGxhc3QsIGV4ZWNsaXN0cy0+cXVldWVfcHJpb3JpdHkpKSB7CisJCWlmIChuZWVk X3ByZWVtcHQoZW5naW5lLCBsYXN0LCBleGVjbGlzdHMtPnF1ZXVlX3ByaW9yaXR5KSAmJgorCQkg ICAgY2hlY2tfcHJlZW1wdChlbmdpbmUsIGxhc3QpKSB7CiAJCQlpbmplY3RfcHJlZW1wdF9jb250 ZXh0KGVuZ2luZSk7CiAJCQlyZXR1cm47CiAJCX0KQEAgLTg3Miw2ICs4OTcsOCBAQCBzdGF0aWMg dm9pZCBwcm9jZXNzX2NzYihzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiAJY29uc3Qg dTMyICogY29uc3QgYnVmID0gZXhlY2xpc3RzLT5jc2Jfc3RhdHVzOwogCXU4IGhlYWQsIHRhaWw7 CiAKKwlsb2NrZGVwX2Fzc2VydF9oZWxkKCZlbmdpbmUtPnRpbWVsaW5lLmxvY2spOworCiAJLyoK IAkgKiBOb3RlIHRoYXQgY3NiX3dyaXRlLCBjc2Jfc3RhdHVzIG1heSBiZSBlaXRoZXIgaW4gSFdT UCBvciBtbWlvLgogCSAqIFdoZW4gcmVhZGluZyBmcm9tIHRoZSBjc2Jfd3JpdGUgbW1pbyByZWdp c3Rlciwgd2UgaGF2ZSB0byBiZQotLSAKMi4yMC4xCgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBs aXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1h bi9saXN0aW5mby9pbnRlbC1nZngK