From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [PATCH 09/13] drm/i915: Move semaphore object creation into intel_ring_init_semaphores Date: Wed, 29 Jun 2016 16:09:28 +0100 Message-ID: <1467212972-861-9-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 9E2096E726 for ; Wed, 29 Jun 2016 15:09:46 +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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClRoZSBvYmpl Y3QgbmVlZHMgdG8gYmUgY3JlYXRlZCBiZWZvcmUgc2VtYXBob3JlcyBjYW4gYmUgaW5pdGlhbGl6 ZWQKb24gYW55IHJpbmcgYW5kIGl0IG1ha2VzIHNlbnNlIHRvIHB1bGwgaXQgb3V0IHRvIHRoaXMg c2VtYXBob3JlCmRlZGljYXRlZCBoZWxwZXIuCgpTaWduZWQtb2ZmLWJ5OiBUdnJ0a28gVXJzdWxp biA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3JpbmdidWZmZXIuYyB8IDQ1ICsrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLQog MSBmaWxlIGNoYW5nZWQsIDI1IGluc2VydGlvbnMoKyksIDIwIGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYwppbmRleCBkMDQwMWJiODAwYTYuLjc3ZDY2 M2ZjZGZmMSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZl ci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYwpAQCAtMjg3 Niw2ICsyODc2LDMwIEBAIHN0YXRpYyBpbnQgZ2VuNl9yaW5nX2ZsdXNoKHN0cnVjdCBkcm1faTkx NV9nZW1fcmVxdWVzdCAqcmVxLAogc3RhdGljIHZvaWQgaW50ZWxfcmluZ19pbml0X3NlbWFwaG9y ZXMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQkJCSAgICAgICBzdHJ1Y3Qg aW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiB7CisJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3Qg Km9iajsKKwlpbnQgcmV0OworCisJaWYgKCFpOTE1X3NlbWFwaG9yZV9pc19lbmFibGVkKGRldl9w cml2KSkKKwkJcmV0dXJuOworCisJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gOCAmJiAhZGV2 X3ByaXYtPnNlbWFwaG9yZV9vYmopIHsKKwkJb2JqID0gaTkxNV9nZW1fb2JqZWN0X2NyZWF0ZShk ZXZfcHJpdi0+ZGV2LCA0MDk2KTsKKwkJaWYgKElTX0VSUihvYmopKSB7CisJCQlEUk1fRVJST1Io IkZhaWxlZCB0byBhbGxvY2F0ZSBzZW1hcGhvcmUgYm8uIERpc2FibGluZyBzZW1hcGhvcmVzXG4i KTsKKwkJCWk5MTUuc2VtYXBob3JlcyA9IDA7CisJCX0gZWxzZSB7CisJCQlpOTE1X2dlbV9vYmpl Y3Rfc2V0X2NhY2hlX2xldmVsKG9iaiwgSTkxNV9DQUNIRV9MTEMpOworCQkJcmV0ID0gaTkxNV9n ZW1fb2JqX2dndHRfcGluKG9iaiwgMCwgUElOX05PTkJMT0NLKTsKKwkJCWlmIChyZXQgIT0gMCkg eworCQkJCWRybV9nZW1fb2JqZWN0X3VucmVmZXJlbmNlKCZvYmotPmJhc2UpOworCQkJCURSTV9F UlJPUigiRmFpbGVkIHRvIHBpbiBzZW1hcGhvcmUgYm8uIERpc2FibGluZyBzZW1hcGhvcmVzXG4i KTsKKwkJCQlpOTE1LnNlbWFwaG9yZXMgPSAwOworCQkJfSBlbHNlIHsKKwkJCQlkZXZfcHJpdi0+ c2VtYXBob3JlX29iaiA9IG9iajsKKwkJCX0KKwkJfQorCX0KKwogCWlmICghaTkxNV9zZW1hcGhv cmVfaXNfZW5hYmxlZChkZXZfcHJpdikpCiAJCXJldHVybjsKIApAQCAtMjk0NCwzMSArMjk2OCwx MiBAQCBpbnQgaW50ZWxfaW5pdF9yZW5kZXJfcmluZ19idWZmZXIoc3RydWN0IGRybV9kZXZpY2Ug KmRldikKIAlpbnRlbF9yaW5nX2RlZmF1bHRfdmZ1bmNzKGRldl9wcml2LCBlbmdpbmUpOwogCiAJ aWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gOCkgewotCQlpZiAoaTkxNV9zZW1hcGhvcmVfaXNf ZW5hYmxlZChkZXZfcHJpdikpIHsKLQkJCW9iaiA9IGk5MTVfZ2VtX29iamVjdF9jcmVhdGUoZGV2 LCA0MDk2KTsKLQkJCWlmIChJU19FUlIob2JqKSkgewotCQkJCURSTV9FUlJPUigiRmFpbGVkIHRv IGFsbG9jYXRlIHNlbWFwaG9yZSBiby4gRGlzYWJsaW5nIHNlbWFwaG9yZXNcbiIpOwotCQkJCWk5 MTUuc2VtYXBob3JlcyA9IDA7Ci0JCQl9IGVsc2UgewotCQkJCWk5MTVfZ2VtX29iamVjdF9zZXRf Y2FjaGVfbGV2ZWwob2JqLCBJOTE1X0NBQ0hFX0xMQyk7Ci0JCQkJcmV0ID0gaTkxNV9nZW1fb2Jq X2dndHRfcGluKG9iaiwgMCwgUElOX05PTkJMT0NLKTsKLQkJCQlpZiAocmV0ICE9IDApIHsKLQkJ CQkJZHJtX2dlbV9vYmplY3RfdW5yZWZlcmVuY2UoJm9iai0+YmFzZSk7Ci0JCQkJCURSTV9FUlJP UigiRmFpbGVkIHRvIHBpbiBzZW1hcGhvcmUgYm8uIERpc2FibGluZyBzZW1hcGhvcmVzXG4iKTsK LQkJCQkJaTkxNS5zZW1hcGhvcmVzID0gMDsKLQkJCQl9IGVsc2UKLQkJCQkJZGV2X3ByaXYtPnNl bWFwaG9yZV9vYmogPSBvYmo7Ci0JCQl9Ci0JCX0KLQogCQllbmdpbmUtPmluaXRfY29udGV4dCA9 IGludGVsX3Jjc19jdHhfaW5pdDsKIAkJZW5naW5lLT5hZGRfcmVxdWVzdCA9IGdlbjhfcmVuZGVy X2FkZF9yZXF1ZXN0OwogCQllbmdpbmUtPmZsdXNoID0gZ2VuOF9yZW5kZXJfcmluZ19mbHVzaDsK IAkJZW5naW5lLT5pcnFfZW5hYmxlX21hc2sgPSBHVF9SRU5ERVJfVVNFUl9JTlRFUlJVUFQ7Ci0J CWlmIChpOTE1X3NlbWFwaG9yZV9pc19lbmFibGVkKGRldl9wcml2KSkgewotCQkJV0FSTl9PTigh ZGV2X3ByaXYtPnNlbWFwaG9yZV9vYmopOworCQlpZiAoaTkxNV9zZW1hcGhvcmVfaXNfZW5hYmxl ZChkZXZfcHJpdikpCiAJCQllbmdpbmUtPnNlbWFwaG9yZS5zaWduYWwgPSBnZW44X3Jjc19zaWdu YWw7Ci0JCX0KIAl9IGVsc2UgaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gNikgewogCQllbmdp bmUtPmluaXRfY29udGV4dCA9IGludGVsX3Jjc19jdHhfaW5pdDsKIAkJZW5naW5lLT5mbHVzaCA9 IGdlbjdfcmVuZGVyX3JpbmdfZmx1c2g7Ci0tIAoxLjkuMQoKX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1n ZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h aWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==