From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [PATCH 12/13] drm/i915: Consolidate legacy semaphore initialization Date: Wed, 29 Jun 2016 16:09:31 +0100 Message-ID: <1467212972-861-12-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1467212972-861-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 mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 7A4B36E723 for ; Wed, 29 Jun 2016 15:09:50 +0000 (UTC) In-Reply-To: <1467212972-861-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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClJlcGxhY2Ug cGVyLWVuZ2luZSBpbml0aWFsaXphdGlvbiB3aXRoIGEgY29tbW9uIGhhbGYtcHJvZ3JhbWF0aWMs CmhhbGYtZGF0YSBkcml2ZW4gY29kZSBmb3IgZWFzZSBvZiBtYWludGVuYW5jZSBhbmQgY29tcGFj dG5lc3MuCgpTaWduZWQtb2ZmLWJ5OiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50 ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYyB8IDEx MCArKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDQ4IGlu c2VydGlvbnMoKyksIDYyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Jp bmdidWZmZXIuYwppbmRleCA2NDhkZGVlNjBjMjQuLjdiYmM1OWVlZjI2NyAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYwpAQCAtMjkyMSw2ICsyOTIxLDU0IEBAIHN0YXRp YyB2b2lkIGludGVsX3JpbmdfaW5pdF9zZW1hcGhvcmVzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdiwKIAl9IGVsc2UgaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gNikgewogCQll bmdpbmUtPnNlbWFwaG9yZS5zeW5jX3RvID0gZ2VuNl9yaW5nX3N5bmM7CiAJCWVuZ2luZS0+c2Vt YXBob3JlLnNpZ25hbCA9IGdlbjZfc2lnbmFsOworCisJCS8qCisJCSAqIFRoZSBjdXJyZW50IHNl bWFwaG9yZSBpcyBvbmx5IGFwcGxpZWQgb24gcHJlLWdlbjgKKwkJICogcGxhdGZvcm0uICBBbmQg dGhlcmUgaXMgbm8gVkNTMiByaW5nIG9uIHRoZSBwcmUtZ2VuOAorCQkgKiBwbGF0Zm9ybS4gU28g dGhlIHNlbWFwaG9yZSBiZXR3ZWVuIFJDUyBhbmQgVkNTMiBpcworCQkgKiBpbml0aWFsaXplZCBh cyBJTlZBTElELiAgR2VuOCB3aWxsIGluaXRpYWxpemUgdGhlCisJCSAqIHNlbWEgYmV0d2VlbiBW Q1MyIGFuZCBSQ1MgbGF0ZXIuCisJCSAqLworCQlmb3IgKGkgPSAwOyBpIDwgSTkxNV9OVU1fRU5H SU5FUzsgaSsrKSB7CisJCQlzdGF0aWMgY29uc3Qgc3RydWN0IHsKKwkJCQl1MzIgd2FpdF9tYm94 OworCQkJCWk5MTVfcmVnX3QgbWJveF9yZWc7CisJCQl9IHNlbV9kYXRhW0k5MTVfTlVNX0VOR0lO RVNdW0k5MTVfTlVNX0VOR0lORVNdID0geworCQkJCVtSQ1NdID0geworCQkJCQlbVkNTXSA9ICB7 IC53YWl0X21ib3ggPSBNSV9TRU1BUEhPUkVfU1lOQ19SViwgIC5tYm94X3JlZyA9IEdFTjZfVlJT WU5DIH0sCisJCQkJCVtCQ1NdID0gIHsgLndhaXRfbWJveCA9IE1JX1NFTUFQSE9SRV9TWU5DX1JC LCAgLm1ib3hfcmVnID0gR0VONl9CUlNZTkMgfSwKKwkJCQkJW1ZFQ1NdID0geyAud2FpdF9tYm94 ID0gTUlfU0VNQVBIT1JFX1NZTkNfUlZFLCAubWJveF9yZWcgPSBHRU42X1ZFUlNZTkMgfSwKKwkJ CQl9LAorCQkJCVtWQ1NdID0geworCQkJCQlbUkNTXSA9ICB7IC53YWl0X21ib3ggPSBNSV9TRU1B UEhPUkVfU1lOQ19WUiwgIC5tYm94X3JlZyA9IEdFTjZfUlZTWU5DIH0sCisJCQkJCVtCQ1NdID0g IHsgLndhaXRfbWJveCA9IE1JX1NFTUFQSE9SRV9TWU5DX1ZCLCAgLm1ib3hfcmVnID0gR0VONl9C VlNZTkMgfSwKKwkJCQkJW1ZFQ1NdID0geyAud2FpdF9tYm94ID0gTUlfU0VNQVBIT1JFX1NZTkNf VlZFLCAubWJveF9yZWcgPSBHRU42X1ZFVlNZTkMgfSwKKwkJCQl9LAorCQkJCVtCQ1NdID0gewor CQkJCQlbUkNTXSA9ICB7IC53YWl0X21ib3ggPSBNSV9TRU1BUEhPUkVfU1lOQ19CUiwgIC5tYm94 X3JlZyA9IEdFTjZfUkJTWU5DIH0sCisJCQkJCVtWQ1NdID0gIHsgLndhaXRfbWJveCA9IE1JX1NF TUFQSE9SRV9TWU5DX0JWLCAgLm1ib3hfcmVnID0gR0VONl9WQlNZTkMgfSwKKwkJCQkJW1ZFQ1Nd ID0geyAud2FpdF9tYm94ID0gTUlfU0VNQVBIT1JFX1NZTkNfQlZFLCAubWJveF9yZWcgPSBHRU42 X1ZFQlNZTkMgfSwKKwkJCQl9LAorCQkJCVtWRUNTXSA9IHsKKwkJCQkJW1JDU10gPSAgeyAud2Fp dF9tYm94ID0gTUlfU0VNQVBIT1JFX1NZTkNfVkVSLCAubWJveF9yZWcgPSBHRU42X1JWRVNZTkMg fSwKKwkJCQkJW1ZDU10gPSAgeyAud2FpdF9tYm94ID0gTUlfU0VNQVBIT1JFX1NZTkNfVkVWLCAu bWJveF9yZWcgPSBHRU42X1ZWRVNZTkMgfSwKKwkJCQkJW0JDU10gPSAgeyAud2FpdF9tYm94ID0g TUlfU0VNQVBIT1JFX1NZTkNfVkVCLCAubWJveF9yZWcgPSBHRU42X0JWRVNZTkMgfSwKKwkJCQl9 LAorCQkJfTsKKwkJCXUzMiB3YWl0X21ib3g7CisJCQlpOTE1X3JlZ190IG1ib3hfcmVnOworCisJ CQlpZiAoaSA9PSBlbmdpbmUtPmlkIHx8IGkgPT0gVkNTMikgeworCQkJCXdhaXRfbWJveCA9IE1J X1NFTUFQSE9SRV9TWU5DX0lOVkFMSUQ7CisJCQkJbWJveF9yZWcgPSBHRU42X05PU1lOQzsKKwkJ CX0gZWxzZSB7CisJCQkJd2FpdF9tYm94ID0gc2VtX2RhdGFbZW5naW5lLT5pZF1baV0ud2FpdF9t Ym94OworCQkJCW1ib3hfcmVnID0gc2VtX2RhdGFbZW5naW5lLT5pZF1baV0ubWJveF9yZWc7CisJ CQl9CisKKwkJCWVuZ2luZS0+c2VtYXBob3JlLm1ib3gud2FpdFtpXSA9IHdhaXRfbWJveDsKKwkJ CWVuZ2luZS0+c2VtYXBob3JlLm1ib3guc2lnbmFsW2ldID0gbWJveF9yZWc7CisJCX0KIAl9CiB9 CiAKQEAgLTI5OTEsMjUgKzMwMzksNiBAQCBpbnQgaW50ZWxfaW5pdF9yZW5kZXJfcmluZ19idWZm ZXIoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJaWYgKElTX0dFTjYoZGV2X3ByaXYpKQogCQkJ ZW5naW5lLT5mbHVzaCA9IGdlbjZfcmVuZGVyX3JpbmdfZmx1c2g7CiAJCWVuZ2luZS0+aXJxX2Vu YWJsZV9tYXNrID0gR1RfUkVOREVSX1VTRVJfSU5URVJSVVBUOwotCQlpZiAoaTkxNV9zZW1hcGhv cmVfaXNfZW5hYmxlZChkZXZfcHJpdikpIHsKLQkJCS8qCi0JCQkgKiBUaGUgY3VycmVudCBzZW1h cGhvcmUgaXMgb25seSBhcHBsaWVkIG9uIHByZS1nZW44Ci0JCQkgKiBwbGF0Zm9ybS4gIEFuZCB0 aGVyZSBpcyBubyBWQ1MyIHJpbmcgb24gdGhlIHByZS1nZW44Ci0JCQkgKiBwbGF0Zm9ybS4gU28g dGhlIHNlbWFwaG9yZSBiZXR3ZWVuIFJDUyBhbmQgVkNTMiBpcwotCQkJICogaW5pdGlhbGl6ZWQg YXMgSU5WQUxJRC4gIEdlbjggd2lsbCBpbml0aWFsaXplIHRoZQotCQkJICogc2VtYSBiZXR3ZWVu IFZDUzIgYW5kIFJDUyBsYXRlci4KLQkJCSAqLwotCQkJZW5naW5lLT5zZW1hcGhvcmUubWJveC53 YWl0W1JDU10gPSBNSV9TRU1BUEhPUkVfU1lOQ19JTlZBTElEOwotCQkJZW5naW5lLT5zZW1hcGhv cmUubWJveC53YWl0W1ZDU10gPSBNSV9TRU1BUEhPUkVfU1lOQ19SVjsKLQkJCWVuZ2luZS0+c2Vt YXBob3JlLm1ib3gud2FpdFtCQ1NdID0gTUlfU0VNQVBIT1JFX1NZTkNfUkI7Ci0JCQllbmdpbmUt PnNlbWFwaG9yZS5tYm94LndhaXRbVkVDU10gPSBNSV9TRU1BUEhPUkVfU1lOQ19SVkU7Ci0JCQll bmdpbmUtPnNlbWFwaG9yZS5tYm94LndhaXRbVkNTMl0gPSBNSV9TRU1BUEhPUkVfU1lOQ19JTlZB TElEOwotCQkJZW5naW5lLT5zZW1hcGhvcmUubWJveC5zaWduYWxbUkNTXSA9IEdFTjZfTk9TWU5D OwotCQkJZW5naW5lLT5zZW1hcGhvcmUubWJveC5zaWduYWxbVkNTXSA9IEdFTjZfVlJTWU5DOwot CQkJZW5naW5lLT5zZW1hcGhvcmUubWJveC5zaWduYWxbQkNTXSA9IEdFTjZfQlJTWU5DOwotCQkJ ZW5naW5lLT5zZW1hcGhvcmUubWJveC5zaWduYWxbVkVDU10gPSBHRU42X1ZFUlNZTkM7Ci0JCQll bmdpbmUtPnNlbWFwaG9yZS5tYm94LnNpZ25hbFtWQ1MyXSA9IEdFTjZfTk9TWU5DOwotCQl9CiAJ fSBlbHNlIGlmIChJU19HRU41KGRldl9wcml2KSkgewogCQllbmdpbmUtPmFkZF9yZXF1ZXN0ID0g cGNfcmVuZGVyX2FkZF9yZXF1ZXN0OwogCQllbmdpbmUtPmZsdXNoID0gZ2VuNF9yZW5kZXJfcmlu Z19mbHVzaDsKQEAgLTMwODksMTggKzMxMTgsNiBAQCBpbnQgaW50ZWxfaW5pdF9ic2RfcmluZ19i dWZmZXIoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJCQlHVF9SRU5ERVJfVVNFUl9JTlRFUlJV UFQgPDwgR0VOOF9WQ1MxX0lSUV9TSElGVDsKIAkJfSBlbHNlIHsKIAkJCWVuZ2luZS0+aXJxX2Vu YWJsZV9tYXNrID0gR1RfQlNEX1VTRVJfSU5URVJSVVBUOwotCQkJaWYgKGk5MTVfc2VtYXBob3Jl X2lzX2VuYWJsZWQoZGV2X3ByaXYpKSB7Ci0JCQkJZW5naW5lLT5zZW1hcGhvcmUubWJveC53YWl0 W1JDU10gPSBNSV9TRU1BUEhPUkVfU1lOQ19WUjsKLQkJCQllbmdpbmUtPnNlbWFwaG9yZS5tYm94 LndhaXRbVkNTXSA9IE1JX1NFTUFQSE9SRV9TWU5DX0lOVkFMSUQ7Ci0JCQkJZW5naW5lLT5zZW1h cGhvcmUubWJveC53YWl0W0JDU10gPSBNSV9TRU1BUEhPUkVfU1lOQ19WQjsKLQkJCQllbmdpbmUt PnNlbWFwaG9yZS5tYm94LndhaXRbVkVDU10gPSBNSV9TRU1BUEhPUkVfU1lOQ19WVkU7Ci0JCQkJ ZW5naW5lLT5zZW1hcGhvcmUubWJveC53YWl0W1ZDUzJdID0gTUlfU0VNQVBIT1JFX1NZTkNfSU5W QUxJRDsKLQkJCQllbmdpbmUtPnNlbWFwaG9yZS5tYm94LnNpZ25hbFtSQ1NdID0gR0VONl9SVlNZ TkM7Ci0JCQkJZW5naW5lLT5zZW1hcGhvcmUubWJveC5zaWduYWxbVkNTXSA9IEdFTjZfTk9TWU5D OwotCQkJCWVuZ2luZS0+c2VtYXBob3JlLm1ib3guc2lnbmFsW0JDU10gPSBHRU42X0JWU1lOQzsK LQkJCQllbmdpbmUtPnNlbWFwaG9yZS5tYm94LnNpZ25hbFtWRUNTXSA9IEdFTjZfVkVWU1lOQzsK LQkJCQllbmdpbmUtPnNlbWFwaG9yZS5tYm94LnNpZ25hbFtWQ1MyXSA9IEdFTjZfTk9TWU5DOwot CQkJfQogCQl9CiAJfSBlbHNlIHsKIAkJZW5naW5lLT5tbWlvX2Jhc2UgPSBCU0RfUklOR19CQVNF OwpAQCAtMzE1NywyNSArMzE3NCw2IEBAIGludCBpbnRlbF9pbml0X2JsdF9yaW5nX2J1ZmZlcihz dHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQkJR1RfUkVOREVSX1VTRVJfSU5URVJSVVBUIDw8IEdF TjhfQkNTX0lSUV9TSElGVDsKIAl9IGVsc2UgewogCQllbmdpbmUtPmlycV9lbmFibGVfbWFzayA9 IEdUX0JMVF9VU0VSX0lOVEVSUlVQVDsKLQkJaWYgKGk5MTVfc2VtYXBob3JlX2lzX2VuYWJsZWQo ZGV2X3ByaXYpKSB7Ci0JCQkvKgotCQkJICogVGhlIGN1cnJlbnQgc2VtYXBob3JlIGlzIG9ubHkg YXBwbGllZCBvbiBwcmUtZ2VuOAotCQkJICogcGxhdGZvcm0uICBBbmQgdGhlcmUgaXMgbm8gVkNT MiByaW5nIG9uIHRoZSBwcmUtZ2VuOAotCQkJICogcGxhdGZvcm0uIFNvIHRoZSBzZW1hcGhvcmUg YmV0d2VlbiBCQ1MgYW5kIFZDUzIgaXMKLQkJCSAqIGluaXRpYWxpemVkIGFzIElOVkFMSUQuICBH ZW44IHdpbGwgaW5pdGlhbGl6ZSB0aGUKLQkJCSAqIHNlbWEgYmV0d2VlbiBCQ1MgYW5kIFZDUzIg bGF0ZXIuCi0JCQkgKi8KLQkJCWVuZ2luZS0+c2VtYXBob3JlLm1ib3gud2FpdFtSQ1NdID0gTUlf U0VNQVBIT1JFX1NZTkNfQlI7Ci0JCQllbmdpbmUtPnNlbWFwaG9yZS5tYm94LndhaXRbVkNTXSA9 IE1JX1NFTUFQSE9SRV9TWU5DX0JWOwotCQkJZW5naW5lLT5zZW1hcGhvcmUubWJveC53YWl0W0JD U10gPSBNSV9TRU1BUEhPUkVfU1lOQ19JTlZBTElEOwotCQkJZW5naW5lLT5zZW1hcGhvcmUubWJv eC53YWl0W1ZFQ1NdID0gTUlfU0VNQVBIT1JFX1NZTkNfQlZFOwotCQkJZW5naW5lLT5zZW1hcGhv cmUubWJveC53YWl0W1ZDUzJdID0gTUlfU0VNQVBIT1JFX1NZTkNfSU5WQUxJRDsKLQkJCWVuZ2lu ZS0+c2VtYXBob3JlLm1ib3guc2lnbmFsW1JDU10gPSBHRU42X1JCU1lOQzsKLQkJCWVuZ2luZS0+ c2VtYXBob3JlLm1ib3guc2lnbmFsW1ZDU10gPSBHRU42X1ZCU1lOQzsKLQkJCWVuZ2luZS0+c2Vt YXBob3JlLm1ib3guc2lnbmFsW0JDU10gPSBHRU42X05PU1lOQzsKLQkJCWVuZ2luZS0+c2VtYXBo b3JlLm1ib3guc2lnbmFsW1ZFQ1NdID0gR0VONl9WRUJTWU5DOwotCQkJZW5naW5lLT5zZW1hcGhv cmUubWJveC5zaWduYWxbVkNTMl0gPSBHRU42X05PU1lOQzsKLQkJfQogCX0KIAogCXJldHVybiBp bnRlbF9pbml0X3JpbmdfYnVmZmVyKGRldiwgZW5naW5lKTsKQEAgLTMyMDMsMTggKzMyMDEsNiBA QCBpbnQgaW50ZWxfaW5pdF92ZWJveF9yaW5nX2J1ZmZlcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 KQogCQllbmdpbmUtPmlycV9lbmFibGVfbWFzayA9IFBNX1ZFQk9YX1VTRVJfSU5URVJSVVBUOwog CQllbmdpbmUtPmlycV9nZXQgPSBoc3dfdmVib3hfZ2V0X2lycTsKIAkJZW5naW5lLT5pcnFfcHV0 ID0gaHN3X3ZlYm94X3B1dF9pcnE7Ci0JCWlmIChpOTE1X3NlbWFwaG9yZV9pc19lbmFibGVkKGRl dl9wcml2KSkgewotCQkJZW5naW5lLT5zZW1hcGhvcmUubWJveC53YWl0W1JDU10gPSBNSV9TRU1B UEhPUkVfU1lOQ19WRVI7Ci0JCQllbmdpbmUtPnNlbWFwaG9yZS5tYm94LndhaXRbVkNTXSA9IE1J X1NFTUFQSE9SRV9TWU5DX1ZFVjsKLQkJCWVuZ2luZS0+c2VtYXBob3JlLm1ib3gud2FpdFtCQ1Nd ID0gTUlfU0VNQVBIT1JFX1NZTkNfVkVCOwotCQkJZW5naW5lLT5zZW1hcGhvcmUubWJveC53YWl0 W1ZFQ1NdID0gTUlfU0VNQVBIT1JFX1NZTkNfSU5WQUxJRDsKLQkJCWVuZ2luZS0+c2VtYXBob3Jl Lm1ib3gud2FpdFtWQ1MyXSA9IE1JX1NFTUFQSE9SRV9TWU5DX0lOVkFMSUQ7Ci0JCQllbmdpbmUt PnNlbWFwaG9yZS5tYm94LnNpZ25hbFtSQ1NdID0gR0VONl9SVkVTWU5DOwotCQkJZW5naW5lLT5z ZW1hcGhvcmUubWJveC5zaWduYWxbVkNTXSA9IEdFTjZfVlZFU1lOQzsKLQkJCWVuZ2luZS0+c2Vt YXBob3JlLm1ib3guc2lnbmFsW0JDU10gPSBHRU42X0JWRVNZTkM7Ci0JCQllbmdpbmUtPnNlbWFw aG9yZS5tYm94LnNpZ25hbFtWRUNTXSA9IEdFTjZfTk9TWU5DOwotCQkJZW5naW5lLT5zZW1hcGhv cmUubWJveC5zaWduYWxbVkNTMl0gPSBHRU42X05PU1lOQzsKLQkJfQogCX0KIAogCXJldHVybiBp bnRlbF9pbml0X3JpbmdfYnVmZmVyKGRldiwgZW5naW5lKTsKLS0gCjEuOS4xCgpfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBs aXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVz a3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK