From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [PATCH 03/13] drm/i915: Consolidate seqno_barrier vfunc Date: Wed, 29 Jun 2016 16:09:22 +0100 Message-ID: <1467212972-861-3-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 DDE086E71D for ; Wed, 29 Jun 2016 15:09:38 +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+ClJldmlld2Vk LWJ5OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KLS0tCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMgfCAxMSArKysrLS0tLS0tLQogMSBmaWxl IGNoYW5nZWQsIDQgaW5zZXJ0aW9ucygrKSwgNyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMKaW5kZXggZDgyZWIxMmVkNmI2Li5hNDM5MWNiYmIyYjYg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMKQEAgLTI4NzgsMTAgKzI4 NzgsMTIgQEAgc3RhdGljIHZvaWQgaW50ZWxfcmluZ19kZWZhdWx0X3ZmdW5jcyhzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiB7CiAJZW5naW5lLT53cml0ZV90YWlsID0gcmluZ193 cml0ZV90YWlsOwogCi0JaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gNikKKwlpZiAoSU5URUxf R0VOKGRldl9wcml2KSA+PSA2KSB7CiAJCWVuZ2luZS0+YWRkX3JlcXVlc3QgPSBnZW42X2FkZF9y ZXF1ZXN0OwotCWVsc2UKKwkJZW5naW5lLT5pcnFfc2Vxbm9fYmFycmllciA9IGdlbjZfc2Vxbm9f YmFycmllcjsKKwl9IGVsc2UgewogCQllbmdpbmUtPmFkZF9yZXF1ZXN0ID0gaTl4eF9hZGRfcmVx dWVzdDsKKwl9CiB9CiAKIGludCBpbnRlbF9pbml0X3JlbmRlcl9yaW5nX2J1ZmZlcihzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2KQpAQCAtMjkzOSw3ICsyOTQxLDYgQEAgaW50IGludGVsX2luaXRfcmVu ZGVyX3JpbmdfYnVmZmVyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCWVuZ2luZS0+aXJxX2dl dCA9IGdlbjZfcmluZ19nZXRfaXJxOwogCQllbmdpbmUtPmlycV9wdXQgPSBnZW42X3JpbmdfcHV0 X2lycTsKIAkJZW5naW5lLT5pcnFfZW5hYmxlX21hc2sgPSBHVF9SRU5ERVJfVVNFUl9JTlRFUlJV UFQ7Ci0JCWVuZ2luZS0+aXJxX3NlcW5vX2JhcnJpZXIgPSBnZW42X3NlcW5vX2JhcnJpZXI7CiAJ CWVuZ2luZS0+Z2V0X3NlcW5vID0gcmluZ19nZXRfc2Vxbm87CiAJCWVuZ2luZS0+c2V0X3NlcW5v ID0gcmluZ19zZXRfc2Vxbm87CiAJCWlmIChpOTE1X3NlbWFwaG9yZV9pc19lbmFibGVkKGRldl9w cml2KSkgewpAQCAtMzA1NCw3ICszMDU1LDYgQEAgaW50IGludGVsX2luaXRfYnNkX3JpbmdfYnVm ZmVyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCWlmIChJU19HRU42KGRldl9wcml2KSkKIAkJ CWVuZ2luZS0+d3JpdGVfdGFpbCA9IGdlbjZfYnNkX3Jpbmdfd3JpdGVfdGFpbDsKIAkJZW5naW5l LT5mbHVzaCA9IGdlbjZfYnNkX3JpbmdfZmx1c2g7Ci0JCWVuZ2luZS0+aXJxX3NlcW5vX2JhcnJp ZXIgPSBnZW42X3NlcW5vX2JhcnJpZXI7CiAJCWVuZ2luZS0+Z2V0X3NlcW5vID0gcmluZ19nZXRf c2Vxbm87CiAJCWVuZ2luZS0+c2V0X3NlcW5vID0gcmluZ19zZXRfc2Vxbm87CiAJCWlmIChJTlRF TF9HRU4oZGV2X3ByaXYpID49IDgpIHsKQEAgLTMxMjgsNyArMzEyOCw2IEBAIGludCBpbnRlbF9p bml0X2JzZDJfcmluZ19idWZmZXIoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlpbnRlbF9yaW5n X2RlZmF1bHRfdmZ1bmNzKGRldl9wcml2LCBlbmdpbmUpOwogCiAJZW5naW5lLT5mbHVzaCA9IGdl bjZfYnNkX3JpbmdfZmx1c2g7Ci0JZW5naW5lLT5pcnFfc2Vxbm9fYmFycmllciA9IGdlbjZfc2Vx bm9fYmFycmllcjsKIAllbmdpbmUtPmdldF9zZXFubyA9IHJpbmdfZ2V0X3NlcW5vOwogCWVuZ2lu ZS0+c2V0X3NlcW5vID0gcmluZ19zZXRfc2Vxbm87CiAJZW5naW5lLT5pcnFfZW5hYmxlX21hc2sg PQpAQCAtMzE2MSw3ICszMTYwLDYgQEAgaW50IGludGVsX2luaXRfYmx0X3JpbmdfYnVmZmVyKHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJaW50ZWxfcmluZ19kZWZhdWx0X3ZmdW5jcyhkZXZfcHJp diwgZW5naW5lKTsKIAogCWVuZ2luZS0+Zmx1c2ggPSBnZW42X3JpbmdfZmx1c2g7Ci0JZW5naW5l LT5pcnFfc2Vxbm9fYmFycmllciA9IGdlbjZfc2Vxbm9fYmFycmllcjsKIAllbmdpbmUtPmdldF9z ZXFubyA9IHJpbmdfZ2V0X3NlcW5vOwogCWVuZ2luZS0+c2V0X3NlcW5vID0gcmluZ19zZXRfc2Vx bm87CiAJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gOCkgewpAQCAtMzIyMSw3ICszMjE5LDYg QEAgaW50IGludGVsX2luaXRfdmVib3hfcmluZ19idWZmZXIoc3RydWN0IGRybV9kZXZpY2UgKmRl dikKIAlpbnRlbF9yaW5nX2RlZmF1bHRfdmZ1bmNzKGRldl9wcml2LCBlbmdpbmUpOwogCiAJZW5n aW5lLT5mbHVzaCA9IGdlbjZfcmluZ19mbHVzaDsKLQllbmdpbmUtPmlycV9zZXFub19iYXJyaWVy ID0gZ2VuNl9zZXFub19iYXJyaWVyOwogCWVuZ2luZS0+Z2V0X3NlcW5vID0gcmluZ19nZXRfc2Vx bm87CiAJZW5naW5lLT5zZXRfc2Vxbm8gPSByaW5nX3NldF9zZXFubzsKIAotLSAKMS45LjEKCl9f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBt YWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3Rz LmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=