From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [PATCH v3] drm/i915: Initialize legacy semaphores from engine hw id indexed array Date: Thu, 11 Aug 2016 15:50:17 +0100 Message-ID: <1470927017-19789-1-git-send-email-tvrtko.ursulin@linux.intel.com> References: <20160811112048.GJ12148@nuc-i3427.alporthouse.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 DDCA36E920 for ; Thu, 11 Aug 2016 14:50:19 +0000 (UTC) In-Reply-To: <20160811112048.GJ12148@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 TUFQSE9SRV9MQVNULiAoQ2hyaXMgV2lsc29uKQp2MzogTW9yZSBwb2xpc2guIChDaHJpcyBXaWxz b24pCgpTaWduZWQtb2ZmLWJ5OiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwu Y29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYyB8IDU1ICsr KysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfcmluZ2J1ZmZlci5oIHwgIDcgKysrLS0KIDIgZmlsZXMgY2hhbmdlZCwgMzQgaW5zZXJ0aW9u cygrKSwgMjggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfcmluZ2J1ZmZlci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZl ci5jCmluZGV4IGVkMTk4NjhkZjljNi4uN2RkMTk3NzFkZDUyIDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfcmluZ2J1ZmZlci5jCkBAIC0xMzg1LDggKzEzODUsNyBAQCBzdGF0aWMgaW50IGdl bjZfc2lnbmFsKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxKQogewogCXN0cnVjdCBp bnRlbF9yaW5nICpyaW5nID0gcmVxLT5yaW5nOwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdiA9IHJlcS0+aTkxNTsKLQlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICp1c2VsZXNzOwot CWVudW0gaW50ZWxfZW5naW5lX2lkIGlkOworCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2lu ZTsKIAlpbnQgcmV0LCBudW1fcmluZ3M7CiAKIAludW1fcmluZ3MgPSBJTlRFTF9JTkZPKGRldl9w cml2KS0+bnVtX3JpbmdzOwpAQCAtMTM5NCw5ICsxMzkzLDEzIEBAIHN0YXRpYyBpbnQgZ2VuNl9z aWduYWwoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEpCiAJaWYgKHJldCkKIAkJcmV0 dXJuIHJldDsKIAotCWZvcl9lYWNoX2VuZ2luZV9pZCh1c2VsZXNzLCBkZXZfcHJpdiwgaWQpIHsK LQkJaTkxNV9yZWdfdCBtYm94X3JlZyA9IHJlcS0+ZW5naW5lLT5zZW1hcGhvcmUubWJveC5zaWdu YWxbaWRdOworCWZvcl9lYWNoX2VuZ2luZShlbmdpbmUsIGRldl9wcml2KSB7CisJCWk5MTVfcmVn X3QgbWJveF9yZWc7CisKKwkJaWYgKCEoQklUKGVuZ2luZS0+aHdfaWQpICYgR0VONl9TRU1BUEhP UkVTX01BU0spKQorCQkJY29udGludWU7CiAKKwkJbWJveF9yZWcgPSByZXEtPmVuZ2luZS0+c2Vt YXBob3JlLm1ib3guc2lnbmFsW2VuZ2luZS0+aHdfaWRdOwogCQlpZiAoaTkxNV9tbWlvX3JlZ192 YWxpZChtYm94X3JlZykpIHsKIAkJCWludGVsX3JpbmdfZW1pdChyaW5nLCBNSV9MT0FEX1JFR0lT VEVSX0lNTSgxKSk7CiAJCQlpbnRlbF9yaW5nX2VtaXRfcmVnKHJpbmcsIG1ib3hfcmVnKTsKQEAg LTE1NDMsNyArMTU0Niw3IEBAIGdlbjZfcmluZ19zeW5jX3RvKHN0cnVjdCBkcm1faTkxNV9nZW1f cmVxdWVzdCAqcmVxLAogCXUzMiBkdzEgPSBNSV9TRU1BUEhPUkVfTUJPWCB8CiAJCSAgTUlfU0VN QVBIT1JFX0NPTVBBUkUgfAogCQkgIE1JX1NFTUFQSE9SRV9SRUdJU1RFUjsKLQl1MzIgd2FpdF9t Ym94ID0gc2lnbmFsLT5lbmdpbmUtPnNlbWFwaG9yZS5tYm94LndhaXRbcmVxLT5lbmdpbmUtPmlk XTsKKwl1MzIgd2FpdF9tYm94ID0gc2lnbmFsLT5lbmdpbmUtPnNlbWFwaG9yZS5tYm94LndhaXRb cmVxLT5lbmdpbmUtPmh3X2lkXTsKIAlpbnQgcmV0OwogCiAJV0FSTl9PTih3YWl0X21ib3ggPT0g TUlfU0VNQVBIT1JFX1NZTkNfSU5WQUxJRCk7CkBAIC0yNjcxLDQxICsyNjc0LDQxIEBAIHN0YXRp YyB2b2lkIGludGVsX3JpbmdfaW5pdF9zZW1hcGhvcmVzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdiwKIAkJICogaW5pdGlhbGl6ZWQgYXMgSU5WQUxJRC4gIEdlbjggd2lsbCBpbml0 aWFsaXplIHRoZQogCQkgKiBzZW1hIGJldHdlZW4gVkNTMiBhbmQgUkNTIGxhdGVyLgogCQkgKi8K LQkJZm9yIChpID0gMDsgaSA8IEk5MTVfTlVNX0VOR0lORVM7IGkrKykgeworCQlmb3IgKGkgPSAw OyBpIDwgR0VONl9OVU1fU0VNQVBIT1JFUzsgaSsrKSB7CiAJCQlzdGF0aWMgY29uc3Qgc3RydWN0 IHsKIAkJCQl1MzIgd2FpdF9tYm94OwogCQkJCWk5MTVfcmVnX3QgbWJveF9yZWc7Ci0JCQl9IHNl bV9kYXRhW0k5MTVfTlVNX0VOR0lORVNdW0k5MTVfTlVNX0VOR0lORVNdID0gewotCQkJCVtSQ1Nd ID0gewotCQkJCQlbVkNTXSA9ICB7IC53YWl0X21ib3ggPSBNSV9TRU1BUEhPUkVfU1lOQ19SViwg IC5tYm94X3JlZyA9IEdFTjZfVlJTWU5DIH0sCi0JCQkJCVtCQ1NdID0gIHsgLndhaXRfbWJveCA9 IE1JX1NFTUFQSE9SRV9TWU5DX1JCLCAgLm1ib3hfcmVnID0gR0VONl9CUlNZTkMgfSwKLQkJCQkJ W1ZFQ1NdID0geyAud2FpdF9tYm94ID0gTUlfU0VNQVBIT1JFX1NZTkNfUlZFLCAubWJveF9yZWcg PSBHRU42X1ZFUlNZTkMgfSwKKwkJCX0gc2VtX2RhdGFbR0VONl9OVU1fU0VNQVBIT1JFU11bR0VO Nl9OVU1fU0VNQVBIT1JFU10gPSB7CisJCQkJW1JDU19IV10gPSB7CisJCQkJCVtWQ1NfSFddID0g IHsgLndhaXRfbWJveCA9IE1JX1NFTUFQSE9SRV9TWU5DX1JWLCAgLm1ib3hfcmVnID0gR0VONl9W UlNZTkMgfSwKKwkJCQkJW0JDU19IV10gPSAgeyAud2FpdF9tYm94ID0gTUlfU0VNQVBIT1JFX1NZ TkNfUkIsICAubWJveF9yZWcgPSBHRU42X0JSU1lOQyB9LAorCQkJCQlbVkVDU19IV10gPSB7IC53 YWl0X21ib3ggPSBNSV9TRU1BUEhPUkVfU1lOQ19SVkUsIC5tYm94X3JlZyA9IEdFTjZfVkVSU1lO QyB9LAogCQkJCX0sCi0JCQkJW1ZDU10gPSB7Ci0JCQkJCVtSQ1NdID0gIHsgLndhaXRfbWJveCA9 IE1JX1NFTUFQSE9SRV9TWU5DX1ZSLCAgLm1ib3hfcmVnID0gR0VONl9SVlNZTkMgfSwKLQkJCQkJ W0JDU10gPSAgeyAud2FpdF9tYm94ID0gTUlfU0VNQVBIT1JFX1NZTkNfVkIsICAubWJveF9yZWcg PSBHRU42X0JWU1lOQyB9LAotCQkJCQlbVkVDU10gPSB7IC53YWl0X21ib3ggPSBNSV9TRU1BUEhP UkVfU1lOQ19WVkUsIC5tYm94X3JlZyA9IEdFTjZfVkVWU1lOQyB9LAorCQkJCVtWQ1NfSFddID0g eworCQkJCQlbUkNTX0hXXSA9ICB7IC53YWl0X21ib3ggPSBNSV9TRU1BUEhPUkVfU1lOQ19WUiwg IC5tYm94X3JlZyA9IEdFTjZfUlZTWU5DIH0sCisJCQkJCVtCQ1NfSFddID0gIHsgLndhaXRfbWJv eCA9IE1JX1NFTUFQSE9SRV9TWU5DX1ZCLCAgLm1ib3hfcmVnID0gR0VONl9CVlNZTkMgfSwKKwkJ CQkJW1ZFQ1NfSFddID0geyAud2FpdF9tYm94ID0gTUlfU0VNQVBIT1JFX1NZTkNfVlZFLCAubWJv eF9yZWcgPSBHRU42X1ZFVlNZTkMgfSwKIAkJCQl9LAotCQkJCVtCQ1NdID0gewotCQkJCQlbUkNT XSA9ICB7IC53YWl0X21ib3ggPSBNSV9TRU1BUEhPUkVfU1lOQ19CUiwgIC5tYm94X3JlZyA9IEdF TjZfUkJTWU5DIH0sCi0JCQkJCVtWQ1NdID0gIHsgLndhaXRfbWJveCA9IE1JX1NFTUFQSE9SRV9T WU5DX0JWLCAgLm1ib3hfcmVnID0gR0VONl9WQlNZTkMgfSwKLQkJCQkJW1ZFQ1NdID0geyAud2Fp dF9tYm94ID0gTUlfU0VNQVBIT1JFX1NZTkNfQlZFLCAubWJveF9yZWcgPSBHRU42X1ZFQlNZTkMg fSwKKwkJCQlbQkNTX0hXXSA9IHsKKwkJCQkJW1JDU19IV10gPSAgeyAud2FpdF9tYm94ID0gTUlf U0VNQVBIT1JFX1NZTkNfQlIsICAubWJveF9yZWcgPSBHRU42X1JCU1lOQyB9LAorCQkJCQlbVkNT X0hXXSA9ICB7IC53YWl0X21ib3ggPSBNSV9TRU1BUEhPUkVfU1lOQ19CViwgIC5tYm94X3JlZyA9 IEdFTjZfVkJTWU5DIH0sCisJCQkJCVtWRUNTX0hXXSA9IHsgLndhaXRfbWJveCA9IE1JX1NFTUFQ SE9SRV9TWU5DX0JWRSwgLm1ib3hfcmVnID0gR0VONl9WRUJTWU5DIH0sCiAJCQkJfSwKLQkJCQlb VkVDU10gPSB7Ci0JCQkJCVtSQ1NdID0gIHsgLndhaXRfbWJveCA9IE1JX1NFTUFQSE9SRV9TWU5D X1ZFUiwgLm1ib3hfcmVnID0gR0VONl9SVkVTWU5DIH0sCi0JCQkJCVtWQ1NdID0gIHsgLndhaXRf bWJveCA9IE1JX1NFTUFQSE9SRV9TWU5DX1ZFViwgLm1ib3hfcmVnID0gR0VONl9WVkVTWU5DIH0s Ci0JCQkJCVtCQ1NdID0gIHsgLndhaXRfbWJveCA9IE1JX1NFTUFQSE9SRV9TWU5DX1ZFQiwgLm1i b3hfcmVnID0gR0VONl9CVkVTWU5DIH0sCisJCQkJW1ZFQ1NfSFddID0geworCQkJCQlbUkNTX0hX XSA9ICB7IC53YWl0X21ib3ggPSBNSV9TRU1BUEhPUkVfU1lOQ19WRVIsIC5tYm94X3JlZyA9IEdF TjZfUlZFU1lOQyB9LAorCQkJCQlbVkNTX0hXXSA9ICB7IC53YWl0X21ib3ggPSBNSV9TRU1BUEhP UkVfU1lOQ19WRVYsIC5tYm94X3JlZyA9IEdFTjZfVlZFU1lOQyB9LAorCQkJCQlbQkNTX0hXXSA9 ICB7IC53YWl0X21ib3ggPSBNSV9TRU1BUEhPUkVfU1lOQ19WRUIsIC5tYm94X3JlZyA9IEdFTjZf QlZFU1lOQyB9LAogCQkJCX0sCiAJCQl9OwogCQkJdTMyIHdhaXRfbWJveDsKIAkJCWk5MTVfcmVn X3QgbWJveF9yZWc7CiAKLQkJCWlmIChpID09IGVuZ2luZS0+aWQgfHwgaSA9PSBWQ1MyKSB7CisJ CQlpZiAoaSA9PSBlbmdpbmUtPmh3X2lkKSB7CiAJCQkJd2FpdF9tYm94ID0gTUlfU0VNQVBIT1JF X1NZTkNfSU5WQUxJRDsKIAkJCQltYm94X3JlZyA9IEdFTjZfTk9TWU5DOwogCQkJfSBlbHNlIHsK LQkJCQl3YWl0X21ib3ggPSBzZW1fZGF0YVtlbmdpbmUtPmlkXVtpXS53YWl0X21ib3g7Ci0JCQkJ bWJveF9yZWcgPSBzZW1fZGF0YVtlbmdpbmUtPmlkXVtpXS5tYm94X3JlZzsKKwkJCQl3YWl0X21i b3ggPSBzZW1fZGF0YVtlbmdpbmUtPmh3X2lkXVtpXS53YWl0X21ib3g7CisJCQkJbWJveF9yZWcg PSBzZW1fZGF0YVtlbmdpbmUtPmh3X2lkXVtpXS5tYm94X3JlZzsKIAkJCX0KIAogCQkJZW5naW5l LT5zZW1hcGhvcmUubWJveC53YWl0W2ldID0gd2FpdF9tYm94OwpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfcmluZ2J1ZmZlci5oCmluZGV4IGFjNTY4ODA4YWViMS4uMDNiZWE1YmFhNDZhIDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oCkBAIC0yNzcsMTEgKzI3NywxNCBA QCBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzIHsKIAkJdTMyCXN5bmNfc2Vxbm9bSTkxNV9OVU1fRU5H SU5FUy0xXTsKIAogCQl1bmlvbiB7CisjZGVmaW5lIEdFTjZfU0VNQVBIT1JFX0xBU1QJVkVDU19I VworI2RlZmluZSBHRU42X05VTV9TRU1BUEhPUkVTCShHRU42X1NFTUFQSE9SRV9MQVNUICsgMSkK KyNkZWZpbmUgR0VONl9TRU1BUEhPUkVTX01BU0sJR0VOTUFTSyhHRU42X1NFTUFQSE9SRV9MQVNU LCAwKQogCQkJc3RydWN0IHsKIAkJCQkvKiBvdXIgbWJveCB3cml0dGVuIGJ5IG90aGVycyAqLwot CQkJCXUzMgkJd2FpdFtJOTE1X05VTV9FTkdJTkVTXTsKKwkJCQl1MzIJCXdhaXRbR0VONl9OVU1f U0VNQVBIT1JFU107CiAJCQkJLyogbWJveGVzIHRoaXMgcmluZyBzaWduYWxzIHRvICovCi0JCQkJ aTkxNV9yZWdfdAlzaWduYWxbSTkxNV9OVU1fRU5HSU5FU107CisJCQkJaTkxNV9yZWdfdAlzaWdu YWxbR0VONl9OVU1fU0VNQVBIT1JFU107CiAJCQl9IG1ib3g7CiAJCQl1NjQJCXNpZ25hbF9nZ3R0 W0k5MTVfTlVNX0VOR0lORVNdOwogCQl9OwotLSAKMS45LjEKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwt Z2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9t YWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=