From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [PATCH 08/13] drm/i915: Consolidate semaphore vfuncs init Date: Wed, 29 Jun 2016 16:09:27 +0100 Message-ID: <1467212972-861-8-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 5FE456E724 for ; Wed, 29 Jun 2016 15:09:45 +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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClNpZ25lZC1v ZmYtYnk6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+Ci0tLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jIHwgNDggKysrKysrKysrKysrKy0t LS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTggaW5zZXJ0aW9ucygrKSwgMzAg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmlu Z2J1ZmZlci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCmluZGV4 IGE5NjFiMDk1NjgwYi4uZDA0MDFiYjgwMGE2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf cmluZ2J1ZmZlci5jCkBAIC0yODczLDYgKzI4NzMsMjIgQEAgc3RhdGljIGludCBnZW42X3Jpbmdf Zmx1c2goc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEsCiAJcmV0dXJuIDA7CiB9CiAK K3N0YXRpYyB2b2lkIGludGVsX3JpbmdfaW5pdF9zZW1hcGhvcmVzKHN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdiwKKwkJCQkgICAgICAgc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5n aW5lKQoreworCWlmICghaTkxNV9zZW1hcGhvcmVfaXNfZW5hYmxlZChkZXZfcHJpdikpCisJCXJl dHVybjsKKworCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDgpIHsKKwkJZW5naW5lLT5zZW1h cGhvcmUuc3luY190byA9IGdlbjhfcmluZ19zeW5jOworCQllbmdpbmUtPnNlbWFwaG9yZS5zaWdu YWwgPSBnZW44X3hjc19zaWduYWw7CisJCUdFTjhfUklOR19TRU1BUEhPUkVfSU5JVChlbmdpbmUp OworCX0gZWxzZSBpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA2KSB7CisJCWVuZ2luZS0+c2Vt YXBob3JlLnN5bmNfdG8gPSBnZW42X3Jpbmdfc3luYzsKKwkJZW5naW5lLT5zZW1hcGhvcmUuc2ln bmFsID0gZ2VuNl9zaWduYWw7CisJfQorfQorCiBzdGF0aWMgdm9pZCBpbnRlbF9yaW5nX2RlZmF1 bHRfdmZ1bmNzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJCQkgICAgICBz dHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiB7CkBAIC0yOTA4LDYgKzI5MjQsOCBAQCBz dGF0aWMgdm9pZCBpbnRlbF9yaW5nX2RlZmF1bHRfdmZ1bmNzKHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdiwKIAkJZW5naW5lLT5pcnFfZ2V0ID0gaTh4eF9yaW5nX2dldF9pcnE7CiAJ CWVuZ2luZS0+aXJxX3B1dCA9IGk4eHhfcmluZ19wdXRfaXJxOwogCX0KKworCWludGVsX3Jpbmdf aW5pdF9zZW1hcGhvcmVzKGRldl9wcml2LCBlbmdpbmUpOwogfQogCiBpbnQgaW50ZWxfaW5pdF9y ZW5kZXJfcmluZ19idWZmZXIoc3RydWN0IGRybV9kZXZpY2UgKmRldikKQEAgLTI5NDksOSArMjk2 Nyw3IEBAIGludCBpbnRlbF9pbml0X3JlbmRlcl9yaW5nX2J1ZmZlcihzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2KQogCQllbmdpbmUtPmlycV9lbmFibGVfbWFzayA9IEdUX1JFTkRFUl9VU0VSX0lOVEVS UlVQVDsKIAkJaWYgKGk5MTVfc2VtYXBob3JlX2lzX2VuYWJsZWQoZGV2X3ByaXYpKSB7CiAJCQlX QVJOX09OKCFkZXZfcHJpdi0+c2VtYXBob3JlX29iaik7Ci0JCQllbmdpbmUtPnNlbWFwaG9yZS5z eW5jX3RvID0gZ2VuOF9yaW5nX3N5bmM7CiAJCQllbmdpbmUtPnNlbWFwaG9yZS5zaWduYWwgPSBn ZW44X3Jjc19zaWduYWw7Ci0JCQlHRU44X1JJTkdfU0VNQVBIT1JFX0lOSVQoZW5naW5lKTsKIAkJ fQogCX0gZWxzZSBpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA2KSB7CiAJCWVuZ2luZS0+aW5p dF9jb250ZXh0ID0gaW50ZWxfcmNzX2N0eF9pbml0OwpAQCAtMjk2MCw4ICsyOTc2LDYgQEAgaW50 IGludGVsX2luaXRfcmVuZGVyX3JpbmdfYnVmZmVyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJ CQllbmdpbmUtPmZsdXNoID0gZ2VuNl9yZW5kZXJfcmluZ19mbHVzaDsKIAkJZW5naW5lLT5pcnFf ZW5hYmxlX21hc2sgPSBHVF9SRU5ERVJfVVNFUl9JTlRFUlJVUFQ7CiAJCWlmIChpOTE1X3NlbWFw aG9yZV9pc19lbmFibGVkKGRldl9wcml2KSkgewotCQkJZW5naW5lLT5zZW1hcGhvcmUuc3luY190 byA9IGdlbjZfcmluZ19zeW5jOwotCQkJZW5naW5lLT5zZW1hcGhvcmUuc2lnbmFsID0gZ2VuNl9z aWduYWw7CiAJCQkvKgogCQkJICogVGhlIGN1cnJlbnQgc2VtYXBob3JlIGlzIG9ubHkgYXBwbGll ZCBvbiBwcmUtZ2VuOAogCQkJICogcGxhdGZvcm0uICBBbmQgdGhlcmUgaXMgbm8gVkNTMiByaW5n IG9uIHRoZSBwcmUtZ2VuOApAQCAtMzA1NywxNiArMzA3MSw5IEBAIGludCBpbnRlbF9pbml0X2Jz ZF9yaW5nX2J1ZmZlcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQlpZiAoSU5URUxfR0VOKGRl dl9wcml2KSA+PSA4KSB7CiAJCQllbmdpbmUtPmlycV9lbmFibGVfbWFzayA9CiAJCQkJR1RfUkVO REVSX1VTRVJfSU5URVJSVVBUIDw8IEdFTjhfVkNTMV9JUlFfU0hJRlQ7Ci0JCQlpZiAoaTkxNV9z ZW1hcGhvcmVfaXNfZW5hYmxlZChkZXZfcHJpdikpIHsKLQkJCQllbmdpbmUtPnNlbWFwaG9yZS5z eW5jX3RvID0gZ2VuOF9yaW5nX3N5bmM7Ci0JCQkJZW5naW5lLT5zZW1hcGhvcmUuc2lnbmFsID0g Z2VuOF94Y3Nfc2lnbmFsOwotCQkJCUdFTjhfUklOR19TRU1BUEhPUkVfSU5JVChlbmdpbmUpOwot CQkJfQogCQl9IGVsc2UgewogCQkJZW5naW5lLT5pcnFfZW5hYmxlX21hc2sgPSBHVF9CU0RfVVNF Ul9JTlRFUlJVUFQ7CiAJCQlpZiAoaTkxNV9zZW1hcGhvcmVfaXNfZW5hYmxlZChkZXZfcHJpdikp IHsKLQkJCQllbmdpbmUtPnNlbWFwaG9yZS5zeW5jX3RvID0gZ2VuNl9yaW5nX3N5bmM7Ci0JCQkJ ZW5naW5lLT5zZW1hcGhvcmUuc2lnbmFsID0gZ2VuNl9zaWduYWw7CiAJCQkJZW5naW5lLT5zZW1h cGhvcmUubWJveC53YWl0W1JDU10gPSBNSV9TRU1BUEhPUkVfU1lOQ19WUjsKIAkJCQllbmdpbmUt PnNlbWFwaG9yZS5tYm94LndhaXRbVkNTXSA9IE1JX1NFTUFQSE9SRV9TWU5DX0lOVkFMSUQ7CiAJ CQkJZW5naW5lLT5zZW1hcGhvcmUubWJveC53YWl0W0JDU10gPSBNSV9TRU1BUEhPUkVfU1lOQ19W QjsKQEAgLTMxMTEsMTEgKzMxMTgsNiBAQCBpbnQgaW50ZWxfaW5pdF9ic2QyX3JpbmdfYnVmZmVy KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJZW5naW5lLT5mbHVzaCA9IGdlbjZfYnNkX3Jpbmdf Zmx1c2g7CiAJZW5naW5lLT5pcnFfZW5hYmxlX21hc2sgPQogCQkJR1RfUkVOREVSX1VTRVJfSU5U RVJSVVBUIDw8IEdFTjhfVkNTMl9JUlFfU0hJRlQ7Ci0JaWYgKGk5MTVfc2VtYXBob3JlX2lzX2Vu YWJsZWQoZGV2X3ByaXYpKSB7Ci0JCWVuZ2luZS0+c2VtYXBob3JlLnN5bmNfdG8gPSBnZW44X3Jp bmdfc3luYzsKLQkJZW5naW5lLT5zZW1hcGhvcmUuc2lnbmFsID0gZ2VuOF94Y3Nfc2lnbmFsOwot CQlHRU44X1JJTkdfU0VNQVBIT1JFX0lOSVQoZW5naW5lKTsKLQl9CiAKIAlyZXR1cm4gaW50ZWxf aW5pdF9yaW5nX2J1ZmZlcihkZXYsIGVuZ2luZSk7CiB9CkBAIC0zMTM3LDE2ICszMTM5LDkgQEAg aW50IGludGVsX2luaXRfYmx0X3JpbmdfYnVmZmVyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJ aWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gOCkgewogCQllbmdpbmUtPmlycV9lbmFibGVfbWFz ayA9CiAJCQlHVF9SRU5ERVJfVVNFUl9JTlRFUlJVUFQgPDwgR0VOOF9CQ1NfSVJRX1NISUZUOwot CQlpZiAoaTkxNV9zZW1hcGhvcmVfaXNfZW5hYmxlZChkZXZfcHJpdikpIHsKLQkJCWVuZ2luZS0+ c2VtYXBob3JlLnN5bmNfdG8gPSBnZW44X3Jpbmdfc3luYzsKLQkJCWVuZ2luZS0+c2VtYXBob3Jl LnNpZ25hbCA9IGdlbjhfeGNzX3NpZ25hbDsKLQkJCUdFTjhfUklOR19TRU1BUEhPUkVfSU5JVChl bmdpbmUpOwotCQl9CiAJfSBlbHNlIHsKIAkJZW5naW5lLT5pcnFfZW5hYmxlX21hc2sgPSBHVF9C TFRfVVNFUl9JTlRFUlJVUFQ7CiAJCWlmIChpOTE1X3NlbWFwaG9yZV9pc19lbmFibGVkKGRldl9w cml2KSkgewotCQkJZW5naW5lLT5zZW1hcGhvcmUuc2lnbmFsID0gZ2VuNl9zaWduYWw7Ci0JCQll bmdpbmUtPnNlbWFwaG9yZS5zeW5jX3RvID0gZ2VuNl9yaW5nX3N5bmM7CiAJCQkvKgogCQkJICog VGhlIGN1cnJlbnQgc2VtYXBob3JlIGlzIG9ubHkgYXBwbGllZCBvbiBwcmUtZ2VuOAogCQkJICog cGxhdGZvcm0uICBBbmQgdGhlcmUgaXMgbm8gVkNTMiByaW5nIG9uIHRoZSBwcmUtZ2VuOApAQCAt MzE4OCwxOCArMzE4MywxMSBAQCBpbnQgaW50ZWxfaW5pdF92ZWJveF9yaW5nX2J1ZmZlcihzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2KQogCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDgpIHsKIAkJ ZW5naW5lLT5pcnFfZW5hYmxlX21hc2sgPQogCQkJR1RfUkVOREVSX1VTRVJfSU5URVJSVVBUIDw8 IEdFTjhfVkVDU19JUlFfU0hJRlQ7Ci0JCWlmIChpOTE1X3NlbWFwaG9yZV9pc19lbmFibGVkKGRl dl9wcml2KSkgewotCQkJZW5naW5lLT5zZW1hcGhvcmUuc3luY190byA9IGdlbjhfcmluZ19zeW5j OwotCQkJZW5naW5lLT5zZW1hcGhvcmUuc2lnbmFsID0gZ2VuOF94Y3Nfc2lnbmFsOwotCQkJR0VO OF9SSU5HX1NFTUFQSE9SRV9JTklUKGVuZ2luZSk7Ci0JCX0KIAl9IGVsc2UgewogCQllbmdpbmUt PmlycV9lbmFibGVfbWFzayA9IFBNX1ZFQk9YX1VTRVJfSU5URVJSVVBUOwogCQllbmdpbmUtPmly cV9nZXQgPSBoc3dfdmVib3hfZ2V0X2lycTsKIAkJZW5naW5lLT5pcnFfcHV0ID0gaHN3X3ZlYm94 X3B1dF9pcnE7CiAJCWlmIChpOTE1X3NlbWFwaG9yZV9pc19lbmFibGVkKGRldl9wcml2KSkgewot CQkJZW5naW5lLT5zZW1hcGhvcmUuc3luY190byA9IGdlbjZfcmluZ19zeW5jOwotCQkJZW5naW5l LT5zZW1hcGhvcmUuc2lnbmFsID0gZ2VuNl9zaWduYWw7CiAJCQllbmdpbmUtPnNlbWFwaG9yZS5t Ym94LndhaXRbUkNTXSA9IE1JX1NFTUFQSE9SRV9TWU5DX1ZFUjsKIAkJCWVuZ2luZS0+c2VtYXBo b3JlLm1ib3gud2FpdFtWQ1NdID0gTUlfU0VNQVBIT1JFX1NZTkNfVkVWOwogCQkJZW5naW5lLT5z ZW1hcGhvcmUubWJveC53YWl0W0JDU10gPSBNSV9TRU1BUEhPUkVfU1lOQ19WRUI7Ci0tIAoxLjku MQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwt Z2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8v bGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==