From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH v8 1/6] drm/i915: Add per context timelines to fence object Date: Thu, 12 May 2016 22:06:31 +0100 Message-ID: <1463087196-11688-2-git-send-email-John.C.Harrison@Intel.com> References: <1463087196-11688-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 mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id 6D7EC6E8AF for ; Thu, 12 May 2016 21:06:40 +0000 (UTC) In-Reply-To: <1463087196-11688-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 RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KClRoZSBmZW5j ZSBvYmplY3QgdXNlZCBpbnNpZGUgdGhlIHJlcXVlc3Qgc3RydWN0dXJlIHJlcXVpcmVzIGEgc2Vx dWVuY2UKbnVtYmVyLiBBbHRob3VnaCB0aGlzIGlzIG5vdCB1c2VkIGJ5IHRoZSBpOTE1IGRyaXZl ciBpdHNlbGYsIGl0IGNvdWxkCnBvdGVudGlhbGx5IGJlIHVzZWQgYnkgbm9uLWk5MTUgY29kZSBp ZiB0aGUgZmVuY2UgaXMgcGFzc2VkIG91dHNpZGUgb2YKdGhlIGRyaXZlci4gVGhpcyBpcyB0aGUg aW50ZW50aW9uIGFzIGl0IGFsbG93cyBleHRlcm5hbCBrZXJuZWwgZHJpdmVycwphbmQgdXNlciBh cHBsaWNhdGlvbnMgdG8gd2FpdCBvbiBiYXRjaCBidWZmZXIgY29tcGxldGlvbgphc3luY2hyb25v dXNseSB2aWEgdGhlIGRtYS1idWZmIGZlbmNlIEFQSS4KClRvIGVuc3VyZSB0aGF0IHN1Y2ggZXh0 ZXJuYWwgdXNlcnMgYXJlIG5vdCBjb25mdXNlZCBieSBzdHJhbmdlIHRoaW5ncwpoYXBwZW5pbmcg d2l0aCB0aGUgc2Vxbm8sIHRoaXMgcGF0Y2ggYWRkcyBpbiBhIHBlciBjb250ZXh0IHRpbWVsaW5l CnRoYXQgY2FuIHByb3ZpZGUgYSBndWFyYW50ZWVkIGluLW9yZGVyIHNlcW5vIHZhbHVlIGZvciB0 aGUgZmVuY2UuIFRoaXMKaXMgc2FmZSBiZWNhdXNlIHRoZSBzY2hlZHVsZXIgd2lsbCBub3QgcmUt b3JkZXIgYmF0Y2ggYnVmZmVycyB3aXRoaW4gYQpjb250ZXh0IC0gdGhleSBhcmUgY29uc2lkZXJl ZCB0byBiZSBtdXR1YWxseSBkZXBlbmRlbnQuCgp2MjogTmV3IHBhdGNoIGluIHNlcmllcy4KCnYz OiBSZW5hbWVkL3JldHlwZWQgdGltZWxpbmUgc3RydWN0dXJlIGZpZWxkcyBhZnRlciByZXZpZXcg Y29tbWVudHMgYnkKVHZydGtvIFVyc3VsaW4uCgpBZGRlZCBjb250ZXh0IGluZm9ybWF0aW9uIHRv IHRoZSB0aW1lbGluZSdzIG5hbWUgc3RyaW5nIGZvciBiZXR0ZXIKaWRlbnRpZmljYXRpb24gaW4g ZGVidWdmcyBvdXRwdXQuCgp2NTogTGluZSB3cmFwcGluZyBhbmQgb3RoZXIgd2hpdGUgc3BhY2Ug Zml4ZXMgdG8ga2VlcCBzdHlsZSBjaGVja2VyCmhhcHB5LgoKdjc6IFVwZGF0ZWQgdG8gbmV3ZXIg bmlnaHRseSAobG90cyBvZiByaW5nIC0+IGVuZ2luZSByZW5hbWluZykuCgp2ODogTW92ZWQgdG8g ZWFybGllciBpbiBwYXRjaCBzZXJpZXMgc28gbm8gbG9uZ2VyIG5lZWRzIHRvIHJlbW92ZSB0aGUK cXVpY2sgaGFjayB0aW1lbGluZSB0aGF0IHdhcyBiZWluZyBhZGRlZCBiZWZvcmUuCgpGb3I6IFZJ Wi01MTkwClNpZ25lZC1vZmYtYnk6IEpvaG4gSGFycmlzb24gPEpvaG4uQy5IYXJyaXNvbkBJbnRl bC5jb20+CkNjOiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgpDYzog TWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4KLS0t CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oICAgICAgICAgfCAxNCArKysrKysrKysr KysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgICAgICAgICB8IDQwICsrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1f Y29udGV4dC5jIHwgMTQgKysrKysrKysrKysrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9s cmMuYyAgICAgICAgfCAgOCArKysrKysrCiA0IGZpbGVzIGNoYW5nZWQsIDc2IGluc2VydGlvbnMo KykKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCBkNTQ5NmFiLi41MjA0ODBiIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTgxOCw2ICs4MTgsMTkgQEAgc3RydWN0IGk5MTVfY3R4X2hh bmdfc3RhdHMgewogCWJvb2wgYmFubmVkOwogfTsKIAorc3RydWN0IGk5MTVfZmVuY2VfdGltZWxp bmUgeworCWNoYXIgICAgICAgIG5hbWVbMzJdOworCXVuc2lnbmVkICAgIGZlbmNlX2NvbnRleHQ7 CisJdW5zaWduZWQgICAgbmV4dDsKKworCXN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHg7CisJc3Ry dWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lOworfTsKKworaW50IGk5MTVfY3JlYXRlX2ZlbmNl X3RpbWVsaW5lKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCisJCQkgICAgICAgc3RydWN0IGludGVs X2NvbnRleHQgKmN0eCwKKwkJCSAgICAgICBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKTsK KwogLyogVGhpcyBtdXN0IG1hdGNoIHVwIHdpdGggdGhlIHZhbHVlIHByZXZpb3VzbHkgdXNlZCBm b3IgZXhlY2J1ZjIucnN2ZDEuICovCiAjZGVmaW5lIERFRkFVTFRfQ09OVEVYVF9IQU5ETEUgMAog CkBAIC04NjksNiArODgyLDcgQEAgc3RydWN0IGludGVsX2NvbnRleHQgewogCQl1NjQgbHJjX2Rl c2M7CiAJCXVpbnQzMl90ICpscmNfcmVnX3N0YXRlOwogCQlib29sIGluaXRpYWxpc2VkOworCQlz dHJ1Y3QgaTkxNV9mZW5jZV90aW1lbGluZSBmZW5jZV90aW1lbGluZTsKIAl9IGVuZ2luZVtJOTE1 X05VTV9FTkdJTkVTXTsKIAogCXN0cnVjdCBsaXN0X2hlYWQgbGluazsKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2dlbS5jCmluZGV4IGMyNTQ4YmQuLjk5YmQ0NzAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpA QCAtMjcyMyw2ICsyNzIzLDQ2IEBAIHZvaWQgaTkxNV9nZW1fcmVxdWVzdF9mcmVlKHN0cnVjdCBr cmVmICpyZXFfcmVmKQogCWttZW1fY2FjaGVfZnJlZShyZXEtPmk5MTUtPnJlcXVlc3RzLCByZXEp OwogfQogCitpbnQgaTkxNV9jcmVhdGVfZmVuY2VfdGltZWxpbmUoc3RydWN0IGRybV9kZXZpY2Ug KmRldiwKKwkJCSAgICAgICBzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4LAorCQkJICAgICAgIHN0 cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKK3sKKwlzdHJ1Y3QgaTkxNV9mZW5jZV90aW1l bGluZSAqdGltZWxpbmU7CisKKwl0aW1lbGluZSA9ICZjdHgtPmVuZ2luZVtlbmdpbmUtPmlkXS5m ZW5jZV90aW1lbGluZTsKKworCWlmICh0aW1lbGluZS0+ZW5naW5lKQorCQlyZXR1cm4gMDsKKwor CXRpbWVsaW5lLT5mZW5jZV9jb250ZXh0ID0gZmVuY2VfY29udGV4dF9hbGxvYygxKTsKKworCS8q CisJICogU3RhcnQgdGhlIHRpbWVsaW5lIGZyb20gc2Vxbm8gMCBhcyB0aGlzIGlzIGEgc3BlY2lh bCB2YWx1ZQorCSAqIHRoYXQgaXMgcmVzZXJ2ZWQgZm9yIGludmFsaWQgc3luYyBwb2ludHMuCisJ ICovCisJdGltZWxpbmUtPm5leHQgICAgICAgPSAxOworCXRpbWVsaW5lLT5jdHggICAgICAgID0g Y3R4OworCXRpbWVsaW5lLT5lbmdpbmUgICAgID0gZW5naW5lOworCisJc25wcmludGYodGltZWxp bmUtPm5hbWUsIHNpemVvZih0aW1lbGluZS0+bmFtZSksICIlZD4lczolZCIsCisJCSB0aW1lbGlu ZS0+ZmVuY2VfY29udGV4dCwgZW5naW5lLT5uYW1lLCBjdHgtPnVzZXJfaGFuZGxlKTsKKworCXJl dHVybiAwOworfQorCit1bnNpZ25lZCBpOTE1X2ZlbmNlX3RpbWVsaW5lX2dldF9uZXh0X3NlcW5v KHN0cnVjdCBpOTE1X2ZlbmNlX3RpbWVsaW5lICp0aW1lbGluZSkKK3sKKwl1bnNpZ25lZCBzZXFu bzsKKworCXNlcW5vID0gdGltZWxpbmUtPm5leHQ7CisKKwkvKiBSZXNlcnZlIHplcm8gZm9yIGlu dmFsaWQgKi8KKwlpZiAoKyt0aW1lbGluZS0+bmV4dCA9PSAwKQorCQl0aW1lbGluZS0+bmV4dCA9 IDE7CisKKwlyZXR1cm4gc2Vxbm87Cit9CisKIHN0YXRpYyBpbmxpbmUgaW50CiBfX2k5MTVfZ2Vt X3JlcXVlc3RfYWxsb2Moc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lLAogCQkJIHN0cnVj dCBpbnRlbF9jb250ZXh0ICpjdHgsCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dlbV9jb250ZXh0LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0 LmMKaW5kZXggZGU4ZDg3OC4uZTkwNzYyZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9nZW1fY29udGV4dC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt X2NvbnRleHQuYwpAQCAtMzExLDYgKzMxMSwyMCBAQCBpOTE1X2dlbV9jcmVhdGVfY29udGV4dChz dHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCWlmIChJU19FUlIoY3R4KSkKIAkJcmV0dXJuIGN0eDsK IAorCWlmICghaTkxNS5lbmFibGVfZXhlY2xpc3RzKSB7CisJCXN0cnVjdCBpbnRlbF9lbmdpbmVf Y3MgKmVuZ2luZTsKKworCQkvKiBDcmVhdGUgYSBwZXIgY29udGV4dCB0aW1lbGluZSBmb3IgZmVu Y2VzICovCisJCWZvcl9lYWNoX2VuZ2luZShlbmdpbmUsIHRvX2k5MTUoZGV2KSkgeworCQkJcmV0 ID0gaTkxNV9jcmVhdGVfZmVuY2VfdGltZWxpbmUoZGV2LCBjdHgsIGVuZ2luZSk7CisJCQlpZiAo cmV0KSB7CisJCQkJRFJNX0VSUk9SKCJGZW5jZSB0aW1lbGluZSBjcmVhdGlvbiBmYWlsZWQgZm9y IGxlZ2FjeSAlczogJXBcbiIsCisJCQkJCSAgZW5naW5lLT5uYW1lLCBjdHgpOworCQkJCWdvdG8g ZXJyX2Rlc3Ryb3k7CisJCQl9CisJCX0KKwl9CisKIAlpZiAoaXNfZ2xvYmFsX2RlZmF1bHRfY3R4 ICYmIGN0eC0+bGVnYWN5X2h3X2N0eC5yY3Nfc3RhdGUpIHsKIAkJLyogV2UgbWF5IG5lZWQgdG8g ZG8gdGhpbmdzIHdpdGggdGhlIHNocmlua2VyIHdoaWNoCiAJCSAqIHJlcXVpcmUgdXMgdG8gaW1t ZWRpYXRlbHkgc3dpdGNoIGJhY2sgdG8gdGhlIGRlZmF1bHQKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2xyYy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJj LmMKaW5kZXggZDg3NjM1Mi4uNWUxNWZiZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfbHJjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKQEAg LTI1MjYsNiArMjUyNiwxNCBAQCBzdGF0aWMgaW50IGV4ZWNsaXN0c19jb250ZXh0X2RlZmVycmVk X2FsbG9jKHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgsCiAJCWdvdG8gZXJyb3JfcmluZ2J1ZjsK IAl9CiAKKwkvKiBDcmVhdGUgYSBwZXIgY29udGV4dCB0aW1lbGluZSBmb3IgZmVuY2VzICovCisJ cmV0ID0gaTkxNV9jcmVhdGVfZmVuY2VfdGltZWxpbmUoZGV2LCBjdHgsIGVuZ2luZSk7CisJaWYg KHJldCkgeworCQlEUk1fRVJST1IoIkZlbmNlIHRpbWVsaW5lIGNyZWF0aW9uIGZhaWxlZCBmb3Ig ZW5naW5lICVzLCBjdHggJXBcbiIsCisJCQkgIGVuZ2luZS0+bmFtZSwgY3R4KTsKKwkJZ290byBl cnJvcl9yaW5nYnVmOworCX0KKwogCWN0eC0+ZW5naW5lW2VuZ2luZS0+aWRdLnJpbmdidWYgPSBy aW5nYnVmOwogCWN0eC0+ZW5naW5lW2VuZ2luZS0+aWRdLnN0YXRlID0gY3R4X29iajsKIAljdHgt PmVuZ2luZVtlbmdpbmUtPmlkXS5pbml0aWFsaXNlZCA9IGVuZ2luZS0+aW5pdF9jb250ZXh0ID09 IE5VTEw7Ci0tIAoxLjkuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0 b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50 ZWwtZ2Z4Cg==