From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [PATCH 03/13] drm/i915: Consolidate seqno_barrier vfunc Date: Mon, 27 Jun 2016 15:04:10 +0100 Message-ID: <1467036260-9252-4-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1467036260-9252-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 mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id EF15D6E2D9 for ; Mon, 27 Jun 2016 14:04:53 +0000 (UTC) In-Reply-To: <1467036260-9252-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 dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jIHwgMTEgKysrKy0tLS0tLS0KIDEg ZmlsZSBjaGFuZ2VkLCA0IGluc2VydGlvbnMoKyksIDcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCmluZGV4IGQ4MmViMTJlZDZiNi4uYTQzOTFjYmJi MmI2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCkBAIC0yODc4LDEw ICsyODc4LDEyIEBAIHN0YXRpYyB2b2lkIGludGVsX3JpbmdfZGVmYXVsdF92ZnVuY3Moc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogewogCWVuZ2luZS0+d3JpdGVfdGFpbCA9IHJp bmdfd3JpdGVfdGFpbDsKIAotCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDYpCisJaWYgKElO VEVMX0dFTihkZXZfcHJpdikgPj0gNikgewogCQllbmdpbmUtPmFkZF9yZXF1ZXN0ID0gZ2VuNl9h ZGRfcmVxdWVzdDsKLQllbHNlCisJCWVuZ2luZS0+aXJxX3NlcW5vX2JhcnJpZXIgPSBnZW42X3Nl cW5vX2JhcnJpZXI7CisJfSBlbHNlIHsKIAkJZW5naW5lLT5hZGRfcmVxdWVzdCA9IGk5eHhfYWRk X3JlcXVlc3Q7CisJfQogfQogCiBpbnQgaW50ZWxfaW5pdF9yZW5kZXJfcmluZ19idWZmZXIoc3Ry dWN0IGRybV9kZXZpY2UgKmRldikKQEAgLTI5MzksNyArMjk0MSw2IEBAIGludCBpbnRlbF9pbml0 X3JlbmRlcl9yaW5nX2J1ZmZlcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQllbmdpbmUtPmly cV9nZXQgPSBnZW42X3JpbmdfZ2V0X2lycTsKIAkJZW5naW5lLT5pcnFfcHV0ID0gZ2VuNl9yaW5n X3B1dF9pcnE7CiAJCWVuZ2luZS0+aXJxX2VuYWJsZV9tYXNrID0gR1RfUkVOREVSX1VTRVJfSU5U RVJSVVBUOwotCQllbmdpbmUtPmlycV9zZXFub19iYXJyaWVyID0gZ2VuNl9zZXFub19iYXJyaWVy OwogCQllbmdpbmUtPmdldF9zZXFubyA9IHJpbmdfZ2V0X3NlcW5vOwogCQllbmdpbmUtPnNldF9z ZXFubyA9IHJpbmdfc2V0X3NlcW5vOwogCQlpZiAoaTkxNV9zZW1hcGhvcmVfaXNfZW5hYmxlZChk ZXZfcHJpdikpIHsKQEAgLTMwNTQsNyArMzA1NSw2IEBAIGludCBpbnRlbF9pbml0X2JzZF9yaW5n X2J1ZmZlcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQlpZiAoSVNfR0VONihkZXZfcHJpdikp CiAJCQllbmdpbmUtPndyaXRlX3RhaWwgPSBnZW42X2JzZF9yaW5nX3dyaXRlX3RhaWw7CiAJCWVu Z2luZS0+Zmx1c2ggPSBnZW42X2JzZF9yaW5nX2ZsdXNoOwotCQllbmdpbmUtPmlycV9zZXFub19i YXJyaWVyID0gZ2VuNl9zZXFub19iYXJyaWVyOwogCQllbmdpbmUtPmdldF9zZXFubyA9IHJpbmdf Z2V0X3NlcW5vOwogCQllbmdpbmUtPnNldF9zZXFubyA9IHJpbmdfc2V0X3NlcW5vOwogCQlpZiAo SU5URUxfR0VOKGRldl9wcml2KSA+PSA4KSB7CkBAIC0zMTI4LDcgKzMxMjgsNiBAQCBpbnQgaW50 ZWxfaW5pdF9ic2QyX3JpbmdfYnVmZmVyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJaW50ZWxf cmluZ19kZWZhdWx0X3ZmdW5jcyhkZXZfcHJpdiwgZW5naW5lKTsKIAogCWVuZ2luZS0+Zmx1c2gg PSBnZW42X2JzZF9yaW5nX2ZsdXNoOwotCWVuZ2luZS0+aXJxX3NlcW5vX2JhcnJpZXIgPSBnZW42 X3NlcW5vX2JhcnJpZXI7CiAJZW5naW5lLT5nZXRfc2Vxbm8gPSByaW5nX2dldF9zZXFubzsKIAll bmdpbmUtPnNldF9zZXFubyA9IHJpbmdfc2V0X3NlcW5vOwogCWVuZ2luZS0+aXJxX2VuYWJsZV9t YXNrID0KQEAgLTMxNjEsNyArMzE2MCw2IEBAIGludCBpbnRlbF9pbml0X2JsdF9yaW5nX2J1ZmZl cihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCWludGVsX3JpbmdfZGVmYXVsdF92ZnVuY3MoZGV2 X3ByaXYsIGVuZ2luZSk7CiAKIAllbmdpbmUtPmZsdXNoID0gZ2VuNl9yaW5nX2ZsdXNoOwotCWVu Z2luZS0+aXJxX3NlcW5vX2JhcnJpZXIgPSBnZW42X3NlcW5vX2JhcnJpZXI7CiAJZW5naW5lLT5n ZXRfc2Vxbm8gPSByaW5nX2dldF9zZXFubzsKIAllbmdpbmUtPnNldF9zZXFubyA9IHJpbmdfc2V0 X3NlcW5vOwogCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDgpIHsKQEAgLTMyMjEsNyArMzIx OSw2IEBAIGludCBpbnRlbF9pbml0X3ZlYm94X3JpbmdfYnVmZmVyKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYpCiAJaW50ZWxfcmluZ19kZWZhdWx0X3ZmdW5jcyhkZXZfcHJpdiwgZW5naW5lKTsKIAog CWVuZ2luZS0+Zmx1c2ggPSBnZW42X3JpbmdfZmx1c2g7Ci0JZW5naW5lLT5pcnFfc2Vxbm9fYmFy cmllciA9IGdlbjZfc2Vxbm9fYmFycmllcjsKIAllbmdpbmUtPmdldF9zZXFubyA9IHJpbmdfZ2V0 X3NlcW5vOwogCWVuZ2luZS0+c2V0X3NlcW5vID0gcmluZ19zZXRfc2Vxbm87CiAKLS0gCjEuOS4x CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1n ZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9s aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK