From: oscar.mateo@intel.com Subject: [PATCH 31/42] drm/i915/bdw: Avoid non-lite-restore preemptions Date: Fri, 11 Jul 2014 16:49:23 +0100 Message-ID: <1405093774-11253-32-git-send-email-oscar.mateo@intel.com> References: <1405093774-11253-1-git-send-email-oscar.mateo@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 5EE0D6E86C for ; Fri, 11 Jul 2014 08:54:57 -0700 (PDT) In-Reply-To: <1405093774-11253-1-git-send-email-oscar.mateo@intel.com> 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 RnJvbTogT3NjYXIgTWF0ZW8gPG9zY2FyLm1hdGVvQGludGVsLmNvbT4KCkluIHRoZSBjdXJyZW50 IEV4ZWNsaXN0cyBmZWVkaW5nIG1lY2hhbmlzbSwgZnVsbCBwcmVlbXB0aW9uIGlzIG5vdApzdXBw b3J0ZWQgeWV0OiBvbmx5IGxpdGUtcmVzdG9yZXMgYXJlIGFsbG93ZWQgKHRoaXMgaXM6IHRoZSBH UFUKc2ltcGx5IHNhbXBsZXMgYSBuZXcgdGFpbCBwb2ludGVyIGZvciB0aGUgY29udGV4dCBjdXJy ZW50bHkgaW4KZXhlY3V0aW9uKS4KCkJ1dCB3ZSBoYXZlIGlkZW50aWZpZWQgYW4gc2NlbmFyaW8g aW4gd2hpY2ggYSBmdWxsIHByZWVtcHRpb24gb2NjdXJzOgoxKSBXZSBzdWJtaXQgdHdvIGNvbnRl eHRzIGZvciBleGVjdXRpb24gKEEgJiBCKS4KMikgVGhlIEdQVSBmaW5pc2hlcyB3aXRoIHRoZSBm aXJzdCBvbmUgKEEpLCBzd2l0Y2hlcyB0byB0aGUgc2Vjb25kIG9uZQooQikgYW5kIGluZm9ybXMg dXMuCjMpIFdlIHN1Ym1pdCBCIGFnYWluIChob3BpbmcgdG8gY2F1c2UgYSBsaXRlIHJlc3RvcmUp IHRvZ2V0aGVyIHdpdGggQywKYnV0IGluIHRoZSB0aW1lIHdlIHNwZW5kIHdyaXRpbmcgdG8gdGhl IEVMU1AsIHRoZSBHUFUgZmluaXNoZXMgQi4KNCkgVGhlIEdQVSBzdGFydCBleGVjdXRpbmcgQiBh Z2FpbiAoc2luY2Ugd2UgdG9sZCBpdCBzbykuCjUpIFdlIHJlY2VpdmUgYSBCIGZpbmlzaGVkIGlu dGVycnVwdCBhbmQsIG1pc3Rha2VubHksIHdlIHN1Ym1pdCBDIChhZ2FpbikKYW5kIEQsIGNhdXNp bmcgYSBmdWxsIHByZWVtcHRpb24gb2YgQi4KClRoZSByYWNlIGlzIGF2b2lkZWQgYnkga2VlcGlu ZyB0cmFjayBvZiBob3cgbWFueSB0aW1lcyBhIGNvbnRleHQgaGFzIGJlZW4Kc3VibWl0dGVkIHRv IHRoZSBoYXJkd2FyZSBhbmQgYnkgYmV0dGVyIGRpc2NyaW1pbmF0aW5nIHRoZSByZWNlaXZlZCBj b250ZXh0CnN3aXRjaCBpbnRlcnJ1cHRzOiBpbiB0aGUgZXhhbXBsZSwgd2hlbiB3ZSBoYXZlIHN1 Ym1pdHRlZCBCIHR3aWNlLCB3ZSB3b27CtHQKc3VibWl0IEMgYW5kIEQgYXMgc29vbiBhcyB3ZSBy ZWNlaXZlIHRoZSBub3RpZmljYXRpb24gdGhhdCBCIGlzIGNvbXBsZXRlZApiZWNhdXNlIHdlIHdl cmUgZXhwZWN0aW5nIHRvIGdldCBhIExJVEVfUkVTVE9SRSBhbmQgd2UgZGlkbsK0dCwgc28gd2Ug a25vdyBhCnNlY29uZCBjb21wbGV0aW9uIHdpbGwgYmUgcmVjZWl2ZWQgc2hvcnRseS4KCldpdGhv dXQgdGhpcyBleHBsaWNpdCBjaGVja2luZywgc29tZWhvdywgdGhlIGJhdGNoIGJ1ZmZlciBleGVj dXRpb24gb3JkZXIKZ2V0cyBtZXNzZWQgd2l0aC4gVGhpcyBjYW4gYmUgdmVyaWZpZWQgd2l0aCB0 aGUgSUdUIHRlc3QgSSBzZW50IHRvZ2V0aGVyIHdpdGgKdGhlIHNlcmllcy4gSSBkb27CtHQga25v dyB0aGUgZXhhY3QgbWVjaGFuaXNtIGJ5IHdoaWNoIHRoZSBwcmUtZW1wdGlvbiBtZXNzZXMKd2l0 aCB0aGUgZXhlY3V0aW9uIG9yZGVyIGJ1dCwgc2luY2Ugb3RoZXIgcGVvcGxlIGlzIHdvcmtpbmcg b24gdGhlIFNjaGVkdWxlcgorIFByZWVtcHRpb24gb24gRXhlY2xpc3RzLCBJIGRpZG7CtHQgdHJ5 IHRvIGZpeCBpdC4gSW4gdGhlc2Ugc2VyaWVzLCBvbmx5IExpdGUKUmVzdG9yZXMgYXJlIHN1cHBv cnRlZCAob3RoZXIga2luZCBvZiBwcmVlbXB0aW9ucyBXQVJOKS4KCnYyOiBlbHNwX3N1Ym1pdHRl ZCBiZWxvbmdzIGluIHRoZSBuZXcgaW50ZWxfY3R4X3N1Ym1pdF9yZXF1ZXN0LiBTZXZlcmFsCnJl YmFzZSBjaGFuZ2VzLgoKdjM6IENsYXJpZnkgaG93IHRoZSByYWNlIGlzIGF2b2lkZWQsIGFzIHJl cXVlc3RlZCBieSBEYW5pZWwuCgpTaWduZWQtb2ZmLWJ5OiBPc2NhciBNYXRlbyA8b3NjYXIubWF0 ZW9AaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jIHwgMjgg KysrKysrKysrKysrKysrKysrKysrKysrLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf bHJjLmggfCAgMiArKwogMiBmaWxlcyBjaGFuZ2VkLCAyNiBpbnNlcnRpb25zKCspLCA0IGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKaW5kZXggOWQzMjBmYS4uZDNlOTYxZSAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKQEAgLTI2NCw2ICsyNjQsNyBAQCBzdGF0aWMgdm9p ZCBleGVjbGlzdHNfY29udGV4dF91bnF1ZXVlKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcp CiAJCWVsc2UgaWYgKHJlcTAtPmN0eCA9PSBjdXJzb3ItPmN0eCkgewogCQkJLyogU2FtZSBjdHg6 IGlnbm9yZSBmaXJzdCByZXF1ZXN0LCBhcyBzZWNvbmQgcmVxdWVzdAogCQkJICogd2lsbCB1cGRh dGUgdGFpbCBwYXN0IGZpcnN0IHJlcXVlc3QncyB3b3JrbG9hZCAqLworCQkJY3Vyc29yLT5lbHNw X3N1Ym1pdHRlZCA9IHJlcTAtPmVsc3Bfc3VibWl0dGVkOwogCQkJbGlzdF9kZWwoJnJlcTAtPmV4 ZWNsaXN0X2xpbmspOwogCQkJcXVldWVfd29yayhkZXZfcHJpdi0+d3EsICZyZXEwLT53b3JrKTsK IAkJCXJlcTAgPSBjdXJzb3I7CkBAIC0yNzMsOCArMjc0LDE0IEBAIHN0YXRpYyB2b2lkIGV4ZWNs aXN0c19jb250ZXh0X3VucXVldWUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZykKIAkJfQog CX0KIAorCVdBUk5fT04ocmVxMSAmJiByZXExLT5lbHNwX3N1Ym1pdHRlZCk7CisKIAlCVUdfT04o ZXhlY2xpc3RzX3N1Ym1pdF9jb250ZXh0KHJpbmcsIHJlcTAtPmN0eCwgcmVxMC0+dGFpbCwKIAkJ CXJlcTE/IHJlcTEtPmN0eCA6IE5VTEwsIHJlcTE/IHJlcTEtPnRhaWwgOiAwKSk7CisKKwlyZXEw LT5lbHNwX3N1Ym1pdHRlZCsrOworCWlmIChyZXExKQorCQlyZXExLT5lbHNwX3N1Ym1pdHRlZCsr OwogfQogCiBzdGF0aWMgYm9vbCBleGVjbGlzdHNfY2hlY2tfcmVtb3ZlX3JlcXVlc3Qoc3RydWN0 IGludGVsX2VuZ2luZV9jcyAqcmluZywKQEAgLTI5MSw5ICsyOTgsMTMgQEAgc3RhdGljIGJvb2wg ZXhlY2xpc3RzX2NoZWNrX3JlbW92ZV9yZXF1ZXN0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJp bmcsCiAJCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpjdHhfb2JqID0KIAkJCQloZWFkX3Jl cS0+Y3R4LT5lbmdpbmVbcmluZy0+aWRdLnN0YXRlOwogCQlpZiAoaW50ZWxfZXhlY2xpc3RzX2N0 eF9pZChjdHhfb2JqKSA9PSByZXF1ZXN0X2lkKSB7Ci0JCQlsaXN0X2RlbCgmaGVhZF9yZXEtPmV4 ZWNsaXN0X2xpbmspOwotCQkJcXVldWVfd29yayhkZXZfcHJpdi0+d3EsICZoZWFkX3JlcS0+d29y ayk7Ci0JCQlyZXR1cm4gdHJ1ZTsKKwkJCVdBUk4oaGVhZF9yZXEtPmVsc3Bfc3VibWl0dGVkID09 IDAsCisJCQkJCSJOZXZlciBzdWJtaXR0ZWQgaGVhZCByZXF1ZXN0XG4iKTsKKwkJCWlmICgtLWhl YWRfcmVxLT5lbHNwX3N1Ym1pdHRlZCA8PSAwKSB7CisJCQkJbGlzdF9kZWwoJmhlYWRfcmVxLT5l eGVjbGlzdF9saW5rKTsKKwkJCQlxdWV1ZV93b3JrKGRldl9wcml2LT53cSwgJmhlYWRfcmVxLT53 b3JrKTsKKwkJCQlyZXR1cm4gdHJ1ZTsKKwkJCX0KIAkJfQogCX0KIApAQCAtMzI2LDcgKzMzNywx NiBAQCB2b2lkIGludGVsX2V4ZWNsaXN0c19oYW5kbGVfY3R4X2V2ZW50cyhzdHJ1Y3QgaW50ZWxf ZW5naW5lX2NzICpyaW5nKQogCQlzdGF0dXNfaWQgPSBJOTE1X1JFQUQoUklOR19DT05URVhUX1NU QVRVU19CVUYocmluZykgKwogCQkJCShyZWFkX3BvaW50ZXIgJSA2KSAqIDggKyA0KTsKIAotCQlp ZiAoc3RhdHVzICYgR0VOOF9DVFhfU1RBVFVTX0NPTVBMRVRFKSB7CisJCWlmIChzdGF0dXMgJiBH RU44X0NUWF9TVEFUVVNfUFJFRU1QVEVEKSB7CisJCQlpZiAoc3RhdHVzICYgR0VOOF9DVFhfU1RB VFVTX0xJVEVfUkVTVE9SRSkgeworCQkJCWlmIChleGVjbGlzdHNfY2hlY2tfcmVtb3ZlX3JlcXVl c3QocmluZywgc3RhdHVzX2lkKSkKKwkJCQkJV0FSTigxLCAiTGl0ZSBSZXN0b3JlZCByZXF1ZXN0 IHJlbW92ZWQgZnJvbSBxdWV1ZVxuIik7CisJCQl9IGVsc2UKKwkJCQlXQVJOKDEsICJQcmVlbXB0 aW9uIHdpdGhvdXQgTGl0ZSBSZXN0b3JlXG4iKTsKKwkJfQorCisJCSBpZiAoKHN0YXR1cyAmIEdF TjhfQ1RYX1NUQVRVU19BQ1RJVkVfSURMRSkgfHwKKwkJICAgICAoc3RhdHVzICYgR0VOOF9DVFhf U1RBVFVTX0VMRU1FTlRfU1dJVENIKSkgewogCQkJaWYgKGV4ZWNsaXN0c19jaGVja19yZW1vdmVf cmVxdWVzdChyaW5nLCBzdGF0dXNfaWQpKQogCQkJCXN1Ym1pdF9jb250ZXh0cysrOwogCQl9CmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuaCBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2xyYy5oCmluZGV4IDJlODkyOWYuLjA3NGI0NGYgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2xyYy5oCkBAIC02Nyw2ICs2Nyw4IEBAIHN0cnVjdCBpbnRlbF9jdHhfc3VibWl0 X3JlcXVlc3QgewogCiAJc3RydWN0IGxpc3RfaGVhZCBleGVjbGlzdF9saW5rOwogCXN0cnVjdCB3 b3JrX3N0cnVjdCB3b3JrOworCisJaW50IGVsc3Bfc3VibWl0dGVkOwogfTsKIAogdm9pZCBpbnRl bF9leGVjbGlzdHNfaGFuZGxlX2N0eF9ldmVudHMoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmlu Zyk7Ci0tIAoxLjkuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Au b3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1n ZngK