From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH 10/12] drm/i915: Flush idle barriers when waiting Date: Tue, 22 Oct 2019 23:38:29 +0100 Message-ID: <20191022223831.22677-10-chris@chris-wilson.co.uk> References: <20191022223831.22677-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 991966E91B for ; Tue, 22 Oct 2019 22:39:04 +0000 (UTC) In-Reply-To: <20191022223831.22677-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 SWYgd2UgZG8gZmluZCBvdXJzZWx2ZXMgd2l0aCBhbiBpZGxlIGJhcnJpZXIgaW5zaWRlIG91ciBh Y3RpdmUgd2hpbGUKd2FpdGluZywgYXR0ZW1wdCB0byBmbHVzaCBpdCBieSBlbWl0dGluZyBhIHB1 bHNlIHVzaW5nIHRoZSBrZXJuZWwKY29udGV4dC4KClNpZ25lZC1vZmYtYnk6IENocmlzIFdpbHNv biA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfYWN0aXZlLmMgICAgICAgICAgIHwgMjEgKysrKysrKystCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9zZWxmdGVzdHMvaTkxNV9hY3RpdmUuYyB8IDQ2ICsrKysrKysrKysrKysrKysrKysrCiAyIGZp bGVzIGNoYW5nZWQsIDY1IGluc2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9hY3RpdmUuYyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfYWN0aXZlLmMKaW5kZXggMDdkMzlmMjJhMmMzLi40YzE5MGE1NDhiYTcgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfYWN0aXZlLmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9hY3RpdmUuYwpAQCAtNiw2ICs2LDcgQEAKIAogI2luY2x1ZGUgPGxp bnV4L2RlYnVnb2JqZWN0cy5oPgogCisjaW5jbHVkZSAiZ3QvaW50ZWxfZW5naW5lX2hlYXJ0YmVh dC5oIgogI2luY2x1ZGUgImd0L2ludGVsX2VuZ2luZV9wbS5oIgogCiAjaW5jbHVkZSAiaTkxNV9k cnYuaCIKQEAgLTQzNSw2ICs0MzYsMjEgQEAgc3RhdGljIHZvaWQgZW5hYmxlX3NpZ25hbGluZyhz dHJ1Y3QgaTkxNV9hY3RpdmVfZmVuY2UgKmFjdGl2ZSkKIAlkbWFfZmVuY2VfcHV0KGZlbmNlKTsK IH0KIAorc3RhdGljIGludCBmbHVzaF9iYXJyaWVyKHN0cnVjdCBhY3RpdmVfbm9kZSAqaXQpCit7 CisJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lOworCisJaWYgKCFpc19iYXJyaWVyKCZp dC0+YmFzZSkpCisJCXJldHVybiAwOworCisJZW5naW5lID0gX19iYXJyaWVyX3RvX2VuZ2luZShp dCk7CisJc21wX3JtYigpOyAvKiBzZXJpYWxpc2Ugd2l0aCBhZGRfYWN0aXZlX2JhcnJpZXJzICov CisJaWYgKCFpc19iYXJyaWVyKCZpdC0+YmFzZSkpCisJCXJldHVybiAwOworCisJcmV0dXJuIGlu dGVsX2VuZ2luZV9mbHVzaF9iYXJyaWVycyhlbmdpbmUpOworfQorCiBpbnQgaTkxNV9hY3RpdmVf d2FpdChzdHJ1Y3QgaTkxNV9hY3RpdmUgKnJlZikKIHsKIAlzdHJ1Y3QgYWN0aXZlX25vZGUgKml0 LCAqbjsKQEAgLTQ0OCw4ICs0NjQsOSBAQCBpbnQgaTkxNV9hY3RpdmVfd2FpdChzdHJ1Y3QgaTkx NV9hY3RpdmUgKnJlZikKIAkvKiBGbHVzaCBsYXp5IHNpZ25hbHMgKi8KIAllbmFibGVfc2lnbmFs aW5nKCZyZWYtPmV4Y2wpOwogCXJidHJlZV9wb3N0b3JkZXJfZm9yX2VhY2hfZW50cnlfc2FmZShp dCwgbiwgJnJlZi0+dHJlZSwgbm9kZSkgewotCQlpZiAoaXNfYmFycmllcigmaXQtPmJhc2UpKSAv KiB1bmNvbm5lY3RlZCBpZGxlIGJhcnJpZXIgKi8KLQkJCWNvbnRpbnVlOworCQllcnIgPSBmbHVz aF9iYXJyaWVyKGl0KTsgLyogdW5jb25uZWN0ZWQgaWRsZSBiYXJyaWVyPyAqLworCQlpZiAoZXJy KQorCQkJYnJlYWs7CiAKIAkJZW5hYmxlX3NpZ25hbGluZygmaXQtPmJhc2UpOwogCX0KZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L3NlbGZ0ZXN0cy9pOTE1X2FjdGl2ZS5jIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvc2VsZnRlc3RzL2k5MTVfYWN0aXZlLmMKaW5kZXggOTY1MTNhN2Q0 NzM5Li5hY2ExMDdjYjYxNzYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L3NlbGZ0 ZXN0cy9pOTE1X2FjdGl2ZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L3NlbGZ0ZXN0cy9p OTE1X2FjdGl2ZS5jCkBAIC0xOTMsMTEgKzE5Myw1NyBAQCBzdGF0aWMgaW50IGxpdmVfYWN0aXZl X3JldGlyZSh2b2lkICphcmcpCiAJcmV0dXJuIGVycjsKIH0KIAorc3RhdGljIGludCBsaXZlX2Fj dGl2ZV9iYXJyaWVyKHZvaWQgKmFyZykKK3sKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkx NSA9IGFyZzsKKwlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmU7CisJc3RydWN0IGxpdmVf YWN0aXZlICphY3RpdmU7CisJaW50IGVyciA9IDA7CisKKwkvKiBDaGVjayB0aGF0IHdlIGdldCBh IGNhbGxiYWNrIHdoZW4gcmVxdWVzdHMgcmV0aXJlIHVwb24gd2FpdGluZyAqLworCisJYWN0aXZl ID0gX19saXZlX2FsbG9jKGk5MTUpOworCWlmICghYWN0aXZlKQorCQlyZXR1cm4gLUVOT01FTTsK KworCWVyciA9IGk5MTVfYWN0aXZlX2FjcXVpcmUoJmFjdGl2ZS0+YmFzZSk7CisJaWYgKGVycikK KwkJZ290byBvdXQ7CisKKwlmb3JfZWFjaF91YWJpX2VuZ2luZShlbmdpbmUsIGk5MTUpIHsKKwkJ ZXJyID0gaTkxNV9hY3RpdmVfYWNxdWlyZV9wcmVhbGxvY2F0ZV9iYXJyaWVyKCZhY3RpdmUtPmJh c2UsCisJCQkJCQkJICAgICAgZW5naW5lKTsKKwkJaWYgKGVycikKKwkJCWJyZWFrOworCisJCWk5 MTVfYWN0aXZlX2FjcXVpcmVfYmFycmllcigmYWN0aXZlLT5iYXNlKTsKKwl9CisKKwlpOTE1X2Fj dGl2ZV9yZWxlYXNlKCZhY3RpdmUtPmJhc2UpOworCisJaWYgKGVyciA9PSAwKQorCQllcnIgPSBp OTE1X2FjdGl2ZV93YWl0KCZhY3RpdmUtPmJhc2UpOworCisJaWYgKGVyciA9PSAwICYmICFSRUFE X09OQ0UoYWN0aXZlLT5yZXRpcmVkKSkgeworCQlwcl9lcnIoImk5MTVfYWN0aXZlIG5vdCByZXRp cmVkIGFmdGVyIGZsdXNoaW5nIGJhcnJpZXJzIVxuIik7CisJCWVyciA9IC1FSU5WQUw7CisJfQor CitvdXQ6CisJX19saXZlX3B1dChhY3RpdmUpOworCisJaWYgKGlndF9mbHVzaF90ZXN0KGk5MTUp KQorCQllcnIgPSAtRUlPOworCisJcmV0dXJuIGVycjsKK30KKwogaW50IGk5MTVfYWN0aXZlX2xp dmVfc2VsZnRlc3RzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1KQogewogCXN0YXRpYyBj b25zdCBzdHJ1Y3QgaTkxNV9zdWJ0ZXN0IHRlc3RzW10gPSB7CiAJCVNVQlRFU1QobGl2ZV9hY3Rp dmVfd2FpdCksCiAJCVNVQlRFU1QobGl2ZV9hY3RpdmVfcmV0aXJlKSwKKwkJU1VCVEVTVChsaXZl X2FjdGl2ZV9iYXJyaWVyKSwKIAl9OwogCiAJaWYgKGludGVsX2d0X2lzX3dlZGdlZCgmaTkxNS0+ Z3QpKQotLSAKMi4yNC4wLnJjMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRl c2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8v aW50ZWwtZ2Z4