From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [PATCH 3/5] drm/i915: Add timeline barrier support Date: Wed, 30 Jan 2019 09:34:14 +0000 Message-ID: <20190130093416.3513-4-tvrtko.ursulin@linux.intel.com> References: <20190130093416.3513-1-tvrtko.ursulin@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by gabe.freedesktop.org (Postfix) with ESMTPS id 49A996E161 for ; Wed, 30 Jan 2019 09:34:16 +0000 (UTC) In-Reply-To: <20190130093416.3513-1-tvrtko.ursulin@linux.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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClRpbWVsaW5l IGJhcnJpZXIgYWxsb3dzIHNlcmlhbGl6YXRpb24gYmV0d2VlbiBkaWZmZXJlbnQgdGltZWxpbmVz LgoKQWZ0ZXIgY2FsbGluZyBpOTE1X3RpbWVsaW5lX3NldF9iYXJyaWVyIHdpdGggYSByZXF1ZXN0 LCBhbGwgZm9sbG93aW5nCnN1Ym1pc3Npb25zIG9uIHRoaXMgdGltZWxpbmUgd2lsbCBiZSBzZXQg dXAgYXMgZGVwZW5kaW5nIG9uIHRoaXMgcmVxdWVzdCwKb3IgYmFycmllci4gT25jZSB0aGUgYmFy cmllciBoYXMgYmVlbiBjb21wbGV0ZWQgaXQgYXV0b21hdGljYWxseSBnZXRzCmNsZWFyZWQgYW5k IHRoaW5ncyBjb250aW51ZSBhcyBub3JtYWwuCgpUaGlzIGZhY2lsaXR5IHdpbGwgYmUgdXNlZCBi eSB0aGUgdXBjb21pbmcgY29udGV4dCBTU0VVIGNvZGUuCgp2MjoKICogQXNzZXJ0IGJhcnJpZXIg aGFzIGJlZW4gcmV0aXJlZCBvbiB0aW1lbGluZV9maW5pLiAoQ2hyaXMgV2lsc29uKQogKiBGaXgg bW9ja190aW1lbGluZS4KCnYzOgogKiBJbXByb3ZlZCBjb21tZW50IGxhbmd1YWdlLiAoQ2hyaXMg V2lsc29uKQoKdjQ6CiAqIE1haW50YWluIG9yZGVyaW5nIHdpdGggcHJldmlvdXMgYmFycmllcnMg c2V0IG9uIHRoZSB0aW1lbGluZS4KCnY1OgogKiBSZWJhc2UuCgpTaWduZWQtb2ZmLWJ5OiBUdnJ0 a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgpTdWdnZXN0ZWQtYnk6IENocmlz IFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgpDYzogQ2hyaXMgV2lsc29uIDxjaHJp c0BjaHJpcy13aWxzb24uY28udWs+ClJldmlld2VkLWJ5OiBDaHJpcyBXaWxzb24gPGNocmlzQGNo cmlzLXdpbHNvbi5jby51az4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3JlcXVlc3Qu YyAgICAgICAgICAgfCAxNyArKysrKysrKysrKysrKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV90aW1lbGluZS5jICAgICAgICAgIHwgMjEgKysrKysrKysrKysrKysrKysrCiBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X3RpbWVsaW5lLmggICAgICAgICAgfCAyMiArKysrKysrKysrKysrKysr KysrCiAuLi4vZ3B1L2RybS9pOTE1L3NlbGZ0ZXN0cy9tb2NrX3RpbWVsaW5lLmMgICAgfCAgMSAr CiA0IGZpbGVzIGNoYW5nZWQsIDYxIGluc2VydGlvbnMoKykKCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X3JlcXVlc3QuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf cmVxdWVzdC5jCmluZGV4IDllZDViYWYxNTdhMy4uNGIxODY5Mjk1MzYyIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3JlcXVlc3QuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X3JlcXVlc3QuYwpAQCAtNTI2LDYgKzUyNiwxOSBAQCBpOTE1X3JlcXVlc3RfYWxs b2Nfc2xvdyhzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY2UpCiAJcmV0dXJuIGttZW1fY2FjaGVfYWxs b2MoY2UtPmdlbV9jb250ZXh0LT5pOTE1LT5yZXF1ZXN0cywgR0ZQX0tFUk5FTCk7CiB9CiAKK3N0 YXRpYyBpbnQgYWRkX2JhcnJpZXIoc3RydWN0IGk5MTVfcmVxdWVzdCAqcnEsIHN0cnVjdCBpOTE1 X2dlbV9hY3RpdmUgKmFjdGl2ZSkKK3sKKwlzdHJ1Y3QgaTkxNV9yZXF1ZXN0ICpiYXJyaWVyID0K KwkJaTkxNV9nZW1fYWN0aXZlX3JhdyhhY3RpdmUsICZycS0+aTkxNS0+ZHJtLnN0cnVjdF9tdXRl eCk7CisKKwlyZXR1cm4gYmFycmllciA/IGk5MTVfcmVxdWVzdF9hd2FpdF9kbWFfZmVuY2UocnEs ICZiYXJyaWVyLT5mZW5jZSkgOiAwOworfQorCitzdGF0aWMgaW50IGFkZF90aW1lbGluZV9iYXJy aWVyKHN0cnVjdCBpOTE1X3JlcXVlc3QgKnJxKQoreworCXJldHVybiBhZGRfYmFycmllcihycSwg JnJxLT50aW1lbGluZS0+YmFycmllcik7Cit9CisKIC8qKgogICogaTkxNV9yZXF1ZXN0X2FsbG9j IC0gYWxsb2NhdGUgYSByZXF1ZXN0IHN0cnVjdHVyZQogICoKQEAgLTY2OCw2ICs2ODEsMTAgQEAg aTkxNV9yZXF1ZXN0X2FsbG9jKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSwgc3RydWN0 IGk5MTVfZ2VtX2NvbnRleHQgKmN0eCkKIAkgKi8KIAlycS0+aGVhZCA9IHJxLT5yaW5nLT5lbWl0 OwogCisJcmV0ID0gYWRkX3RpbWVsaW5lX2JhcnJpZXIocnEpOworCWlmIChyZXQpCisJCWdvdG8g ZXJyX3Vud2luZDsKKwogCXJldCA9IGVuZ2luZS0+cmVxdWVzdF9hbGxvYyhycSk7CiAJaWYgKHJl dCkKIAkJZ290byBlcnJfdW53aW5kOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV90aW1lbGluZS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV90aW1lbGluZS5jCmlu ZGV4IDVlYTNhZjM5M2ZmZS4uZGNmZjNhZTk2NjgzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X3RpbWVsaW5lLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV90 aW1lbGluZS5jCkBAIC0xNjMsNiArMTYzLDcgQEAgaW50IGk5MTVfdGltZWxpbmVfaW5pdChzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSwKIAogCXNwaW5fbG9ja19pbml0KCZ0aW1lbGluZS0+ bG9jayk7CiAKKwlpbml0X3JlcXVlc3RfYWN0aXZlKCZ0aW1lbGluZS0+YmFycmllciwgTlVMTCk7 CiAJaW5pdF9yZXF1ZXN0X2FjdGl2ZSgmdGltZWxpbmUtPmxhc3RfcmVxdWVzdCwgTlVMTCk7CiAJ SU5JVF9MSVNUX0hFQUQoJnRpbWVsaW5lLT5yZXF1ZXN0cyk7CiAKQEAgLTIzNSw2ICsyMzYsNyBA QCB2b2lkIGk5MTVfdGltZWxpbmVfZmluaShzdHJ1Y3QgaTkxNV90aW1lbGluZSAqdGltZWxpbmUp CiB7CiAJR0VNX0JVR19PTih0aW1lbGluZS0+cGluX2NvdW50KTsKIAlHRU1fQlVHX09OKCFsaXN0 X2VtcHR5KCZ0aW1lbGluZS0+cmVxdWVzdHMpKTsKKwlHRU1fQlVHX09OKGk5MTVfZ2VtX2FjdGl2 ZV9pc3NldCgmdGltZWxpbmUtPmJhcnJpZXIpKTsKIAogCWk5MTVfc3luY21hcF9mcmVlKCZ0aW1l bGluZS0+c3luYyk7CiAJaHdzcF9mcmVlKHRpbWVsaW5lKTsKQEAgLTMwOSw2ICszMTEsMjUgQEAg dm9pZCBpOTE1X3RpbWVsaW5lX3VucGluKHN0cnVjdCBpOTE1X3RpbWVsaW5lICp0bCkKIAlfX2k5 MTVfdm1hX3VucGluKHRsLT5od3NwX2dndHQpOwogfQogCitpbnQgaTkxNV90aW1lbGluZV9zZXRf YmFycmllcihzdHJ1Y3QgaTkxNV90aW1lbGluZSAqdGwsIHN0cnVjdCBpOTE1X3JlcXVlc3QgKnJx KQoreworCXN0cnVjdCBpOTE1X3JlcXVlc3QgKm9sZDsKKwlpbnQgZXJyOworCisJbG9ja2RlcF9h c3NlcnRfaGVsZCgmcnEtPmk5MTUtPmRybS5zdHJ1Y3RfbXV0ZXgpOworCisJLyogTXVzdCBtYWlu dGFpbiBvcmRlcmluZyB3cnQgZXhpc3RpbmcgYmFycmllcnMgKi8KKwlvbGQgPSBpOTE1X2dlbV9h Y3RpdmVfcmF3KCZ0bC0+YmFycmllciwgJnJxLT5pOTE1LT5kcm0uc3RydWN0X211dGV4KTsKKwlp ZiAob2xkKSB7CisJCWVyciA9IGk5MTVfcmVxdWVzdF9hd2FpdF9kbWFfZmVuY2UocnEsICZvbGQt PmZlbmNlKTsKKwkJaWYgKGVycikKKwkJCXJldHVybiBlcnI7CisJfQorCisJaTkxNV9nZW1fYWN0 aXZlX3NldCgmdGwtPmJhcnJpZXIsIHJxKTsKKwlyZXR1cm4gMDsKK30KKwogdm9pZCBfX2k5MTVf dGltZWxpbmVfZnJlZShzdHJ1Y3Qga3JlZiAqa3JlZikKIHsKIAlzdHJ1Y3QgaTkxNV90aW1lbGlu ZSAqdGltZWxpbmUgPQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV90aW1l bGluZS5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV90aW1lbGluZS5oCmluZGV4IDhjYWVi NjZkMWNkNS4uZDE2N2UwNDA3M2M1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X3RpbWVsaW5lLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV90aW1lbGluZS5o CkBAIC03NCw2ICs3NCwxNiBAQCBzdHJ1Y3QgaTkxNV90aW1lbGluZSB7CiAJICovCiAJc3RydWN0 IGk5MTVfc3luY21hcCAqc3luYzsKIAorCS8qKgorCSAqIEJhcnJpZXIgcHJvdmlkZXMgdGhlIGFi aWxpdHkgdG8gc2VyaWFsaXplIG9yZGVyaW5nIGJldHdlZW4gZGlmZmVyZW50CisJICogdGltZWxp bmVzLgorCSAqCisJICogVXNlcnMgY2FuIGNhbGwgaTkxNV90aW1lbGluZV9zZXRfYmFycmllciB3 aGljaCB3aWxsIG1ha2UgYWxsCisJICogc3Vic2VxdWVudCBzdWJtaXNzaW9ucyB0byB0aGlzIHRp bWVsaW5lIGJlIGV4ZWN1dGVkIG9ubHkgYWZ0ZXIgdGhlCisJICogYmFycmllciBoYXMgYmVlbiBj b21wbGV0ZWQuCisJICovCisJc3RydWN0IGk5MTVfZ2VtX2FjdGl2ZSBiYXJyaWVyOworCiAJc3Ry dWN0IGxpc3RfaGVhZCBsaW5rOwogCWNvbnN0IGNoYXIgKm5hbWU7CiAJc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmk5MTU7CkBAIC0xNTUsNCArMTY1LDE2IEBAIHZvaWQgaTkxNV90aW1lbGluZXNf aW5pdChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSk7CiB2b2lkIGk5MTVfdGltZWxpbmVz X3Bhcmsoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUpOwogdm9pZCBpOTE1X3RpbWVsaW5l c19maW5pKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1KTsKIAorLyoqCisgKiBpOTE1X3Rp bWVsaW5lX3NldF9iYXJyaWVyIC0gb3JkZXJzIHN1Ym1pc3Npb24gYmV0d2VlbiBkaWZmZXJlbnQg dGltZWxpbmVzCisgKiBAdGltZWxpbmU6IHRpbWVsaW5lIHRvIHNldCB0aGUgYmFycmllciBvbgor ICogQHJxOiByZXF1ZXN0IGFmdGVyIHdoaWNoIG5ldyBzdWJtaXNzaW9ucyBjYW4gcHJvY2VlZAor ICoKKyAqIFNldHMgdGhlIHBhc3NlZCBpbiByZXF1ZXN0IGFzIHRoZSBzZXJpYWxpemF0aW9uIHBv aW50IGZvciBhbGwgc3Vic2VxdWVudAorICogc3VibWlzc2lvbnMgb24gQHRpbWVsaW5lLiBTdWJz ZXF1ZW50IHJlcXVlc3RzIHdpbGwgbm90IGJlIHN1Ym1pdHRlZCB0byBHUFUKKyAqIHVudGlsIHRo ZSBiYXJyaWVyIGhhcyBiZWVuIGNvbXBsZXRlZC4KKyAqLworaW50IGk5MTVfdGltZWxpbmVfc2V0 X2JhcnJpZXIoc3RydWN0IGk5MTVfdGltZWxpbmUgKnRpbWVsaW5lLAorCQkJICAgICAgc3RydWN0 IGk5MTVfcmVxdWVzdCAqcnEpOworCiAjZW5kaWYKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L3NlbGZ0ZXN0cy9tb2NrX3RpbWVsaW5lLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9z ZWxmdGVzdHMvbW9ja190aW1lbGluZS5jCmluZGV4IGNmMzljY2Q5ZmMwNS4uZTU2NTlhYWE4NTZk IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9zZWxmdGVzdHMvbW9ja190aW1lbGlu ZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L3NlbGZ0ZXN0cy9tb2NrX3RpbWVsaW5lLmMK QEAgLTE1LDYgKzE1LDcgQEAgdm9pZCBtb2NrX3RpbWVsaW5lX2luaXQoc3RydWN0IGk5MTVfdGlt ZWxpbmUgKnRpbWVsaW5lLCB1NjQgY29udGV4dCkKIAogCXNwaW5fbG9ja19pbml0KCZ0aW1lbGlu ZS0+bG9jayk7CiAKKwlpbml0X3JlcXVlc3RfYWN0aXZlKCZ0aW1lbGluZS0+YmFycmllciwgTlVM TCk7CiAJaW5pdF9yZXF1ZXN0X2FjdGl2ZSgmdGltZWxpbmUtPmxhc3RfcmVxdWVzdCwgTlVMTCk7 CiAJSU5JVF9MSVNUX0hFQUQoJnRpbWVsaW5lLT5yZXF1ZXN0cyk7CiAKLS0gCjIuMTkuMQoKX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1h aWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMu ZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==