From: Tvrtko Ursulin Subject: [PATCH 2/2] drm/i915: Initialize legacy semaphores from engine hw id indexed array Date: Thu, 11 Aug 2016 11:43:38 +0100 Message-ID: <1470912218-10852-3-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1470912218-10852-1-git-send-email-tvrtko.ursulin@linux.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 58BE26E208 for ; Thu, 11 Aug 2016 10:43:44 +0000 (UTC) In-Reply-To: <1470912218-10852-1-git-send-email-tvrtko.ursulin@linux.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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCkJ1aWxkIHRo ZSBsZWdhY3kgc2VtYXBob3JlIGluaXRpYWxpc2F0aW9uIGFycmF5IHVzaW5nIHRoZSBlbmdpbmUK aGFyZHdhcmUgaWRzIGluc3RlYWQgb2YgZHJpdmVyIGludGVybmFsIG9uZXMuIFRoaXMgbWFrZXMg dGhlCnN0YXRpYyBhcnJheSBzaXplIGRlcGVuZGVudCBvbmx5IG9uIHRoZSBudW1iZXIgb2YgZ2Vu NiBzZW1hcGhvcmUKZW5naW5lcy4KCkFsc28gbWFrZXMgdGhlIHBlci1lbmdpbmUgc2VtYXBob3Jl IHdhaXQgYW5kIHNpZ25hbCB0YWJsZXMKaGFyZHdhcmUgaWQgaW5kZXhlZCBzYXZpbmcgc29tZSBt b3JlIHNwYWNlLgoKU2lnbmVkLW9mZi1ieTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGlu QGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMg fCA1NSArKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX3JpbmdidWZmZXIuaCB8ICA1ICstLQogMiBmaWxlcyBjaGFuZ2VkLCAzMiBpbnNl cnRpb25zKCspLCAyOCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5n YnVmZmVyLmMKaW5kZXggZWQxOTg2OGRmOWM2Li5hNzAxNTdhNjVjZmQgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMKQEAgLTEzODUsOCArMTM4NSw3IEBAIHN0YXRpYyBp bnQgZ2VuNl9zaWduYWwoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEpCiB7CiAJc3Ry dWN0IGludGVsX3JpbmcgKnJpbmcgPSByZXEtPnJpbmc7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2ID0gcmVxLT5pOTE1OwotCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnVzZWxl c3M7Ci0JZW51bSBpbnRlbF9lbmdpbmVfaWQgaWQ7CisJc3RydWN0IGludGVsX2VuZ2luZV9jcyAq ZW5naW5lOwogCWludCByZXQsIG51bV9yaW5nczsKIAogCW51bV9yaW5ncyA9IElOVEVMX0lORk8o ZGV2X3ByaXYpLT5udW1fcmluZ3M7CkBAIC0xMzk0LDkgKzEzOTMsMTMgQEAgc3RhdGljIGludCBn ZW42X3NpZ25hbChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSkKIAlpZiAocmV0KQog CQlyZXR1cm4gcmV0OwogCi0JZm9yX2VhY2hfZW5naW5lX2lkKHVzZWxlc3MsIGRldl9wcml2LCBp ZCkgewotCQlpOTE1X3JlZ190IG1ib3hfcmVnID0gcmVxLT5lbmdpbmUtPnNlbWFwaG9yZS5tYm94 LnNpZ25hbFtpZF07CisJZm9yX2VhY2hfZW5naW5lKGVuZ2luZSwgZGV2X3ByaXYpIHsKKwkJaTkx NV9yZWdfdCBtYm94X3JlZzsKKworCQlpZiAoZW5naW5lLT5od19pZCA+PSBJOTE1X0dFTjZfU0VN QV9FTkdJTkVTKQorCQkJY29udGludWU7CiAKKwkJbWJveF9yZWcgPSByZXEtPmVuZ2luZS0+c2Vt YXBob3JlLm1ib3guc2lnbmFsW2VuZ2luZS0+aHdfaWRdOwogCQlpZiAoaTkxNV9tbWlvX3JlZ192 YWxpZChtYm94X3JlZykpIHsKIAkJCWludGVsX3JpbmdfZW1pdChyaW5nLCBNSV9MT0FEX1JFR0lT VEVSX0lNTSgxKSk7CiAJCQlpbnRlbF9yaW5nX2VtaXRfcmVnKHJpbmcsIG1ib3hfcmVnKTsKQEAg LTE1NDMsNyArMTU0Niw3IEBAIGdlbjZfcmluZ19zeW5jX3RvKHN0cnVjdCBkcm1faTkxNV9nZW1f cmVxdWVzdCAqcmVxLAogCXUzMiBkdzEgPSBNSV9TRU1BUEhPUkVfTUJPWCB8CiAJCSAgTUlfU0VN QVBIT1JFX0NPTVBBUkUgfAogCQkgIE1JX1NFTUFQSE9SRV9SRUdJU1RFUjsKLQl1MzIgd2FpdF9t Ym94ID0gc2lnbmFsLT5lbmdpbmUtPnNlbWFwaG9yZS5tYm94LndhaXRbcmVxLT5lbmdpbmUtPmlk XTsKKwl1MzIgd2FpdF9tYm94ID0gc2lnbmFsLT5lbmdpbmUtPnNlbWFwaG9yZS5tYm94LndhaXRb cmVxLT5lbmdpbmUtPmh3X2lkXTsKIAlpbnQgcmV0OwogCiAJV0FSTl9PTih3YWl0X21ib3ggPT0g TUlfU0VNQVBIT1JFX1NZTkNfSU5WQUxJRCk7CkBAIC0yNjcxLDQxICsyNjc0LDQxIEBAIHN0YXRp YyB2b2lkIGludGVsX3JpbmdfaW5pdF9zZW1hcGhvcmVzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdiwKIAkJICogaW5pdGlhbGl6ZWQgYXMgSU5WQUxJRC4gIEdlbjggd2lsbCBpbml0 aWFsaXplIHRoZQogCQkgKiBzZW1hIGJldHdlZW4gVkNTMiBhbmQgUkNTIGxhdGVyLgogCQkgKi8K LQkJZm9yIChpID0gMDsgaSA8IEk5MTVfTlVNX0VOR0lORVM7IGkrKykgeworCQlmb3IgKGkgPSAw OyBpIDwgSTkxNV9HRU42X1NFTUFfRU5HSU5FUzsgaSsrKSB7CiAJCQlzdGF0aWMgY29uc3Qgc3Ry dWN0IHsKIAkJCQl1MzIgd2FpdF9tYm94OwogCQkJCWk5MTVfcmVnX3QgbWJveF9yZWc7Ci0JCQl9 IHNlbV9kYXRhW0k5MTVfTlVNX0VOR0lORVNdW0k5MTVfTlVNX0VOR0lORVNdID0gewotCQkJCVtS Q1NdID0gewotCQkJCQlbVkNTXSA9ICB7IC53YWl0X21ib3ggPSBNSV9TRU1BUEhPUkVfU1lOQ19S ViwgIC5tYm94X3JlZyA9IEdFTjZfVlJTWU5DIH0sCi0JCQkJCVtCQ1NdID0gIHsgLndhaXRfbWJv eCA9IE1JX1NFTUFQSE9SRV9TWU5DX1JCLCAgLm1ib3hfcmVnID0gR0VONl9CUlNZTkMgfSwKLQkJ CQkJW1ZFQ1NdID0geyAud2FpdF9tYm94ID0gTUlfU0VNQVBIT1JFX1NZTkNfUlZFLCAubWJveF9y ZWcgPSBHRU42X1ZFUlNZTkMgfSwKKwkJCX0gc2VtX2RhdGFbSTkxNV9HRU42X1NFTUFfRU5HSU5F U11bSTkxNV9HRU42X1NFTUFfRU5HSU5FU10gPSB7CisJCQkJW1JDU19IV10gPSB7CisJCQkJCVtW Q1NfSFddID0gIHsgLndhaXRfbWJveCA9IE1JX1NFTUFQSE9SRV9TWU5DX1JWLCAgLm1ib3hfcmVn ID0gR0VONl9WUlNZTkMgfSwKKwkJCQkJW0JDU19IV10gPSAgeyAud2FpdF9tYm94ID0gTUlfU0VN QVBIT1JFX1NZTkNfUkIsICAubWJveF9yZWcgPSBHRU42X0JSU1lOQyB9LAorCQkJCQlbVkVDU19I V10gPSB7IC53YWl0X21ib3ggPSBNSV9TRU1BUEhPUkVfU1lOQ19SVkUsIC5tYm94X3JlZyA9IEdF TjZfVkVSU1lOQyB9LAogCQkJCX0sCi0JCQkJW1ZDU10gPSB7Ci0JCQkJCVtSQ1NdID0gIHsgLndh aXRfbWJveCA9IE1JX1NFTUFQSE9SRV9TWU5DX1ZSLCAgLm1ib3hfcmVnID0gR0VONl9SVlNZTkMg fSwKLQkJCQkJW0JDU10gPSAgeyAud2FpdF9tYm94ID0gTUlfU0VNQVBIT1JFX1NZTkNfVkIsICAu bWJveF9yZWcgPSBHRU42X0JWU1lOQyB9LAotCQkJCQlbVkVDU10gPSB7IC53YWl0X21ib3ggPSBN SV9TRU1BUEhPUkVfU1lOQ19WVkUsIC5tYm94X3JlZyA9IEdFTjZfVkVWU1lOQyB9LAorCQkJCVtW Q1NfSFddID0geworCQkJCQlbUkNTX0hXXSA9ICB7IC53YWl0X21ib3ggPSBNSV9TRU1BUEhPUkVf U1lOQ19WUiwgIC5tYm94X3JlZyA9IEdFTjZfUlZTWU5DIH0sCisJCQkJCVtCQ1NfSFddID0gIHsg LndhaXRfbWJveCA9IE1JX1NFTUFQSE9SRV9TWU5DX1ZCLCAgLm1ib3hfcmVnID0gR0VONl9CVlNZ TkMgfSwKKwkJCQkJW1ZFQ1NfSFddID0geyAud2FpdF9tYm94ID0gTUlfU0VNQVBIT1JFX1NZTkNf VlZFLCAubWJveF9yZWcgPSBHRU42X1ZFVlNZTkMgfSwKIAkJCQl9LAotCQkJCVtCQ1NdID0gewot CQkJCQlbUkNTXSA9ICB7IC53YWl0X21ib3ggPSBNSV9TRU1BUEhPUkVfU1lOQ19CUiwgIC5tYm94 X3JlZyA9IEdFTjZfUkJTWU5DIH0sCi0JCQkJCVtWQ1NdID0gIHsgLndhaXRfbWJveCA9IE1JX1NF TUFQSE9SRV9TWU5DX0JWLCAgLm1ib3hfcmVnID0gR0VONl9WQlNZTkMgfSwKLQkJCQkJW1ZFQ1Nd ID0geyAud2FpdF9tYm94ID0gTUlfU0VNQVBIT1JFX1NZTkNfQlZFLCAubWJveF9yZWcgPSBHRU42 X1ZFQlNZTkMgfSwKKwkJCQlbQkNTX0hXXSA9IHsKKwkJCQkJW1JDU19IV10gPSAgeyAud2FpdF9t Ym94ID0gTUlfU0VNQVBIT1JFX1NZTkNfQlIsICAubWJveF9yZWcgPSBHRU42X1JCU1lOQyB9LAor CQkJCQlbVkNTX0hXXSA9ICB7IC53YWl0X21ib3ggPSBNSV9TRU1BUEhPUkVfU1lOQ19CViwgIC5t Ym94X3JlZyA9IEdFTjZfVkJTWU5DIH0sCisJCQkJCVtWRUNTX0hXXSA9IHsgLndhaXRfbWJveCA9 IE1JX1NFTUFQSE9SRV9TWU5DX0JWRSwgLm1ib3hfcmVnID0gR0VONl9WRUJTWU5DIH0sCiAJCQkJ fSwKLQkJCQlbVkVDU10gPSB7Ci0JCQkJCVtSQ1NdID0gIHsgLndhaXRfbWJveCA9IE1JX1NFTUFQ SE9SRV9TWU5DX1ZFUiwgLm1ib3hfcmVnID0gR0VONl9SVkVTWU5DIH0sCi0JCQkJCVtWQ1NdID0g IHsgLndhaXRfbWJveCA9IE1JX1NFTUFQSE9SRV9TWU5DX1ZFViwgLm1ib3hfcmVnID0gR0VONl9W VkVTWU5DIH0sCi0JCQkJCVtCQ1NdID0gIHsgLndhaXRfbWJveCA9IE1JX1NFTUFQSE9SRV9TWU5D X1ZFQiwgLm1ib3hfcmVnID0gR0VONl9CVkVTWU5DIH0sCisJCQkJW1ZFQ1NfSFddID0geworCQkJ CQlbUkNTX0hXXSA9ICB7IC53YWl0X21ib3ggPSBNSV9TRU1BUEhPUkVfU1lOQ19WRVIsIC5tYm94 X3JlZyA9IEdFTjZfUlZFU1lOQyB9LAorCQkJCQlbVkNTX0hXXSA9ICB7IC53YWl0X21ib3ggPSBN SV9TRU1BUEhPUkVfU1lOQ19WRVYsIC5tYm94X3JlZyA9IEdFTjZfVlZFU1lOQyB9LAorCQkJCQlb QkNTX0hXXSA9ICB7IC53YWl0X21ib3ggPSBNSV9TRU1BUEhPUkVfU1lOQ19WRUIsIC5tYm94X3Jl ZyA9IEdFTjZfQlZFU1lOQyB9LAogCQkJCX0sCiAJCQl9OwogCQkJdTMyIHdhaXRfbWJveDsKIAkJ CWk5MTVfcmVnX3QgbWJveF9yZWc7CiAKLQkJCWlmIChpID09IGVuZ2luZS0+aWQgfHwgaSA9PSBW Q1MyKSB7CisJCQlpZiAoaSA9PSBlbmdpbmUtPmh3X2lkKSB7CiAJCQkJd2FpdF9tYm94ID0gTUlf U0VNQVBIT1JFX1NZTkNfSU5WQUxJRDsKIAkJCQltYm94X3JlZyA9IEdFTjZfTk9TWU5DOwogCQkJ fSBlbHNlIHsKLQkJCQl3YWl0X21ib3ggPSBzZW1fZGF0YVtlbmdpbmUtPmlkXVtpXS53YWl0X21i b3g7Ci0JCQkJbWJveF9yZWcgPSBzZW1fZGF0YVtlbmdpbmUtPmlkXVtpXS5tYm94X3JlZzsKKwkJ CQl3YWl0X21ib3ggPSBzZW1fZGF0YVtlbmdpbmUtPmh3X2lkXVtpXS53YWl0X21ib3g7CisJCQkJ bWJveF9yZWcgPSBzZW1fZGF0YVtlbmdpbmUtPmh3X2lkXVtpXS5tYm94X3JlZzsKIAkJCX0KIAog CQkJZW5naW5lLT5zZW1hcGhvcmUubWJveC53YWl0W2ldID0gd2FpdF9tYm94OwpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oCmluZGV4IGFjNTY4ODA4YWViMS4uZDY1ZGY5NGNj OTVlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oCkBAIC0yNzcsMTEg KzI3NywxMiBAQCBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzIHsKIAkJdTMyCXN5bmNfc2Vxbm9bSTkx NV9OVU1fRU5HSU5FUy0xXTsKIAogCQl1bmlvbiB7CisjZGVmaW5lIEk5MTVfR0VONl9TRU1BX0VO R0lORVMgNAogCQkJc3RydWN0IHsKIAkJCQkvKiBvdXIgbWJveCB3cml0dGVuIGJ5IG90aGVycyAq LwotCQkJCXUzMgkJd2FpdFtJOTE1X05VTV9FTkdJTkVTXTsKKwkJCQl1MzIJCXdhaXRbSTkxNV9H RU42X1NFTUFfRU5HSU5FU107CiAJCQkJLyogbWJveGVzIHRoaXMgcmluZyBzaWduYWxzIHRvICov Ci0JCQkJaTkxNV9yZWdfdAlzaWduYWxbSTkxNV9OVU1fRU5HSU5FU107CisJCQkJaTkxNV9yZWdf dAlzaWduYWxbSTkxNV9HRU42X1NFTUFfRU5HSU5FU107CiAJCQl9IG1ib3g7CiAJCQl1NjQJCXNp Z25hbF9nZ3R0W0k5MTVfTlVNX0VOR0lORVNdOwogCQl9OwotLSAKMS45LjEKCl9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxp c3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNr dG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=