From mboxrd@z Thu Jan 1 00:00:00 1970 From: Keith Packard Subject: [PATCH 4/7] anv: Support wait for heterogeneous list of fences [v2] Date: Thu, 14 Jun 2018 19:52:53 -0700 Message-ID: <20180615025256.10657-5-keithp@keithp.com> References: <20180615025256.10657-1-keithp@keithp.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20180615025256.10657-1-keithp@keithp.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: mesa-dev@lists.freedesktop.org Cc: Keith Packard , dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org SGFuZGxlIHRoZSBjYXNlIHdoZXJlIHRoZSBzZXQgb2YgZmVuY2VzIHRvIHdhaXQgZm9yIGlzIG5v dCBhbGwgb2YgdGhlCnNhbWUgdHlwZSBieSBlaXRoZXIgd2FpdGluZyBmb3IgdGhlbSBzZXF1ZW50 aWFsbHkgKHdhaXRBbGwpLCBvcgpwb2xsaW5nIHRoZW0gdW50aWwgdGhlIHRpbWVyIGhhcyBleHBp cmVkICghd2FpdEFsbCkuIFdlIGhvcGUgdGhlCmxhdHRlciBjYXNlIGlzIG5vdCBjb21tb24uCgpX aGlsZSB0aGUgY3VycmVudCBjb2RlIG1ha2VzIHN1cmUgdGhhdCBpdCBhbHdheXMgaGFzIGZlbmNl cyBvZiBvbmx5Cm9uZSB0eXBlLCB0aGF0IHdpbGwgbm90IGJlIHRydWUgd2hlbiB3ZSBhZGQgV1NJ IGZlbmNlcy4gU3BsaXQgb3V0IHRoaXMKcmVmYWN0b3JpbmcgdG8gbWFrZSBtZXJnaW5nIHRoYXQg Y2xlYXJlci4KCnYyOiBBZG9wdCBKYXNvbiBFa3N0cmFuZCdzIGNvZGluZyBjb252ZW50aW9ucwoK ICAgIERlY2xhcmUgdmFyaWFibGVzIGF0IGZpcnN0IHVzZSwgZWxpbWluYXRlIGV4dHJhIHdoaXRl c3BhY2UgYmV0d2VlbgogICAgdHlwZXMgYW5kIG5hbWVzLiBXcmFwIGxpbmVzIHRvIDgwIGNvbHVt bnMuCgogICAgU3VnZ2VzdGVkLWJ5OiBKYXNvbiBFa3N0cmFuZCA8amFzb24uZWtzdHJhbmRAaW50 ZWwuY29tPgoKU2lnbmVkLW9mZi1ieTogS2VpdGggUGFja2FyZCA8a2VpdGhwQGtlaXRocC5jb20+ Ci0tLQogc3JjL2ludGVsL3Z1bGthbi9hbnZfcXVldWUuYyB8IDEwNSArKysrKysrKysrKysrKysr KysrKysrKysrKysrKy0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDg4IGluc2VydGlvbnMoKyksIDE3 IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3NyYy9pbnRlbC92dWxrYW4vYW52X3F1ZXVlLmMg Yi9zcmMvaW50ZWwvdnVsa2FuL2Fudl9xdWV1ZS5jCmluZGV4IDZmZTA0YTBhMTlkLi44ZGY5OWM4 NDU0OSAxMDA2NDQKLS0tIGEvc3JjL2ludGVsL3Z1bGthbi9hbnZfcXVldWUuYworKysgYi9zcmMv aW50ZWwvdnVsa2FuL2Fudl9xdWV1ZS5jCkBAIC00NTksMTIgKzQ1OSwzMiBAQCBnZXR0aW1lX25z KHZvaWQpCiAgICByZXR1cm4gKHVpbnQ2NF90KWN1cnJlbnQudHZfc2VjICogTlNFQ19QRVJfU0VD ICsgY3VycmVudC50dl9uc2VjOwogfQogCitzdGF0aWMgdWludDY0X3QgYW52X2dldF9hYnNvbHV0 ZV90aW1lb3V0KHVpbnQ2NF90IHRpbWVvdXQpCit7CisgICBpZiAodGltZW91dCA9PSAwKQorICAg ICAgcmV0dXJuIDA7CisgICB1aW50NjRfdCBjdXJyZW50X3RpbWUgPSBnZXR0aW1lX25zKCk7CisK KyAgIHRpbWVvdXQgPSBNSU4yKElOVDY0X01BWCAtIGN1cnJlbnRfdGltZSwgdGltZW91dCk7CisK KyAgIHJldHVybiAoY3VycmVudF90aW1lICsgdGltZW91dCk7Cit9CisKK3N0YXRpYyBpbnQ2NF90 IGFudl9nZXRfcmVsYXRpdmVfdGltZW91dCh1aW50NjRfdCBhYnNfdGltZW91dCkKK3sKKyAgIHVp bnQ2NF90IG5vdyA9IGdldHRpbWVfbnMoKTsKKworICAgaWYgKGFic190aW1lb3V0IDwgbm93KQor ICAgICAgcmV0dXJuIDA7CisgICByZXR1cm4gYWJzX3RpbWVvdXQgLSBub3c7Cit9CisKIHN0YXRp YyBWa1Jlc3VsdAogYW52X3dhaXRfZm9yX3N5bmNvYmpfZmVuY2VzKHN0cnVjdCBhbnZfZGV2aWNl ICpkZXZpY2UsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdWludDMyX3QgZmVuY2VDb3Vu dCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBWa0ZlbmNlICpwRmVuY2VzLAog ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJvb2wgd2FpdEFsbCwKLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICB1aW50NjRfdCBfdGltZW91dCkKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICB1aW50NjRfdCBhYnNfdGltZW91dF9ucykKIHsKICAgIHVpbnQzMl90ICpzeW5jb2JqcyA9 IHZrX3phbGxvYygmZGV2aWNlLT5hbGxvYywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBzaXplb2YoKnN5bmNvYmpzKSAqIGZlbmNlQ291bnQsIDgsCkBAIC00ODQsMTkgKzUwNCw2 IEBAIGFudl93YWl0X2Zvcl9zeW5jb2JqX2ZlbmNlcyhzdHJ1Y3QgYW52X2RldmljZSAqZGV2aWNl LAogICAgICAgc3luY29ianNbaV0gPSBpbXBsLT5zeW5jb2JqOwogICAgfQogCi0gICBpbnQ2NF90 IGFic190aW1lb3V0X25zID0gMDsKLSAgIGlmIChfdGltZW91dCA+IDApIHsKLSAgICAgIHVpbnQ2 NF90IGN1cnJlbnRfbnMgPSBnZXR0aW1lX25zKCk7Ci0KLSAgICAgIC8qIEFkZCBidXQgc2F0dXJh dGUgdG8gSU5UMzJfTUFYICovCi0gICAgICBpZiAoY3VycmVudF9ucyArIF90aW1lb3V0IDwgY3Vy cmVudF9ucykKLSAgICAgICAgIGFic190aW1lb3V0X25zID0gSU5UNjRfTUFYOwotICAgICAgZWxz ZSBpZiAoY3VycmVudF9ucyArIF90aW1lb3V0ID4gSU5UNjRfTUFYKQotICAgICAgICAgYWJzX3Rp bWVvdXRfbnMgPSBJTlQ2NF9NQVg7Ci0gICAgICBlbHNlCi0gICAgICAgICBhYnNfdGltZW91dF9u cyA9IGN1cnJlbnRfbnMgKyBfdGltZW91dDsKLSAgIH0KLQogICAgLyogVGhlIGdlbV9zeW5jb2Jq X3dhaXQgaW9jdGwgbWF5IHJldHVybiBlYXJseSBkdWUgdG8gYW4gaW5oZXJlbnQKICAgICAqIGxp bWl0YXRpb24gaW4gdGhlIHdheSBpdCBjb21wdXRlcyB0aW1lb3V0cy4gIExvb3AgdW50aWwgd2Un dmUgYWN0dWFsbHkKICAgICAqIHBhc3NlZCB0aGUgdGltZW91dC4KQEAgLTY2NSw2ICs2NzIsNjcg QEAgZG9uZToKICAgIHJldHVybiByZXN1bHQ7CiB9CiAKK3N0YXRpYyBWa1Jlc3VsdAorYW52X3dh aXRfZm9yX2ZlbmNlcyhzdHJ1Y3QgYW52X2RldmljZSAqZGV2aWNlLAorICAgICAgICAgICAgICAg ICAgICB1aW50MzJfdCBmZW5jZUNvdW50LAorICAgICAgICAgICAgICAgICAgICBjb25zdCBWa0Zl bmNlICpwRmVuY2VzLAorICAgICAgICAgICAgICAgICAgICBib29sIHdhaXRBbGwsCisgICAgICAg ICAgICAgICAgICAgIHVpbnQ2NF90IGFic190aW1lb3V0KQoreworICAgVmtSZXN1bHQgcmVzdWx0 ID0gVktfU1VDQ0VTUzsKKworICAgaWYgKGZlbmNlQ291bnQgPD0gMSB8fCB3YWl0QWxsKSB7Cisg ICAgICBmb3IgKHVpbnQzMl90IGkgPSAwOyBpIDwgZmVuY2VDb3VudDsgaSsrKSB7CisgICAgICAg ICBBTlZfRlJPTV9IQU5ETEUoYW52X2ZlbmNlLCBmZW5jZSwgcEZlbmNlc1tpXSk7CisgICAgICAg ICBzd2l0Y2ggKGZlbmNlLT5wZXJtYW5lbnQudHlwZSkgeworICAgICAgICAgY2FzZSBBTlZfRkVO Q0VfVFlQRV9CTzoKKyAgICAgICAgICAgIHJlc3VsdCA9IGFudl93YWl0X2Zvcl9ib19mZW5jZXMo CisgICAgICAgICAgICAgICBkZXZpY2UsIDEsICZwRmVuY2VzW2ldLCB0cnVlLAorICAgICAgICAg ICAgICAgYW52X2dldF9yZWxhdGl2ZV90aW1lb3V0KGFic190aW1lb3V0KSk7CisgICAgICAgICAg ICBicmVhazsKKyAgICAgICAgIGNhc2UgQU5WX0ZFTkNFX1RZUEVfU1lOQ09CSjoKKyAgICAgICAg ICAgIHJlc3VsdCA9IGFudl93YWl0X2Zvcl9zeW5jb2JqX2ZlbmNlcyhkZXZpY2UsIDEsICZwRmVu Y2VzW2ldLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IHRydWUsIGFic190aW1lb3V0KTsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgY2FzZSBB TlZfRkVOQ0VfVFlQRV9OT05FOgorICAgICAgICAgICAgcmVzdWx0ID0gVktfU1VDQ0VTUzsKKyAg ICAgICAgICAgIGJyZWFrOworICAgICAgICAgfQorICAgICAgICAgaWYgKHJlc3VsdCAhPSBWS19T VUNDRVNTKQorICAgICAgICAgICAgcmV0dXJuIHJlc3VsdDsKKyAgICAgIH0KKyAgIH0gZWxzZSB7 CisgICAgICB3aGlsZSAoZ2V0dGltZV9ucygpIDwgYWJzX3RpbWVvdXQpIHsKKyAgICAgICAgIGZv ciAodWludDMyX3QgaSA9IDA7IGkgPCBmZW5jZUNvdW50OyBpKyspIHsKKyAgICAgICAgICAgIGlm IChhbnZfd2FpdF9mb3JfZmVuY2VzKGRldmljZSwgMSwgJnBGZW5jZXNbaV0sIHRydWUsIDApID09 IFZLX1NVQ0NFU1MpCisgICAgICAgICAgICAgICByZXR1cm4gVktfU1VDQ0VTUzsKKyAgICAgICAg IH0KKyAgICAgIH0KKyAgICAgIHJlc3VsdCA9IFZLX1RJTUVPVVQ7CisgICB9CisgICByZXR1cm4g cmVzdWx0OworfQorCitzdGF0aWMgYm9vbCBhbnZfYWxsX2ZlbmNlc19zeW5jb2JqKHVpbnQzMl90 IGZlbmNlQ291bnQsIGNvbnN0IFZrRmVuY2UgKnBGZW5jZXMpCit7CisgICBmb3IgKHVpbnQzMl90 IGkgPSAwOyBpIDwgZmVuY2VDb3VudDsgKytpKSB7CisgICAgICBBTlZfRlJPTV9IQU5ETEUoYW52 X2ZlbmNlLCBmZW5jZSwgcEZlbmNlc1tpXSk7CisgICAgICBpZiAoZmVuY2UtPnBlcm1hbmVudC50 eXBlICE9IEFOVl9GRU5DRV9UWVBFX1NZTkNPQkopCisgICAgICAgICByZXR1cm4gZmFsc2U7Cisg ICB9CisgICByZXR1cm4gdHJ1ZTsKK30KKworc3RhdGljIGJvb2wgYW52X2FsbF9mZW5jZXNfYm8o dWludDMyX3QgZmVuY2VDb3VudCwgY29uc3QgVmtGZW5jZSAqcEZlbmNlcykKK3sKKyAgIGZvciAo dWludDMyX3QgaSA9IDA7IGkgPCBmZW5jZUNvdW50OyArK2kpIHsKKyAgICAgIEFOVl9GUk9NX0hB TkRMRShhbnZfZmVuY2UsIGZlbmNlLCBwRmVuY2VzW2ldKTsKKyAgICAgIGlmIChmZW5jZS0+cGVy bWFuZW50LnR5cGUgIT0gQU5WX0ZFTkNFX1RZUEVfQk8pCisgICAgICAgICByZXR1cm4gZmFsc2U7 CisgICB9CisgICByZXR1cm4gdHJ1ZTsKK30KKwogVmtSZXN1bHQgYW52X1dhaXRGb3JGZW5jZXMo CiAgICAgVmtEZXZpY2UgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBfZGV2aWNl LAogICAgIHVpbnQzMl90ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZmVuY2VD b3VudCwKQEAgLTY3NywxMiArNzQ1LDE1IEBAIFZrUmVzdWx0IGFudl9XYWl0Rm9yRmVuY2VzKAog ICAgaWYgKHVubGlrZWx5KGRldmljZS0+bG9zdCkpCiAgICAgICByZXR1cm4gVktfRVJST1JfREVW SUNFX0xPU1Q7CiAKLSAgIGlmIChkZXZpY2UtPmluc3RhbmNlLT5waHlzaWNhbERldmljZS5oYXNf c3luY29ial93YWl0KSB7CisgICBpZiAoYW52X2FsbF9mZW5jZXNfc3luY29iaihmZW5jZUNvdW50 LCBwRmVuY2VzKSkgewogICAgICAgcmV0dXJuIGFudl93YWl0X2Zvcl9zeW5jb2JqX2ZlbmNlcyhk ZXZpY2UsIGZlbmNlQ291bnQsIHBGZW5jZXMsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHdhaXRBbGwsIHRpbWVvdXQpOwotICAgfSBlbHNlIHsKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgd2FpdEFsbCwgYW52X2dldF9hYnNvbHV0ZV90 aW1lb3V0KHRpbWVvdXQpKTsKKyAgIH0gZWxzZSBpZiAoYW52X2FsbF9mZW5jZXNfYm8oZmVuY2VD b3VudCwgcEZlbmNlcykpIHsKICAgICAgIHJldHVybiBhbnZfd2FpdF9mb3JfYm9fZmVuY2VzKGRl dmljZSwgZmVuY2VDb3VudCwgcEZlbmNlcywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHdhaXRBbGwsIHRpbWVvdXQpOworICAgfSBlbHNlIHsKKyAgICAgIHJldHVybiBhbnZf d2FpdF9mb3JfZmVuY2VzKGRldmljZSwgZmVuY2VDb3VudCwgcEZlbmNlcywKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIHdhaXRBbGwsIGFudl9nZXRfYWJzb2x1dGVfdGltZW91dCh0 aW1lb3V0KSk7CiAgICB9CiB9CiAKLS0gCjIuMTcuMQoKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxA bGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxt YW4vbGlzdGluZm8vZHJpLWRldmVsCg==