From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH 14/21] drm/i915: Only apply one barrier after a breadcrumb interrupt is posted Date: Fri, 3 Jun 2016 17:08:46 +0100 Message-ID: <1464970133-29859-15-git-send-email-chris@chris-wilson.co.uk> References: <1464970133-29859-1-git-send-email-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5AE276EE05 for ; Fri, 3 Jun 2016 16:09:16 +0000 (UTC) Received: by mail-wm0-x242.google.com with SMTP id a20so428757wma.3 for ; Fri, 03 Jun 2016 09:09:16 -0700 (PDT) In-Reply-To: <1464970133-29859-1-git-send-email-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 SWYgd2UgZmxhZyB0aGUgc2Vxbm8gYXMgcG90ZW50aWFsbHkgc3RhbGUgdXBvbiByZWNlaXZpbmcg YW4gaW50ZXJydXB0LAp3ZSBjYW4gdXNlIHRoYXQgaW5mb3JtYXRpb24gdG8gcmVkdWNlIHRoZSBm cmVxdWVuY3kgdGhhdCB3ZSBhcHBseSB0aGUKaGVhdnl3ZWlnaHQgY29oZXJlbnQgc2Vxbm8gcmVh ZCAoaS5lLiBpZiB3ZSB3YWtlIHVwIGEgY2hhaW4gb2Ygd2FpdGVycykuCgpTaWduZWQtb2ZmLWJ5 OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KLS0tCiBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2Rydi5oICAgICAgICAgIHwgMTUgKysrKysrKysrKysrKystCiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jICAgICAgICAgIHwgIDEgKwogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfYnJlYWRjcnVtYnMuYyB8IDE2ICsrKysrKysrKystLS0tLS0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaCAgfCAgMSArCiA0IGZpbGVzIGNoYW5n ZWQsIDI2IGluc2VydGlvbnMoKyksIDcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2 LmgKaW5kZXggNGRkYjlmZjMxOWNiLi5hNzFkMDgxOTlkNTcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k cnYuaApAQCAtMzkzNSw3ICszOTM1LDIwIEBAIHN0YXRpYyBpbmxpbmUgYm9vbCBfX2k5MTVfcmVx dWVzdF9pcnFfY29tcGxldGUoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEpCiAJICog YnV0IGl0IGlzIGVhc2llciBhbmQgc2FmZXIgdG8gZG8gaXQgZXZlcnkgdGltZSB0aGUgd2FpdGVy CiAJICogaXMgd29rZW4uCiAJICovCi0JaWYgKGVuZ2luZS0+aXJxX3NlcW5vX2JhcnJpZXIpIHsK KwlpZiAoZW5naW5lLT5pcnFfc2Vxbm9fYmFycmllciAmJiBSRUFEX09OQ0UoZW5naW5lLT5pcnFf cG9zdGVkKSkgeworCQkvKiBUaGUgb3JkZXJpbmcgb2YgaXJxX3Bvc3RlZCB2ZXJzdXMgYXBwbHlp bmcgdGhlIGJhcnJpZXIKKwkJICogaXMgY3J1Y2lhbC4gVGhlIGNsZWFyaW5nIG9mIHRoZSBjdXJy ZW50IGlycV9wb3N0ZWQgbXVzdAorCQkgKiBiZSB2aXNpYmxlIGJlZm9yZSB3ZSBwZXJmb3JtIHRo ZSBiYXJyaWVyIG9wZXJhdGlvbiwKKwkJICogc3VjaCB0aGF0IGlmIGEgc3Vic2VxdWVudCBpbnRl cnJ1cHQgYXJyaXZlcywgaXJxX3Bvc3RlZAorCQkgKiBpcyByZWFzc2VydGVkIGFuZCBvdXIgdGFz ayByZXdva2VuICh3aGljaCBjYXVzZXMgdXMgdG8KKwkJICogZG8gYW5vdGhlciBfX2k5MTVfcmVx dWVzdF9pcnFfY29tcGxldGUoKSBpbW1lZGlhdGVseQorCQkgKiBhbmQgcmVhcHBseSB0aGUgYmFy cmllcikuIENvbnZlcnNlbHksIGlmIHRoZSBjbGVhcgorCQkgKiBvY2N1cnMgYWZ0ZXIgdGhlIGJh cnJpZXIsIHRoZW4gYW4gaW50ZXJydXB0IHRoYXQgYXJyaXZlZAorCQkgKiB3aGlsc3Qgd2Ugd2Fp dGVkIG9uIHRoZSBiYXJyaWVyIHdvdWxkIG5vdCB0cmlnZ2VyIGEKKwkJICogYmFycmllciBvbiB0 aGUgbmV4dCBwYXNzLCBhbmQgdGhlIHJlYWQgbWF5IG5vdCBzZWUgdGhlCisJCSAqIHNlcW5vIHVw ZGF0ZS4KKwkJICovCisJCVdSSVRFX09OQ0UoZW5naW5lLT5pcnFfcG9zdGVkLCBmYWxzZSk7CiAJ CWVuZ2luZS0+aXJxX3NlcW5vX2JhcnJpZXIoZW5naW5lKTsKIAkJaWYgKGk5MTVfZ2VtX3JlcXVl c3RfY29tcGxldGVkKHJlcSkpCiAJCQlyZXR1cm4gdHJ1ZTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfaXJxLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5j CmluZGV4IGMxNGViNTdiNTgwNy4uMTRiM2Q2NWJiNjA0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2lycS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJx LmMKQEAgLTk3Niw2ICs5NzYsNyBAQCBzdGF0aWMgdm9pZCBpcm9ubGFrZV9ycHNfY2hhbmdlX2ly cV9oYW5kbGVyKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAogc3RhdGljIHZv aWQgbm90aWZ5X3Jpbmcoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogeworCXNtcF9z dG9yZV9tYihlbmdpbmUtPmlycV9wb3N0ZWQsIHRydWUpOwogCWlmIChpbnRlbF9lbmdpbmVfd2Fr ZXVwKGVuZ2luZSkpIHsKIAkJdHJhY2VfaTkxNV9nZW1fcmVxdWVzdF9ub3RpZnkoZW5naW5lKTsK IAkJZW5naW5lLT51c2VyX2ludGVycnVwdHMrKzsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2JyZWFkY3J1bWJzLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9i cmVhZGNydW1icy5jCmluZGV4IDQ0MzQ2ZGUzOTc5NC4uMGY1ZmUxMTRjMjA0IDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9icmVhZGNydW1icy5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2JyZWFkY3J1bWJzLmMKQEAgLTQzLDEyICs0MywxOCBAQCBzdGF0 aWMgdm9pZCBpbnRlbF9icmVhZGNydW1ic19mYWtlX2lycSh1bnNpZ25lZCBsb25nIGRhdGEpCiAK IHN0YXRpYyB2b2lkIGlycV9lbmFibGUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQog eworCS8qIEVuYWJsaW5nIHRoZSBJUlEgbWF5IG1pc3MgdGhlIGdlbmVyYXRpb24gb2YgdGhlIGlu dGVycnVwdCwgYnV0CisJICogd2Ugc3RpbGwgbmVlZCB0byBmb3JjZSB0aGUgYmFycmllciBiZWZv cmUgcmVhZGluZyB0aGUgc2Vxbm8sCisJICoganVzdCBpbiBjYXNlLgorCSAqLworCWVuZ2luZS0+ aXJxX3Bvc3RlZCA9IHRydWU7CiAJV0FSTl9PTighZW5naW5lLT5pcnFfZ2V0KGVuZ2luZSkpOwog fQogCiBzdGF0aWMgdm9pZCBpcnFfZGlzYWJsZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdp bmUpCiB7CiAJZW5naW5lLT5pcnFfcHV0KGVuZ2luZSk7CisJZW5naW5lLT5pcnFfcG9zdGVkID0g ZmFsc2U7CiB9CiAKIHN0YXRpYyBib29sIF9faW50ZWxfYnJlYWRjcnVtYnNfZW5hYmxlX2lycShz dHJ1Y3QgaW50ZWxfYnJlYWRjcnVtYnMgKmIpCkBAIC01Niw3ICs2Miw2IEBAIHN0YXRpYyBib29s IF9faW50ZWxfYnJlYWRjcnVtYnNfZW5hYmxlX2lycShzdHJ1Y3QgaW50ZWxfYnJlYWRjcnVtYnMg KmIpCiAJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lID0KIAkJY29udGFpbmVyX29mKGIs IHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MsIGJyZWFkY3J1bWJzKTsKIAlzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqaTkxNSA9IGVuZ2luZS0+aTkxNTsKLQlib29sIGlycV9wb3N0ZWQgPSBmYWxzZTsK IAogCWFzc2VydF9zcGluX2xvY2tlZCgmYi0+bG9jayk7CiAJaWYgKGItPnJwbV93YWtlbG9jaykK QEAgLTcyLDEwICs3Nyw4IEBAIHN0YXRpYyBib29sIF9faW50ZWxfYnJlYWRjcnVtYnNfZW5hYmxl X2lycShzdHJ1Y3QgaW50ZWxfYnJlYWRjcnVtYnMgKmIpCiAKIAkvKiBObyBpbnRlcnJ1cHRzPyBL aWNrIHRoZSB3YWl0ZXIgZXZlcnkgamlmZmllISAqLwogCWlmIChpbnRlbF9pcnFzX2VuYWJsZWQo aTkxNSkpIHsKLQkJaWYgKCF0ZXN0X2JpdChlbmdpbmUtPmlkLCAmaTkxNS0+Z3B1X2Vycm9yLnRl c3RfaXJxX3JpbmdzKSkgeworCQlpZiAoIXRlc3RfYml0KGVuZ2luZS0+aWQsICZpOTE1LT5ncHVf ZXJyb3IudGVzdF9pcnFfcmluZ3MpKQogCQkJaXJxX2VuYWJsZShlbmdpbmUpOwotCQkJaXJxX3Bv c3RlZCA9IHRydWU7Ci0JCX0KIAkJYi0+aXJxX2VuYWJsZWQgPSB0cnVlOwogCX0KIApAQCAtODMs NyArODYsNyBAQCBzdGF0aWMgYm9vbCBfX2ludGVsX2JyZWFkY3J1bWJzX2VuYWJsZV9pcnEoc3Ry dWN0IGludGVsX2JyZWFkY3J1bWJzICpiKQogCSAgICB0ZXN0X2JpdChlbmdpbmUtPmlkLCAmaTkx NS0+Z3B1X2Vycm9yLm1pc3NlZF9pcnFfcmluZ3MpKQogCQltb2RfdGltZXIoJmItPmZha2VfaXJx LCBqaWZmaWVzICsgMSk7CiAKLQlyZXR1cm4gaXJxX3Bvc3RlZDsKKwlyZXR1cm4gUkVBRF9PTkNF KGVuZ2luZS0+aXJxX3Bvc3RlZCk7CiB9CiAKIHN0YXRpYyB2b2lkIF9faW50ZWxfYnJlYWRjcnVt YnNfZGlzYWJsZV9pcnEoc3RydWN0IGludGVsX2JyZWFkY3J1bWJzICpiKQpAQCAtMTk3LDcgKzIw MCw4IEBAIGJvb2wgaW50ZWxfZW5naW5lX2FkZF93YWl0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3Mg KmVuZ2luZSwKIAkJCSAqIGluIGNhc2UgdGhlIHNlcW5vIHBhc3NlZC4KIAkJCSAqLwogCQkJX19p bnRlbF9icmVhZGNydW1ic19lbmFibGVfaXJxKGIpOwotCQkJd2FrZV91cF9wcm9jZXNzKHRvX3dh aXQobmV4dCktPnRhc2spOworCQkJaWYgKFJFQURfT05DRShlbmdpbmUtPmlycV9wb3N0ZWQpKQor CQkJCXdha2VfdXBfcHJvY2Vzcyh0b193YWl0KG5leHQpLT50YXNrKTsKIAkJfQogCiAJCWRvIHsK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaCBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaAppbmRleCBjYjU5OWE1NDkzMWEu LjMyNGY4NWU4ZDU0MCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmlu Z2J1ZmZlci5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaApA QCAtMTk3LDYgKzE5Nyw3IEBAIHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgewogCXN0cnVjdCBpOTE1 X2N0eF93b3JrYXJvdW5kcyB3YV9jdHg7CiAKIAl1bnNpZ25lZCBpcnFfcmVmY291bnQ7IC8qIHBy b3RlY3RlZCBieSBkZXZfcHJpdi0+aXJxX2xvY2sgKi8KKwlib29sCQlpcnFfcG9zdGVkOwogCXUz MgkJaXJxX2VuYWJsZV9tYXNrOwkvKiBiaXRtYXNrIHRvIGVuYWJsZSByaW5nIGludGVycnVwdCAq LwogCXN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqdHJhY2VfaXJxX3JlcTsKIAlib29sIF9f bXVzdF9jaGVjayAoKmlycV9nZXQpKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpOwotLSAK Mi44LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCklu dGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRw czovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=