From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH 16/29] drm/i915: Convert 'flip_queued_seqno' into 'flip_queued_request' Date: Thu, 30 Oct 2014 18:41:08 +0000 Message-ID: <1414694481-15724-17-git-send-email-John.C.Harrison@Intel.com> References: <1414694481-15724-1-git-send-email-John.C.Harrison@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 4955F6E57F for ; Thu, 30 Oct 2014 11:41:44 -0700 (PDT) In-Reply-To: <1414694481-15724-1-git-send-email-John.C.Harrison@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 RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KCkNvbnZlcnRl ZCB0aGUgZmxpcF9xdWV1ZWRfc2Vxbm8gdmFsdWUgdG8gYmUgYSByZXF1ZXN0IHN0cnVjdHVyZSBh cyBwYXJ0IG9mIHRoZQpvbiBnb2luZyBzZXFubyB0byByZXF1ZXN0IGNoYW5nZXMuIFRoaXMgaW5j bHVkZXMgcmVmZXJlbmNlIGNvdW50aW5nIHRoZSByZXF1ZXN0CmJlaW5nIHNhdmVkIGF3YXkgdG8g ZW5zdXJlIGl0IGNhbiBub3QgYmUgcmV0aXJlZCBhbmQgZnJlZWQgd2hpbGUgdGhlIGZsaXAgY29k ZQppcyBzdGlsbCB3YWl0aW5nIG9uIGl0LgoKRm9yOiBWSVotNDM3NwpTaWduZWQtb2ZmLWJ5OiBK b2huIEhhcnJpc29uIDxKb2huLkMuSGFycmlzb25ASW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jICB8ICAgIDQgKystLQogZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZGlzcGxheS5jIHwgICAxOSArKysrKysrKysrKysrLS0tLS0tCiBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kcnYuaCAgICAgfCAgICAyICstCiAzIGZpbGVzIGNoYW5nZWQsIDE2 IGluc2VydGlvbnMoKyksIDkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVn ZnMuYwppbmRleCA3OWNlNWMwLi4xNWFkMzIyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2RlYnVnZnMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVn ZnMuYwpAQCAtNTQ2LDExICs1NDYsMTEgQEAgc3RhdGljIGludCBpOTE1X2dlbV9wYWdlZmxpcF9p bmZvKHN0cnVjdCBzZXFfZmlsZSAqbSwgdm9pZCAqZGF0YSkKIAkJCWlmICh3b3JrLT5mbGlwX3F1 ZXVlZF9yaW5nKSB7CiAJCQkJc2VxX3ByaW50ZihtLCAiRmxpcCBxdWV1ZWQgb24gJXMgYXQgc2Vx bm8gJXUsIG5leHQgc2Vxbm8gJXUgW2N1cnJlbnQgYnJlYWRjcnVtYiAldV0sIGNvbXBsZXRlZD8g JWRcbiIsCiAJCQkJCSAgIHdvcmstPmZsaXBfcXVldWVkX3JpbmctPm5hbWUsCi0JCQkJCSAgIHdv cmstPmZsaXBfcXVldWVkX3NlcW5vLAorCQkJCQkgICBpOTE1X2dlbV9yZXF1ZXN0X2dldF9zZXFu byh3b3JrLT5mbGlwX3F1ZXVlZF9yZXEpLAogCQkJCQkgICBkZXZfcHJpdi0+bmV4dF9zZXFubywK IAkJCQkJICAgd29yay0+ZmxpcF9xdWV1ZWRfcmluZy0+Z2V0X3NlcW5vKHdvcmstPmZsaXBfcXVl dWVkX3JpbmcsIHRydWUpLAogCQkJCQkgICBpOTE1X3NlcW5vX3Bhc3NlZCh3b3JrLT5mbGlwX3F1 ZXVlZF9yaW5nLT5nZXRfc2Vxbm8od29yay0+ZmxpcF9xdWV1ZWRfcmluZywgdHJ1ZSksCi0JCQkJ CQkJICAgICB3b3JrLT5mbGlwX3F1ZXVlZF9zZXFubykpOworCQkJCQkJCSAgICAgaTkxNV9nZW1f cmVxdWVzdF9nZXRfc2Vxbm8od29yay0+ZmxpcF9xdWV1ZWRfcmVxKSkpOwogCQkJfSBlbHNlCiAJ CQkJc2VxX3ByaW50ZihtLCAiRmxpcCBub3QgYXNzb2NpYXRlZCB3aXRoIGFueSByaW5nXG4iKTsK IAkJCXNlcV9wcmludGYobSwgIkZsaXAgcXVldWVkIG9uIGZyYW1lICVkLCAod2FzIHJlYWR5IG9u IGZyYW1lICVkKSwgbm93ICVkXG4iLApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmlu ZGV4IDJiNGMyYmMuLjQ0MDA1YTIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMK QEAgLTk0NTAsMTAgKzk0NTAsMTUgQEAgc3RhdGljIGJvb2wgX19pbnRlbF9wYWdlZmxpcF9zdGFs bF9jaGVjayhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQlyZXR1cm4gZmFsc2U7CiAKIAlpZiAo d29yay0+ZmxpcF9yZWFkeV92YmxhbmsgPT0gMCkgewotCQlpZiAod29yay0+ZmxpcF9xdWV1ZWRf cmluZyAmJgotCQkgICAgIWk5MTVfc2Vxbm9fcGFzc2VkKHdvcmstPmZsaXBfcXVldWVkX3Jpbmct PmdldF9zZXFubyh3b3JrLT5mbGlwX3F1ZXVlZF9yaW5nLCB0cnVlKSwKLQkJCQkgICAgICAgd29y ay0+ZmxpcF9xdWV1ZWRfc2Vxbm8pKQotCQkJcmV0dXJuIGZhbHNlOworCQlpZiAod29yay0+Zmxp cF9xdWV1ZWRfcmluZykgeworCQkJaWYgKCFpOTE1X3NlcW5vX3Bhc3NlZCh3b3JrLT5mbGlwX3F1 ZXVlZF9yaW5nLT5nZXRfc2Vxbm8od29yay0+ZmxpcF9xdWV1ZWRfcmluZywgdHJ1ZSksCisJCQkJ ICAgICAgIGk5MTVfZ2VtX3JlcXVlc3RfZ2V0X3NlcW5vKHdvcmstPmZsaXBfcXVldWVkX3JlcSkp KQorCQkJCXJldHVybiBmYWxzZTsKKworCQkJaTkxNV9nZW1fcmVxdWVzdF91bnJlZmVyZW5jZV9p cnEod29yay0+ZmxpcF9xdWV1ZWRfcmVxKTsKKwkJCXdvcmstPmZsaXBfcXVldWVkX3JlcSAgPSBO VUxMOworCQkJd29yay0+ZmxpcF9xdWV1ZWRfcmluZyA9IE5VTEw7CisJCX0KIAogCQl3b3JrLT5m bGlwX3JlYWR5X3ZibGFuayA9IGRybV92YmxhbmtfY291bnQoZGV2LCBpbnRlbF9jcnRjLT5waXBl KTsKIAl9CkBAIC05NjE3LDcgKzk2MjIsOCBAQCBzdGF0aWMgaW50IGludGVsX2NydGNfcGFnZV9m bGlwKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAkJaWYgKHJldCkKIAkJCWdvdG8gY2xlYW51cF91 bnBpbjsKIAotCQl3b3JrLT5mbGlwX3F1ZXVlZF9zZXFubyA9IGk5MTVfZ2VtX3JlcXVlc3RfZ2V0 X3NlcW5vKG9iai0+bGFzdF93cml0ZV9yZXEpOworCQlpOTE1X2dlbV9yZXF1ZXN0X2Fzc2lnbigm d29yay0+ZmxpcF9xdWV1ZWRfcmVxLAorCQkJCQlvYmotPmxhc3Rfd3JpdGVfcmVxKTsKIAkJd29y ay0+ZmxpcF9xdWV1ZWRfcmluZyA9IG9iai0+cmluZzsKIAl9IGVsc2UgewogCQlyZXQgPSBkZXZf cHJpdi0+ZGlzcGxheS5xdWV1ZV9mbGlwKGRldiwgY3J0YywgZmIsIG9iaiwgcmluZywKQEAgLTk2 MjUsNyArOTYzMSw4IEBAIHN0YXRpYyBpbnQgaW50ZWxfY3J0Y19wYWdlX2ZsaXAoc3RydWN0IGRy bV9jcnRjICpjcnRjLAogCQlpZiAocmV0KQogCQkJZ290byBjbGVhbnVwX3VucGluOwogCi0JCXdv cmstPmZsaXBfcXVldWVkX3NlcW5vID0gaTkxNV9nZW1fcmVxdWVzdF9nZXRfc2Vxbm8oaW50ZWxf cmluZ19nZXRfcmVxdWVzdChyaW5nKSk7CisJCWk5MTVfZ2VtX3JlcXVlc3RfYXNzaWduKCZ3b3Jr LT5mbGlwX3F1ZXVlZF9yZXEsCisJCQkJCWludGVsX3JpbmdfZ2V0X3JlcXVlc3QocmluZykpOwog CQl3b3JrLT5mbGlwX3F1ZXVlZF9yaW5nID0gcmluZzsKIAl9CiAKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZHJ2LmgKaW5kZXggMjk2YjFhMC4uOGU1ODViNCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgK QEAgLTY5Myw3ICs2OTMsNyBAQCBzdHJ1Y3QgaW50ZWxfdW5waW5fd29yayB7CiAJdTMyIGZsaXBf Y291bnQ7CiAJdTMyIGd0dF9vZmZzZXQ7CiAJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZmxpcF9x dWV1ZWRfcmluZzsKLQl1MzIgZmxpcF9xdWV1ZWRfc2Vxbm87CisJc3RydWN0IGRybV9pOTE1X2dl bV9yZXF1ZXN0ICpmbGlwX3F1ZXVlZF9yZXE7CiAJaW50IGZsaXBfcXVldWVkX3ZibGFuazsKIAlp bnQgZmxpcF9yZWFkeV92Ymxhbms7CiAJYm9vbCBlbmFibGVfc3RhbGxfY2hlY2s7Ci0tIAoxLjcu OS41CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRl bC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDov L2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=