From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH v3 05/14] drm/i915: Remove engine->execlist_lock Date: Mon, 14 Nov 2016 08:56:54 +0000 Message-ID: <20161114085703.16540-5-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-x243.google.com (mail-wm0-x243.google.com [IPv6:2a00:1450:400c:c09::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5436F6E344 for ; Mon, 14 Nov 2016 08:57:14 +0000 (UTC) Received: by mail-wm0-x243.google.com with SMTP id m203so13290749wma.3 for ; Mon, 14 Nov 2016 00:57:14 -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 VGhlIGV4ZWNsaXN0X2xvY2sgaXMgbm93IGNvbXBsZXRlbHkgc3Vic3VtZWQgYnkgdGhlIGVuZ2lu ZS0+dGltZWxpbmUtPmxvY2ssCmFuZCBzbyB3ZSBjYW4gcmVtb3ZlIHRoZSByZWR1bmRhbnQgbGF5 ZXIgb2YgbG9ja2luZy4KClNpZ25lZC1vZmYtYnk6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMt d2lsc29uLmNvLnVrPgpSZXZpZXdlZC1ieTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGlu QGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYyAgICAg fCA0ICsrLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgICAgICAgICB8IDggKysr KysrLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2VuZ2luZV9jcy5jICB8IDEgLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgICAgICAgIHwgNyArKystLS0tCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmggfCAxIC0KIDUgZmlsZXMgY2hhbmdlZCwg MTEgaW5zZXJ0aW9ucygrKSwgMTAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rl YnVnZnMuYwppbmRleCBiY2UzODgwM2Y0NWMuLjAzZTNjMmFmYmIwNiAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9kZWJ1Z2ZzLmMKQEAgLTMyNTQsMTEgKzMyNTQsMTEgQEAgc3RhdGljIGludCBpOTE1 X2VuZ2luZV9pbmZvKHN0cnVjdCBzZXFfZmlsZSAqbSwgdm9pZCAqdW51c2VkKQogCQkJCXNlcV9w cmludGYobSwgIlx0XHRFTFNQWzFdIGlkbGVcbiIpOwogCQkJcmN1X3JlYWRfdW5sb2NrKCk7CiAK LQkJCXNwaW5fbG9ja19pcnEoJmVuZ2luZS0+ZXhlY2xpc3RfbG9jayk7CisJCQlzcGluX2xvY2tf aXJxKCZlbmdpbmUtPnRpbWVsaW5lLT5sb2NrKTsKIAkJCWxpc3RfZm9yX2VhY2hfZW50cnkocnEs ICZlbmdpbmUtPmV4ZWNsaXN0X3F1ZXVlLCBleGVjbGlzdF9saW5rKSB7CiAJCQkJcHJpbnRfcmVx dWVzdChtLCBycSwgIlx0XHRRICIpOwogCQkJfQotCQkJc3Bpbl91bmxvY2tfaXJxKCZlbmdpbmUt PmV4ZWNsaXN0X2xvY2spOworCQkJc3Bpbl91bmxvY2tfaXJxKCZlbmdpbmUtPnRpbWVsaW5lLT5s b2NrKTsKIAkJfSBlbHNlIGlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID4gNikgewogCQkJc2VxX3By aW50ZihtLCAiXHRQUF9ESVJfQkFTRTogMHglMDh4XG4iLAogCQkJCSAgIEk5MTVfUkVBRChSSU5H X1BQX0RJUl9CQVNFKGVuZ2luZSkpKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCmluZGV4IDhhODEy ZGMzMzRkYS4uZTFhZmExMTYwOWEwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKQEAgLTI3MTgs MTIgKzI3MTgsMTYgQEAgc3RhdGljIHZvaWQgaTkxNV9nZW1fY2xlYW51cF9lbmdpbmUoc3RydWN0 IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogCSAqLwogCiAJaWYgKGk5MTUuZW5hYmxlX2V4ZWNs aXN0cykgewotCQlzcGluX2xvY2soJmVuZ2luZS0+ZXhlY2xpc3RfbG9jayk7CisJCXVuc2lnbmVk IGxvbmcgZmxhZ3M7CisKKwkJc3Bpbl9sb2NrX2lycXNhdmUoJmVuZ2luZS0+dGltZWxpbmUtPmxv Y2ssIGZsYWdzKTsKKwogCQlJTklUX0xJU1RfSEVBRCgmZW5naW5lLT5leGVjbGlzdF9xdWV1ZSk7 CiAJCWk5MTVfZ2VtX3JlcXVlc3RfcHV0KGVuZ2luZS0+ZXhlY2xpc3RfcG9ydFswXS5yZXF1ZXN0 KTsKIAkJaTkxNV9nZW1fcmVxdWVzdF9wdXQoZW5naW5lLT5leGVjbGlzdF9wb3J0WzFdLnJlcXVl c3QpOwogCQltZW1zZXQoZW5naW5lLT5leGVjbGlzdF9wb3J0LCAwLCBzaXplb2YoZW5naW5lLT5l eGVjbGlzdF9wb3J0KSk7Ci0JCXNwaW5fdW5sb2NrKCZlbmdpbmUtPmV4ZWNsaXN0X2xvY2spOwor CisJCXNwaW5fdW5sb2NrX2lycXJlc3RvcmUoJmVuZ2luZS0+dGltZWxpbmUtPmxvY2ssIGZsYWdz KTsKIAl9CiB9CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2VuZ2lu ZV9jcy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZW5naW5lX2NzLmMKaW5kZXggODQx ZjhkMWUxNDEwLi4yOThmMGY5NWRkM2YgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2VuZ2luZV9jcy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2VuZ2lu ZV9jcy5jCkBAIC0yMzcsNyArMjM3LDYgQEAgc3RhdGljIHZvaWQgaW50ZWxfZW5naW5lX2luaXRf dGltZWxpbmUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogdm9pZCBpbnRlbF9lbmdp bmVfc2V0dXBfY29tbW9uKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIHsKIAlJTklU X0xJU1RfSEVBRCgmZW5naW5lLT5leGVjbGlzdF9xdWV1ZSk7Ci0Jc3Bpbl9sb2NrX2luaXQoJmVu Z2luZS0+ZXhlY2xpc3RfbG9jayk7CiAKIAlpbnRlbF9lbmdpbmVfaW5pdF90aW1lbGluZShlbmdp bmUpOwogCWludGVsX2VuZ2luZV9pbml0X2hhbmdjaGVjayhlbmdpbmUpOwpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9scmMuYwppbmRleCBkY2E0MTgzNGRlYzEuLmQxYWVhNzQ2MjUxNSAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfbHJjLmMKQEAgLTQ3MSw3ICs0NzEsNiBAQCBzdGF0aWMgdm9pZCBleGVjbGlzdHNf ZGVxdWV1ZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiAJICovCiAKIAlzcGluX2xv Y2tfaXJxc2F2ZSgmZW5naW5lLT50aW1lbGluZS0+bG9jaywgZmxhZ3MpOwotCXNwaW5fbG9jaygm ZW5naW5lLT5leGVjbGlzdF9sb2NrKTsKIAlsaXN0X2Zvcl9lYWNoX2VudHJ5KGN1cnNvciwgJmVu Z2luZS0+ZXhlY2xpc3RfcXVldWUsIGV4ZWNsaXN0X2xpbmspIHsKIAkJLyogQ2FuIHdlIGNvbWJp bmUgdGhpcyByZXF1ZXN0IHdpdGggdGhlIGN1cnJlbnQgcG9ydD8gSXQgaGFzIHRvCiAJCSAqIGJl IHRoZSBzYW1lIGNvbnRleHQvcmluZ2J1ZmZlciBhbmQgbm90IGhhdmUgYW55IGV4Y2VwdGlvbnMK QEAgLTUyNCw3ICs1MjMsNiBAQCBzdGF0aWMgdm9pZCBleGVjbGlzdHNfZGVxdWV1ZShzdHJ1Y3Qg aW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiAKIAkJaTkxNV9nZW1fcmVxdWVzdF9hc3NpZ24oJnBv cnQtPnJlcXVlc3QsIGxhc3QpOwogCX0KLQlzcGluX3VubG9jaygmZW5naW5lLT5leGVjbGlzdF9s b2NrKTsKIAlzcGluX3VubG9ja19pcnFyZXN0b3JlKCZlbmdpbmUtPnRpbWVsaW5lLT5sb2NrLCBm bGFncyk7CiAKIAlpZiAoc3VibWl0KQpAQCAtNjMzLDEzICs2MzEsMTQgQEAgc3RhdGljIHZvaWQg ZXhlY2xpc3RzX3N1Ym1pdF9yZXF1ZXN0KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVx dWVzdCkKIAlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUgPSByZXF1ZXN0LT5lbmdpbmU7 CiAJdW5zaWduZWQgbG9uZyBmbGFnczsKIAotCXNwaW5fbG9ja19pcnFzYXZlKCZlbmdpbmUtPmV4 ZWNsaXN0X2xvY2ssIGZsYWdzKTsKKwkvKiBXaWxsIGJlIGNhbGxlZCBmcm9tIGlycS1jb250ZXh0 IHdoZW4gdXNpbmcgZm9yZWlnbiBmZW5jZXMuICovCisJc3Bpbl9sb2NrX2lycXNhdmUoJmVuZ2lu ZS0+dGltZWxpbmUtPmxvY2ssIGZsYWdzKTsKIAogCWxpc3RfYWRkX3RhaWwoJnJlcXVlc3QtPmV4 ZWNsaXN0X2xpbmssICZlbmdpbmUtPmV4ZWNsaXN0X3F1ZXVlKTsKIAlpZiAoZXhlY2xpc3RzX2Vs c3BfaWRsZShlbmdpbmUpKQogCQl0YXNrbGV0X2hpX3NjaGVkdWxlKCZlbmdpbmUtPmlycV90YXNr bGV0KTsKIAotCXNwaW5fdW5sb2NrX2lycXJlc3RvcmUoJmVuZ2luZS0+ZXhlY2xpc3RfbG9jaywg ZmxhZ3MpOworCXNwaW5fdW5sb2NrX2lycXJlc3RvcmUoJmVuZ2luZS0+dGltZWxpbmUtPmxvY2ss IGZsYWdzKTsKIH0KIAogaW50IGludGVsX2xvZ2ljYWxfcmluZ19hbGxvY19yZXF1ZXN0X2V4dHJh cyhzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3QpCmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9yaW5nYnVmZmVyLmgKaW5kZXggZDFhNzI4NzkxYWQ0Li5lMTM1MTg3MGMyMDMgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaAorKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKQEAgLTMzNSw3ICszMzUsNiBA QCBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzIHsKIAogCS8qIEV4ZWNsaXN0cyAqLwogCXN0cnVjdCB0 YXNrbGV0X3N0cnVjdCBpcnFfdGFza2xldDsKLQlzcGlubG9ja190IGV4ZWNsaXN0X2xvY2s7IC8q IHVzZWQgaW5zaWRlIHRhc2tsZXQsIHVzZSBzcGluX2xvY2tfYmggKi8KIAlzdHJ1Y3QgZXhlY2xp c3RfcG9ydCB7CiAJCXN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVzdDsKIAkJdW5z aWduZWQgaW50IGNvdW50OwotLSAKMi4xMC4yCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0 cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9s aXN0aW5mby9pbnRlbC1nZngK