From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH v9 1/6] drm/i915: Add per context timelines for fence objects Date: Wed, 1 Jun 2016 18:07:23 +0100 Message-ID: <1464800848-36672-2-git-send-email-John.C.Harrison@Intel.com> References: <1464800848-36672-1-git-send-email-John.C.Harrison@Intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 478C86E9FE for ; Wed, 1 Jun 2016 17:08:30 +0000 (UTC) In-Reply-To: <1464800848-36672-1-git-send-email-John.C.Harrison@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 RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KClRoZSBwdXJw b3NlIG9mIHRoaXMgcGF0Y2ggc2VyaWVzIGlzIHRvIGNvbnZlcnQgdGhlIHJlcXVzdCBzdHJ1Y3R1 cmUgdG8KdXNlIGZlbmNlIG9iamVjdHMgZm9yIHRoZSB1bmRlcmx5aW5nIGNvbXBsZXRpb24gdHJh Y2tpbmcuIFRoZSBmZW5jZQpvYmplY3QgcmVxdWlyZXMgYSBzZXF1ZW5jZSBudW1iZXIuIFRoZSB1 bHRpbWF0ZSBhaW0gaXMgdG8gdXNlIHRoZSBzYW1lCnNlcXVlbmNlIG51bWJlciBhcyBmb3IgdGhl IHJlcXVlc3QgaXRzZWxmIChvciByYXRoZXIsIHRvIHJlbW92ZSB0aGUKcmVxdWVzdCdzIHNlcW5v IGZpZWxkIGFuZCBqdXN0IHVzZSB0aGUgZmVuY2UncyB2YWx1ZSB0aHJvdWdob3V0IHRoZQpkcml2 ZXIpLiBIb3dldmVyLCB0aGlzIGlzIG5vdCBjdXJyZW50bHkgcG9zc2libGUgYW5kIHNvIHRoaXMg cGF0Y2gKaW50cm9kdWNlcyBhIHNlcGFyYXRlIG51bWJlcmluZyBzY2hlbWUgYXMgYW4gaW50ZXJt ZWRpYXRlIHN0ZXAuCgpBIG1ham9yIGFkdmFudGFnZSBvZiB1c2luZyB0aGUgZmVuY2Ugb2JqZWN0 IGlzIHRoYXQgaXQgY2FuIGJlIHBhc3NlZApvdXRzaWRlIG9mIHRoZSBpOTE1IGRyaXZlciBhbmQg dXNlZCBleHRlcm5hbGx5LiBUaGUgZmVuY2UgQVBJIGFsbG93cwpmb3IgdmFyaW91cyBvcGVyYXRp b25zIHN1Y2ggYXMgY29tYmluaW5nIG11bHRpcGxlIGZlbmNlcy4gVGhpcwpyZXF1aXJlcyB0aGF0 IGZlbmNlIHNlcW5vcyB3aXRoaW4gYSBzaW5nbGUgZmVuY2UgY29udGV4dCBiZSBndWFyYW50ZWVk CmluLW9yZGVyLiBUaGUgR1BVIHNjaGVkdWxlciB0aGF0IGlzIGNvbWluZyBjYW4gcmUtb3JkZXIg cmVxdWVzdApleGVjdXRpb24gYnV0IG5vdCB3aXRoaW4gYSBzaW5nbGUgR1BVIGNvbnRleHQuIFRo dXMgdGhlIGZlbmNlIGNvbnRleHQKbXVzdCBiZSB0aWVkIHRvIHRoZSBpOTE1IGNvbnRleHQgKGFu ZCB0aGUgZW5naW5lIHdpdGhpbiB0aGUgY29udGV4dCBhcwplYWNoIGVuZ2luZSBydW5zIGFzeW5j aHJvbm91c2x5KS4KCk9uIHRoZSBvdGhlciBoYW5kLCB0aGUgZHJpdmVyIGFzIGEgd2hvbGUgY3Vy cmVudGx5IG9ubHkgd29ya3Mgd2l0aApyZXF1ZXN0IHNlcW5vcyB0aGF0IGFyZSBhbGxvY2F0ZWQg ZnJvbSBhIGdsb2JhbCBpbi1vcmRlciB0aW1lbGluZS4gSXQKd2lsbCByZXF1aXJlIGEgZmFpciBj aHVuayBvZiByZS13b3JrIHRvIGFsbG93IG11bHRpcGxlIGluZGVwZW5kZW50CnNlcW5vIHRpbWVs aW5lcyB0byBiZSB1c2VkLiBIZW5jZSB0aGUgaW50cm9kdWN0aW9uIG9mIGEgdGVtcG9yYXJ5LApm ZW5jZSBzcGVjaWZpYyB0aW1lbGluZS4gT25jZSB0aGUgd29yayB0byB1cGRhdGUgdGhlIHJlc3Qg b2YgdGhlCmRyaXZlciBoYXMgYmVlbiBjb21wbGV0ZWQgdGhlbiB0aGUgcmVxdWVzdCBjYW4gdXNl IHRoZSBmZW5jZSBzZXFubwppbnN0ZWFkLgoKdjI6IE5ldyBwYXRjaCBpbiBzZXJpZXMuCgp2Mzog UmVuYW1lZC9yZXR5cGVkIHRpbWVsaW5lIHN0cnVjdHVyZSBmaWVsZHMgYWZ0ZXIgcmV2aWV3IGNv bW1lbnRzIGJ5ClR2cnRrbyBVcnN1bGluLgoKQWRkZWQgY29udGV4dCBpbmZvcm1hdGlvbiB0byB0 aGUgdGltZWxpbmUncyBuYW1lIHN0cmluZyBmb3IgYmV0dGVyCmlkZW50aWZpY2F0aW9uIGluIGRl YnVnZnMgb3V0cHV0LgoKdjU6IExpbmUgd3JhcHBpbmcgYW5kIG90aGVyIHdoaXRlIHNwYWNlIGZp eGVzIHRvIGtlZXAgc3R5bGUgY2hlY2tlcgpoYXBweS4KCnY3OiBVcGRhdGVkIHRvIG5ld2VyIG5p Z2h0bHkgKGxvdHMgb2YgcmluZyAtPiBlbmdpbmUgcmVuYW1pbmcpLgoKdjg6IE1vdmVkIHRvIGVh cmxpZXIgaW4gcGF0Y2ggc2VyaWVzIHNvIG5vIGxvbmdlciBuZWVkcyB0byByZW1vdmUgdGhlCnF1 aWNrIGhhY2sgdGltZWxpbmUgdGhhdCB3YXMgYmVpbmcgYWRkZWQgYmVmb3JlLgoKdjk6IFVwZGF0 ZWQgdG8gYW5vdGhlciBuZXdlciBuaWdodGx5IChjaGFuZ2VzIHRvIGNvbnRleHQgc3RydWN0dXJl Cm5hbWluZykuIEFsc28gdXBkYXRlZCBjb21taXQgbWVzc2FnZSB0byBtYXRjaCBwcmV2aW91cyBj aGFuZ2VzLgoKRm9yOiBWSVotNTE5MApTaWduZWQtb2ZmLWJ5OiBKb2huIEhhcnJpc29uIDxKb2hu LkMuSGFycmlzb25ASW50ZWwuY29tPgpDYzogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGlu QGludGVsLmNvbT4KQ2M6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51 eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgICAg IHwgMTQgKysrKysrKysrKysrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jICAgICAg ICAgfCA0MCArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysKIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYyB8IDE2ICsrKysrKysrKysrKysKIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2xyYy5jICAgICAgICB8ICA4ICsrKysrKysKIDQgZmlsZXMgY2hhbmdl ZCwgNzggaW5zZXJ0aW9ucygrKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IDJhODhhNDYu LmE1ZjhhZDggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtODMxLDYgKzgzMSwxOSBAQCBz dHJ1Y3QgaTkxNV9jdHhfaGFuZ19zdGF0cyB7CiAJYm9vbCBiYW5uZWQ7CiB9OwogCitzdHJ1Y3Qg aTkxNV9mZW5jZV90aW1lbGluZSB7CisJY2hhciAgICAgICAgbmFtZVszMl07CisJdW5zaWduZWQg ICAgZmVuY2VfY29udGV4dDsKKwl1bnNpZ25lZCAgICBuZXh0OworCisJc3RydWN0IGk5MTVfZ2Vt X2NvbnRleHQgKmN0eDsKKwlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmU7Cit9OworCitp bnQgaTkxNV9jcmVhdGVfZmVuY2VfdGltZWxpbmUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKKwkJ CSAgICAgICBzdHJ1Y3QgaTkxNV9nZW1fY29udGV4dCAqY3R4LAorCQkJICAgICAgIHN0cnVjdCBp bnRlbF9lbmdpbmVfY3MgKnJpbmcpOworCiAvKiBUaGlzIG11c3QgbWF0Y2ggdXAgd2l0aCB0aGUg dmFsdWUgcHJldmlvdXNseSB1c2VkIGZvciBleGVjYnVmMi5yc3ZkMS4gKi8KICNkZWZpbmUgREVG QVVMVF9DT05URVhUX0hBTkRMRSAwCiAKQEAgLTg3NSw2ICs4ODgsNyBAQCBzdHJ1Y3QgaTkxNV9n ZW1fY29udGV4dCB7CiAJCXU2NCBscmNfZGVzYzsKIAkJaW50IHBpbl9jb3VudDsKIAkJYm9vbCBp bml0aWFsaXNlZDsKKwkJc3RydWN0IGk5MTVfZmVuY2VfdGltZWxpbmUgZmVuY2VfdGltZWxpbmU7 CiAJfSBlbmdpbmVbSTkxNV9OVU1fRU5HSU5FU107CiAKIAlzdHJ1Y3QgbGlzdF9oZWFkIGxpbms7 CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9nZW0uYwppbmRleCA1ZmZjNmZhLi41N2QzNTkzIDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ2VtLmMKQEAgLTI3NDMsNiArMjc0Myw0NiBAQCB2b2lkIGk5MTVfZ2VtX3JlcXVl c3RfZnJlZShzdHJ1Y3Qga3JlZiAqcmVxX3JlZikKIAlrbWVtX2NhY2hlX2ZyZWUocmVxLT5pOTE1 LT5yZXF1ZXN0cywgcmVxKTsKIH0KIAoraW50IGk5MTVfY3JlYXRlX2ZlbmNlX3RpbWVsaW5lKHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYsCisJCQkgICAgICAgc3RydWN0IGk5MTVfZ2VtX2NvbnRleHQg KmN0eCwKKwkJCSAgICAgICBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCit7CisJc3Ry dWN0IGk5MTVfZmVuY2VfdGltZWxpbmUgKnRpbWVsaW5lOworCisJdGltZWxpbmUgPSAmY3R4LT5l bmdpbmVbZW5naW5lLT5pZF0uZmVuY2VfdGltZWxpbmU7CisKKwlpZiAodGltZWxpbmUtPmVuZ2lu ZSkKKwkJcmV0dXJuIDA7CisKKwl0aW1lbGluZS0+ZmVuY2VfY29udGV4dCA9IGZlbmNlX2NvbnRl eHRfYWxsb2MoMSk7CisKKwkvKgorCSAqIFN0YXJ0IHRoZSB0aW1lbGluZSBmcm9tIHNlcW5vIDAg YXMgdGhpcyBpcyBhIHNwZWNpYWwgdmFsdWUKKwkgKiB0aGF0IGlzIHJlc2VydmVkIGZvciBpbnZh bGlkIHN5bmMgcG9pbnRzLgorCSAqLworCXRpbWVsaW5lLT5uZXh0ICAgICAgID0gMTsKKwl0aW1l bGluZS0+Y3R4ICAgICAgICA9IGN0eDsKKwl0aW1lbGluZS0+ZW5naW5lICAgICA9IGVuZ2luZTsK KworCXNucHJpbnRmKHRpbWVsaW5lLT5uYW1lLCBzaXplb2YodGltZWxpbmUtPm5hbWUpLCAiJWQ+ JXM6JWQiLAorCQkgdGltZWxpbmUtPmZlbmNlX2NvbnRleHQsIGVuZ2luZS0+bmFtZSwgY3R4LT51 c2VyX2hhbmRsZSk7CisKKwlyZXR1cm4gMDsKK30KKwordW5zaWduZWQgaTkxNV9mZW5jZV90aW1l bGluZV9nZXRfbmV4dF9zZXFubyhzdHJ1Y3QgaTkxNV9mZW5jZV90aW1lbGluZSAqdGltZWxpbmUp Cit7CisJdW5zaWduZWQgc2Vxbm87CisKKwlzZXFubyA9IHRpbWVsaW5lLT5uZXh0OworCisJLyog UmVzZXJ2ZSB6ZXJvIGZvciBpbnZhbGlkICovCisJaWYgKCsrdGltZWxpbmUtPm5leHQgPT0gMCkK KwkJdGltZWxpbmUtPm5leHQgPSAxOworCisJcmV0dXJuIHNlcW5vOworfQorCiBzdGF0aWMgaW5s aW5lIGludAogX19pOTE1X2dlbV9yZXF1ZXN0X2FsbG9jKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3Mg KmVuZ2luZSwKIAkJCSBzdHJ1Y3QgaTkxNV9nZW1fY29udGV4dCAqY3R4LApkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5jIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9nZW1fY29udGV4dC5jCmluZGV4IGQwZTdmYzYuLjA3ZDhjNjMgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYworKysgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMKQEAgLTMyMCw2ICszMjAsMjIgQEAgaTkx NV9nZW1fY3JlYXRlX2NvbnRleHQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAlpZiAoSVNfRVJS KGN0eCkpCiAJCXJldHVybiBjdHg7CiAKKwlpZiAoIWk5MTUuZW5hYmxlX2V4ZWNsaXN0cykgewor CQlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmU7CisKKwkJLyogQ3JlYXRlIGEgcGVyIGNv bnRleHQgdGltZWxpbmUgZm9yIGZlbmNlcyAqLworCQlmb3JfZWFjaF9lbmdpbmUoZW5naW5lLCB0 b19pOTE1KGRldikpIHsKKwkJCWludCByZXQgPSBpOTE1X2NyZWF0ZV9mZW5jZV90aW1lbGluZShk ZXYsIGN0eCwgZW5naW5lKTsKKwkJCWlmIChyZXQpIHsKKwkJCQlEUk1fRVJST1IoIkZlbmNlIHRp bWVsaW5lIGNyZWF0aW9uIGZhaWxlZCBmb3IgbGVnYWN5ICVzOiAlcFxuIiwKKwkJCQkJICBlbmdp bmUtPm5hbWUsIGN0eCk7CisJCQkJaWRyX3JlbW92ZSgmZmlsZV9wcml2LT5jb250ZXh0X2lkciwg Y3R4LT51c2VyX2hhbmRsZSk7CisJCQkJaTkxNV9nZW1fY29udGV4dF91bnJlZmVyZW5jZShjdHgp OworCQkJCXJldHVybiBFUlJfUFRSKHJldCk7CisJCQl9CisJCX0KKwl9CisKIAlpZiAoVVNFU19G VUxMX1BQR1RUKGRldikpIHsKIAkJc3RydWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0ID0gaTkxNV9w cGd0dF9jcmVhdGUoZGV2LCBmaWxlX3ByaXYpOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9scmMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCmlu ZGV4IDVjMTkxYTEuLjE0YmNmYjcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2xyYy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCkBAIC0yNDk2 LDYgKzI0OTYsMTQgQEAgc3RhdGljIGludCBleGVjbGlzdHNfY29udGV4dF9kZWZlcnJlZF9hbGxv YyhzdHJ1Y3QgaTkxNV9nZW1fY29udGV4dCAqY3R4LAogCQlnb3RvIGVycm9yX3JpbmdidWY7CiAJ fQogCisJLyogQ3JlYXRlIGEgcGVyIGNvbnRleHQgdGltZWxpbmUgZm9yIGZlbmNlcyAqLworCXJl dCA9IGk5MTVfY3JlYXRlX2ZlbmNlX3RpbWVsaW5lKGN0eC0+aTkxNS0+ZGV2LCBjdHgsIGVuZ2lu ZSk7CisJaWYgKHJldCkgeworCQlEUk1fRVJST1IoIkZlbmNlIHRpbWVsaW5lIGNyZWF0aW9uIGZh aWxlZCBmb3IgZW5naW5lICVzLCBjdHggJXBcbiIsCisJCQkgIGVuZ2luZS0+bmFtZSwgY3R4KTsK KwkJZ290byBlcnJvcl9yaW5nYnVmOworCX0KKwogCWNlLT5yaW5nYnVmID0gcmluZ2J1ZjsKIAlj ZS0+c3RhdGUgPSBjdHhfb2JqOwogCWNlLT5pbml0aWFsaXNlZCA9IGVuZ2luZS0+aW5pdF9jb250 ZXh0ID09IE5VTEw7Ci0tIAoxLjkuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJl ZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGlu Zm8vaW50ZWwtZ2Z4Cg==