From: Tvrtko Ursulin Subject: [PATCH v2] drm/i915: Initialize legacy semaphores from engine hw id indexed array Date: Thu, 11 Aug 2016 12:05:58 +0100 Message-ID: <1470913558-14882-1-git-send-email-tvrtko.ursulin@linux.intel.com> References: <20160811105357.GH12148@nuc-i3427.alporthouse.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 EE5016E1AB for ; Thu, 11 Aug 2016 11:06:15 +0000 (UTC) In-Reply-To: <20160811105357.GH12148@nuc-i3427.alporthouse.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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCkJ1aWxkIHRo ZSBsZWdhY3kgc2VtYXBob3JlIGluaXRpYWxpc2F0aW9uIGFycmF5IHVzaW5nIHRoZSBlbmdpbmUK aGFyZHdhcmUgaWRzIGluc3RlYWQgb2YgZHJpdmVyIGludGVybmFsIG9uZXMuIFRoaXMgbWFrZXMg dGhlCnN0YXRpYyBhcnJheSBzaXplIGRlcGVuZGVudCBvbmx5IG9uIHRoZSBudW1iZXIgb2YgZ2Vu NiBzZW1hcGhvcmUKZW5naW5lcy4KCkFsc28gbWFrZXMgdGhlIHBlci1lbmdpbmUgc2VtYXBob3Jl IHdhaXQgYW5kIHNpZ25hbCB0YWJsZXMKaGFyZHdhcmUgaWQgaW5kZXhlZCBzYXZpbmcgc29tZSBt b3JlIHNwYWNlLgoKdjI6IFJlZmFjdG9yIEk5MTVfR0VONl9OVU1fRU5HSU5FUyB0byBHRU42X1NF TUFQSE9SRV9MQVNULiAoQ2hyaXMgV2lsc29uKQoKU2lnbmVkLW9mZi1ieTogVHZydGtvIFVyc3Vs aW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9yaW5nYnVmZmVyLmMgfCA1NSArKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0K IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaCB8ICA1ICstLQogMiBmaWxl cyBjaGFuZ2VkLCAzMiBpbnNlcnRpb25zKCspLCAyOCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMKaW5kZXggZWQxOTg2OGRmOWM2Li5kMzhlN2I5NGY3 MjggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMKQEAgLTEzODUsOCAr MTM4NSw3IEBAIHN0YXRpYyBpbnQgZ2VuNl9zaWduYWwoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1 ZXN0ICpyZXEpCiB7CiAJc3RydWN0IGludGVsX3JpbmcgKnJpbmcgPSByZXEtPnJpbmc7CiAJc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gcmVxLT5pOTE1OwotCXN0cnVjdCBpbnRl bF9lbmdpbmVfY3MgKnVzZWxlc3M7Ci0JZW51bSBpbnRlbF9lbmdpbmVfaWQgaWQ7CisJc3RydWN0 IGludGVsX2VuZ2luZV9jcyAqZW5naW5lOwogCWludCByZXQsIG51bV9yaW5nczsKIAogCW51bV9y aW5ncyA9IElOVEVMX0lORk8oZGV2X3ByaXYpLT5udW1fcmluZ3M7CkBAIC0xMzk0LDkgKzEzOTMs MTMgQEAgc3RhdGljIGludCBnZW42X3NpZ25hbChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3Qg KnJlcSkKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCi0JZm9yX2VhY2hfZW5naW5lX2lkKHVz ZWxlc3MsIGRldl9wcml2LCBpZCkgewotCQlpOTE1X3JlZ190IG1ib3hfcmVnID0gcmVxLT5lbmdp bmUtPnNlbWFwaG9yZS5tYm94LnNpZ25hbFtpZF07CisJZm9yX2VhY2hfZW5naW5lKGVuZ2luZSwg ZGV2X3ByaXYpIHsKKwkJaTkxNV9yZWdfdCBtYm94X3JlZzsKKworCQlpZiAoZW5naW5lLT5od19p ZCA+IEdFTjZfU0VNQVBIT1JFX0xBU1QpCisJCQljb250aW51ZTsKIAorCQltYm94X3JlZyA9IHJl cS0+ZW5naW5lLT5zZW1hcGhvcmUubWJveC5zaWduYWxbZW5naW5lLT5od19pZF07CiAJCWlmIChp OTE1X21taW9fcmVnX3ZhbGlkKG1ib3hfcmVnKSkgewogCQkJaW50ZWxfcmluZ19lbWl0KHJpbmcs IE1JX0xPQURfUkVHSVNURVJfSU1NKDEpKTsKIAkJCWludGVsX3JpbmdfZW1pdF9yZWcocmluZywg bWJveF9yZWcpOwpAQCAtMTU0Myw3ICsxNTQ2LDcgQEAgZ2VuNl9yaW5nX3N5bmNfdG8oc3RydWN0 IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEsCiAJdTMyIGR3MSA9IE1JX1NFTUFQSE9SRV9NQk9Y IHwKIAkJICBNSV9TRU1BUEhPUkVfQ09NUEFSRSB8CiAJCSAgTUlfU0VNQVBIT1JFX1JFR0lTVEVS OwotCXUzMiB3YWl0X21ib3ggPSBzaWduYWwtPmVuZ2luZS0+c2VtYXBob3JlLm1ib3gud2FpdFty ZXEtPmVuZ2luZS0+aWRdOworCXUzMiB3YWl0X21ib3ggPSBzaWduYWwtPmVuZ2luZS0+c2VtYXBo b3JlLm1ib3gud2FpdFtyZXEtPmVuZ2luZS0+aHdfaWRdOwogCWludCByZXQ7CiAKIAlXQVJOX09O KHdhaXRfbWJveCA9PSBNSV9TRU1BUEhPUkVfU1lOQ19JTlZBTElEKTsKQEAgLTI2NzEsNDEgKzI2 NzQsNDEgQEAgc3RhdGljIHZvaWQgaW50ZWxfcmluZ19pbml0X3NlbWFwaG9yZXMoc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQkgKiBpbml0aWFsaXplZCBhcyBJTlZBTElELiAg R2VuOCB3aWxsIGluaXRpYWxpemUgdGhlCiAJCSAqIHNlbWEgYmV0d2VlbiBWQ1MyIGFuZCBSQ1Mg bGF0ZXIuCiAJCSAqLwotCQlmb3IgKGkgPSAwOyBpIDwgSTkxNV9OVU1fRU5HSU5FUzsgaSsrKSB7 CisJCWZvciAoaSA9IDA7IGkgPD0gR0VONl9TRU1BUEhPUkVfTEFTVDsgaSsrKSB7CiAJCQlzdGF0 aWMgY29uc3Qgc3RydWN0IHsKIAkJCQl1MzIgd2FpdF9tYm94OwogCQkJCWk5MTVfcmVnX3QgbWJv eF9yZWc7Ci0JCQl9IHNlbV9kYXRhW0k5MTVfTlVNX0VOR0lORVNdW0k5MTVfTlVNX0VOR0lORVNd ID0gewotCQkJCVtSQ1NdID0gewotCQkJCQlbVkNTXSA9ICB7IC53YWl0X21ib3ggPSBNSV9TRU1B UEhPUkVfU1lOQ19SViwgIC5tYm94X3JlZyA9IEdFTjZfVlJTWU5DIH0sCi0JCQkJCVtCQ1NdID0g IHsgLndhaXRfbWJveCA9IE1JX1NFTUFQSE9SRV9TWU5DX1JCLCAgLm1ib3hfcmVnID0gR0VONl9C UlNZTkMgfSwKLQkJCQkJW1ZFQ1NdID0geyAud2FpdF9tYm94ID0gTUlfU0VNQVBIT1JFX1NZTkNf UlZFLCAubWJveF9yZWcgPSBHRU42X1ZFUlNZTkMgfSwKKwkJCX0gc2VtX2RhdGFbR0VONl9TRU1B UEhPUkVfTEFTVCArIDFdW0dFTjZfU0VNQVBIT1JFX0xBU1QgKyAxXSA9IHsKKwkJCQlbUkNTX0hX XSA9IHsKKwkJCQkJW1ZDU19IV10gPSAgeyAud2FpdF9tYm94ID0gTUlfU0VNQVBIT1JFX1NZTkNf UlYsICAubWJveF9yZWcgPSBHRU42X1ZSU1lOQyB9LAorCQkJCQlbQkNTX0hXXSA9ICB7IC53YWl0 X21ib3ggPSBNSV9TRU1BUEhPUkVfU1lOQ19SQiwgIC5tYm94X3JlZyA9IEdFTjZfQlJTWU5DIH0s CisJCQkJCVtWRUNTX0hXXSA9IHsgLndhaXRfbWJveCA9IE1JX1NFTUFQSE9SRV9TWU5DX1JWRSwg Lm1ib3hfcmVnID0gR0VONl9WRVJTWU5DIH0sCiAJCQkJfSwKLQkJCQlbVkNTXSA9IHsKLQkJCQkJ W1JDU10gPSAgeyAud2FpdF9tYm94ID0gTUlfU0VNQVBIT1JFX1NZTkNfVlIsICAubWJveF9yZWcg PSBHRU42X1JWU1lOQyB9LAotCQkJCQlbQkNTXSA9ICB7IC53YWl0X21ib3ggPSBNSV9TRU1BUEhP UkVfU1lOQ19WQiwgIC5tYm94X3JlZyA9IEdFTjZfQlZTWU5DIH0sCi0JCQkJCVtWRUNTXSA9IHsg LndhaXRfbWJveCA9IE1JX1NFTUFQSE9SRV9TWU5DX1ZWRSwgLm1ib3hfcmVnID0gR0VONl9WRVZT WU5DIH0sCisJCQkJW1ZDU19IV10gPSB7CisJCQkJCVtSQ1NfSFddID0gIHsgLndhaXRfbWJveCA9 IE1JX1NFTUFQSE9SRV9TWU5DX1ZSLCAgLm1ib3hfcmVnID0gR0VONl9SVlNZTkMgfSwKKwkJCQkJ W0JDU19IV10gPSAgeyAud2FpdF9tYm94ID0gTUlfU0VNQVBIT1JFX1NZTkNfVkIsICAubWJveF9y ZWcgPSBHRU42X0JWU1lOQyB9LAorCQkJCQlbVkVDU19IV10gPSB7IC53YWl0X21ib3ggPSBNSV9T RU1BUEhPUkVfU1lOQ19WVkUsIC5tYm94X3JlZyA9IEdFTjZfVkVWU1lOQyB9LAogCQkJCX0sCi0J CQkJW0JDU10gPSB7Ci0JCQkJCVtSQ1NdID0gIHsgLndhaXRfbWJveCA9IE1JX1NFTUFQSE9SRV9T WU5DX0JSLCAgLm1ib3hfcmVnID0gR0VONl9SQlNZTkMgfSwKLQkJCQkJW1ZDU10gPSAgeyAud2Fp dF9tYm94ID0gTUlfU0VNQVBIT1JFX1NZTkNfQlYsICAubWJveF9yZWcgPSBHRU42X1ZCU1lOQyB9 LAotCQkJCQlbVkVDU10gPSB7IC53YWl0X21ib3ggPSBNSV9TRU1BUEhPUkVfU1lOQ19CVkUsIC5t Ym94X3JlZyA9IEdFTjZfVkVCU1lOQyB9LAorCQkJCVtCQ1NfSFddID0geworCQkJCQlbUkNTX0hX XSA9ICB7IC53YWl0X21ib3ggPSBNSV9TRU1BUEhPUkVfU1lOQ19CUiwgIC5tYm94X3JlZyA9IEdF TjZfUkJTWU5DIH0sCisJCQkJCVtWQ1NfSFddID0gIHsgLndhaXRfbWJveCA9IE1JX1NFTUFQSE9S RV9TWU5DX0JWLCAgLm1ib3hfcmVnID0gR0VONl9WQlNZTkMgfSwKKwkJCQkJW1ZFQ1NfSFddID0g eyAud2FpdF9tYm94ID0gTUlfU0VNQVBIT1JFX1NZTkNfQlZFLCAubWJveF9yZWcgPSBHRU42X1ZF QlNZTkMgfSwKIAkJCQl9LAotCQkJCVtWRUNTXSA9IHsKLQkJCQkJW1JDU10gPSAgeyAud2FpdF9t Ym94ID0gTUlfU0VNQVBIT1JFX1NZTkNfVkVSLCAubWJveF9yZWcgPSBHRU42X1JWRVNZTkMgfSwK LQkJCQkJW1ZDU10gPSAgeyAud2FpdF9tYm94ID0gTUlfU0VNQVBIT1JFX1NZTkNfVkVWLCAubWJv eF9yZWcgPSBHRU42X1ZWRVNZTkMgfSwKLQkJCQkJW0JDU10gPSAgeyAud2FpdF9tYm94ID0gTUlf U0VNQVBIT1JFX1NZTkNfVkVCLCAubWJveF9yZWcgPSBHRU42X0JWRVNZTkMgfSwKKwkJCQlbVkVD U19IV10gPSB7CisJCQkJCVtSQ1NfSFddID0gIHsgLndhaXRfbWJveCA9IE1JX1NFTUFQSE9SRV9T WU5DX1ZFUiwgLm1ib3hfcmVnID0gR0VONl9SVkVTWU5DIH0sCisJCQkJCVtWQ1NfSFddID0gIHsg LndhaXRfbWJveCA9IE1JX1NFTUFQSE9SRV9TWU5DX1ZFViwgLm1ib3hfcmVnID0gR0VONl9WVkVT WU5DIH0sCisJCQkJCVtCQ1NfSFddID0gIHsgLndhaXRfbWJveCA9IE1JX1NFTUFQSE9SRV9TWU5D X1ZFQiwgLm1ib3hfcmVnID0gR0VONl9CVkVTWU5DIH0sCiAJCQkJfSwKIAkJCX07CiAJCQl1MzIg d2FpdF9tYm94OwogCQkJaTkxNV9yZWdfdCBtYm94X3JlZzsKIAotCQkJaWYgKGkgPT0gZW5naW5l LT5pZCB8fCBpID09IFZDUzIpIHsKKwkJCWlmIChpID09IGVuZ2luZS0+aHdfaWQpIHsKIAkJCQl3 YWl0X21ib3ggPSBNSV9TRU1BUEhPUkVfU1lOQ19JTlZBTElEOwogCQkJCW1ib3hfcmVnID0gR0VO Nl9OT1NZTkM7CiAJCQl9IGVsc2UgewotCQkJCXdhaXRfbWJveCA9IHNlbV9kYXRhW2VuZ2luZS0+ aWRdW2ldLndhaXRfbWJveDsKLQkJCQltYm94X3JlZyA9IHNlbV9kYXRhW2VuZ2luZS0+aWRdW2ld Lm1ib3hfcmVnOworCQkJCXdhaXRfbWJveCA9IHNlbV9kYXRhW2VuZ2luZS0+aHdfaWRdW2ldLndh aXRfbWJveDsKKwkJCQltYm94X3JlZyA9IHNlbV9kYXRhW2VuZ2luZS0+aHdfaWRdW2ldLm1ib3hf cmVnOwogCQkJfQogCiAJCQllbmdpbmUtPnNlbWFwaG9yZS5tYm94LndhaXRbaV0gPSB3YWl0X21i b3g7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKaW5kZXggYWM1Njg4MDhh ZWIxLi5jMmQ4Njc3YjViOWYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3JpbmdidWZmZXIuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVy LmgKQEAgLTI3NywxMSArMjc3LDEyIEBAIHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgewogCQl1MzIJ c3luY19zZXFub1tJOTE1X05VTV9FTkdJTkVTLTFdOwogCiAJCXVuaW9uIHsKKyNkZWZpbmUgR0VO Nl9TRU1BUEhPUkVfTEFTVCBWRUNTX0hXCiAJCQlzdHJ1Y3QgewogCQkJCS8qIG91ciBtYm94IHdy aXR0ZW4gYnkgb3RoZXJzICovCi0JCQkJdTMyCQl3YWl0W0k5MTVfTlVNX0VOR0lORVNdOworCQkJ CXUzMgkJd2FpdFtHRU42X1NFTUFQSE9SRV9MQVNUICsgMV07CiAJCQkJLyogbWJveGVzIHRoaXMg cmluZyBzaWduYWxzIHRvICovCi0JCQkJaTkxNV9yZWdfdAlzaWduYWxbSTkxNV9OVU1fRU5HSU5F U107CisJCQkJaTkxNV9yZWdfdAlzaWduYWxbR0VONl9TRU1BUEhPUkVfTEFTVCArIDFdOwogCQkJ fSBtYm94OwogCQkJdTY0CQlzaWduYWxfZ2d0dFtJOTE1X05VTV9FTkdJTkVTXTsKIAkJfTsKLS0g CjEuOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJ bnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0 cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK