From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH v3 02/14] drm/i915: Create distinct lockclasses for execution vs user timelines Date: Mon, 14 Nov 2016 08:56:51 +0000 Message-ID: <20161114085703.16540-2-chris@chris-wilson.co.uk> References: <20161107135950.28861-1-chris@chris-wilson.co.uk> <20161114085703.16540-1-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-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id BA1AC6E344 for ; Mon, 14 Nov 2016 08:57:11 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id g23so13352770wme.1 for ; Mon, 14 Nov 2016 00:57:11 -0800 (PST) In-Reply-To: <20161114085703.16540-1-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 SW4gb3JkZXIgdG8gc2ltcGxpZnkgdGhlIGxvY2tkZXAgYW5ub3RhdGlvbiwgYXMgdGhleSBiZWNv bWUgbW9yZSBjb21wbGV4CmluIHRoZSBmdXR1cmUgd2l0aCBkZWZlcnJlZCBleGVjdXRpb24gYW5k IG11bHRpcGxlIHBhdGhzIHRocm91Z2ggdGhlCnNhbWUgZnVuY3Rpb25zLCBjcmVhdGUgYSBzZXBh cmF0ZSBsb2NrY2xhc3MgZm9yIHRoZSB1c2VyIHRpbWVsaW5lIGFuZAp0aGUgaGFyZHdhcmUgZXhl Y3V0aW9uIHRpbWVsaW5lLgoKV2Ugc2hvdWxkIG9ubHkgZXZlciBiZSBsb2NraW5nIHRoZSB1c2Vy IHRpbWVsaW5lIGFuZCB0aGUgZXhlY3V0aW9uCnRpbWVsaW5lIGluIHBhcmFsbGVsIHNvIHdlIG9u bHkgbmVlZCB0byBjcmVhdGUgdHdvIGxvY2sgY2xhc3NlcywgcmF0aGVyCnRoYW4gYSBzZXBhcmF0 ZSBjbGFzcyBmb3IgZXZlcnkgdGltZWxpbmUuCgp2MjogUmVuYW1lIHRoZSBsb2NrIGNsYXNzZXMg dG8gYmUgbW9yZSBjb25zaXN0ZW50IHdpdGggb3RoZXIgbG9ja2RlcC4KClNpZ25lZC1vZmYtYnk6 IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgpSZXZpZXdlZC1ieTogSm9v bmFzIExhaHRpbmVuIDxqb29uYXMubGFodGluZW5AbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgICAgICAgICAgfCAgNCArLS0tCiBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2dlbV9yZXF1ZXN0LmMgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ2VtX3RpbWVsaW5lLmMgfCAzMyArKysrKysrKysrKysrKysrKysrKysrKysrKysr LS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fdGltZWxpbmUuaCB8ICAxICsKIDQg ZmlsZXMgY2hhbmdlZCwgMzIgaW5zZXJ0aW9ucygrKSwgOCBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9nZW0uYwppbmRleCAzYjAyMWU5ZTMzNzkuLjhhODEyZGMzMzRkYSAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2dlbS5jCkBAIC00NDI5LDkgKzQ0MjksNyBAQCBpOTE1X2dlbV9sb2FkX2luaXQo c3RydWN0IGRybV9kZXZpY2UgKmRldikKIAogCW11dGV4X2xvY2soJmRldl9wcml2LT5kcm0uc3Ry dWN0X211dGV4KTsKIAlJTklUX0xJU1RfSEVBRCgmZGV2X3ByaXYtPmd0LnRpbWVsaW5lcyk7Ci0J ZXJyID0gaTkxNV9nZW1fdGltZWxpbmVfaW5pdChkZXZfcHJpdiwKLQkJCQkgICAgICZkZXZfcHJp di0+Z3QuZ2xvYmFsX3RpbWVsaW5lLAotCQkJCSAgICAgIltleGVjdXRpb25dIik7CisJZXJyID0g aTkxNV9nZW1fdGltZWxpbmVfaW5pdF9fZ2xvYmFsKGRldl9wcml2KTsKIAltdXRleF91bmxvY2so JmRldl9wcml2LT5kcm0uc3RydWN0X211dGV4KTsKIAlpZiAoZXJyKQogCQlnb3RvIGVycl9yZXF1 ZXN0czsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlcXVlc3Qu YyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlcXVlc3QuYwppbmRleCA1MDUwNDY0 YzU0MDEuLmYyNWI1MzdkNmU2NCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9nZW1fcmVxdWVzdC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlcXVl c3QuYwpAQCAtMzQ2LDcgKzM0Niw3IEBAIHN1Ym1pdF9ub3RpZnkoc3RydWN0IGk5MTVfc3dfZmVu Y2UgKmZlbmNlLCBlbnVtIGk5MTVfc3dfZmVuY2Vfbm90aWZ5IHN0YXRlKQogCQkJCXJlcXVlc3Qt PnJpbmctPnZhZGRyICsgcmVxdWVzdC0+cG9zdGZpeCk7CiAJZW5naW5lLT5zdWJtaXRfcmVxdWVz dChyZXF1ZXN0KTsKIAotCXNwaW5fbG9ja19uZXN0ZWQoJnJlcXVlc3QtPnRpbWVsaW5lLT5sb2Nr LCBTSU5HTEVfREVQVEhfTkVTVElORyk7CisJc3Bpbl9sb2NrKCZyZXF1ZXN0LT50aW1lbGluZS0+ bG9jayk7CiAJbGlzdF9tb3ZlX3RhaWwoJnJlcXVlc3QtPmxpbmssICZ0aW1lbGluZS0+cmVxdWVz dHMpOwogCXNwaW5fdW5sb2NrKCZyZXF1ZXN0LT50aW1lbGluZS0+bG9jayk7CiAKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3RpbWVsaW5lLmMgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2dlbV90aW1lbGluZS5jCmluZGV4IGZjOGYxM2E3OWY4Zi4uYmY4YTQ3 MWI2MWU2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV90aW1lbGlu ZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3RpbWVsaW5lLmMKQEAgLTI0 LDkgKzI0LDExIEBACiAKICNpbmNsdWRlICJpOTE1X2Rydi5oIgogCi1pbnQgaTkxNV9nZW1fdGlt ZWxpbmVfaW5pdChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSwKLQkJCSAgIHN0cnVjdCBp OTE1X2dlbV90aW1lbGluZSAqdGltZWxpbmUsCi0JCQkgICBjb25zdCBjaGFyICpuYW1lKQorc3Rh dGljIGludCBfX2k5MTVfZ2VtX3RpbWVsaW5lX2luaXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg Kmk5MTUsCisJCQkJICAgIHN0cnVjdCBpOTE1X2dlbV90aW1lbGluZSAqdGltZWxpbmUsCisJCQkJ ICAgIGNvbnN0IGNoYXIgKm5hbWUsCisJCQkJICAgIHN0cnVjdCBsb2NrX2NsYXNzX2tleSAqbG9j a2NsYXNzLAorCQkJCSAgICBjb25zdCBjaGFyICpsb2NrbmFtZSkKIHsKIAl1bnNpZ25lZCBpbnQg aTsKIAl1NjQgZmVuY2VzOwpAQCAtNDcsOCArNDksMTEgQEAgaW50IGk5MTVfZ2VtX3RpbWVsaW5l X2luaXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUsCiAKIAkJdGwtPmZlbmNlX2NvbnRl eHQgPSBmZW5jZXMrKzsKIAkJdGwtPmNvbW1vbiA9IHRpbWVsaW5lOwotCisjaWZkZWYgQ09ORklH X0RFQlVHX1NQSU5MT0NLCisJCV9fcmF3X3NwaW5fbG9ja19pbml0KCZ0bC0+bG9jay5ybG9jaywg bG9ja25hbWUsIGxvY2tjbGFzcyk7CisjZWxzZQogCQlzcGluX2xvY2tfaW5pdCgmdGwtPmxvY2sp OworI2VuZGlmCiAJCWluaXRfcmVxdWVzdF9hY3RpdmUoJnRsLT5sYXN0X3JlcXVlc3QsIE5VTEwp OwogCQlJTklUX0xJU1RfSEVBRCgmdGwtPnJlcXVlc3RzKTsKIAl9CkBAIC01Niw2ICs2MSwyNiBA QCBpbnQgaTkxNV9nZW1fdGltZWxpbmVfaW5pdChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkx NSwKIAlyZXR1cm4gMDsKIH0KIAoraW50IGk5MTVfZ2VtX3RpbWVsaW5lX2luaXQoc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmk5MTUsCisJCQkgICBzdHJ1Y3QgaTkxNV9nZW1fdGltZWxpbmUgKnRp bWVsaW5lLAorCQkJICAgY29uc3QgY2hhciAqbmFtZSkKK3sKKwlzdGF0aWMgc3RydWN0IGxvY2tf Y2xhc3Nfa2V5IGNsYXNzOworCisJcmV0dXJuIF9faTkxNV9nZW1fdGltZWxpbmVfaW5pdChpOTE1 LCB0aW1lbGluZSwgbmFtZSwKKwkJCQkJJmNsYXNzLCAiJnRpbWVsaW5lLT5sb2NrIik7Cit9CisK K2ludCBpOTE1X2dlbV90aW1lbGluZV9pbml0X19nbG9iYWwoc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmk5MTUpCit7CisJc3RhdGljIHN0cnVjdCBsb2NrX2NsYXNzX2tleSBjbGFzczsKKworCXJl dHVybiBfX2k5MTVfZ2VtX3RpbWVsaW5lX2luaXQoaTkxNSwKKwkJCQkJJmk5MTUtPmd0Lmdsb2Jh bF90aW1lbGluZSwKKwkJCQkJIltleGVjdXRpb25dIiwKKwkJCQkJJmNsYXNzLCAiJmdsb2JhbF90 aW1lbGluZS0+bG9jayIpOworfQorCiB2b2lkIGk5MTVfZ2VtX3RpbWVsaW5lX2Zpbmkoc3RydWN0 IGk5MTVfZ2VtX3RpbWVsaW5lICp0bCkKIHsKIAlsb2NrZGVwX2Fzc2VydF9oZWxkKCZ0bC0+aTkx NS0+ZHJtLnN0cnVjdF9tdXRleCk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dlbV90aW1lbGluZS5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fdGltZWxp bmUuaAppbmRleCBmMmJmN2IxZDQ5YTEuLjk4ZDk5YTYyYjRhZSAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fdGltZWxpbmUuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2dlbV90aW1lbGluZS5oCkBAIC02Nyw2ICs2Nyw3IEBAIHN0cnVjdCBpOTE1X2dl bV90aW1lbGluZSB7CiBpbnQgaTkxNV9nZW1fdGltZWxpbmVfaW5pdChzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqaTkxNSwKIAkJCSAgIHN0cnVjdCBpOTE1X2dlbV90aW1lbGluZSAqdGwsCiAJCQkg ICBjb25zdCBjaGFyICpuYW1lKTsKK2ludCBpOTE1X2dlbV90aW1lbGluZV9pbml0X19nbG9iYWwo c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUpOwogdm9pZCBpOTE1X2dlbV90aW1lbGluZV9m aW5pKHN0cnVjdCBpOTE1X2dlbV90aW1lbGluZSAqdGwpOwogCiAjZW5kaWYKLS0gCjIuMTAuMgoK X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4 IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==