From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH v3 15/28] drm/i915: Convert 'flip_queued_seqno' into 'flip_queued_request' Date: Mon, 24 Nov 2014 18:49:37 +0000 Message-ID: <1416854990-1920-16-git-send-email-John.C.Harrison@Intel.com> References: <1416854990-1920-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 mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 747306EE1F for ; Mon, 24 Nov 2014 10:50:20 -0800 (PST) In-Reply-To: <1416854990-1920-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 b2huIEhhcnJpc29uIDxKb2huLkMuSGFycmlzb25ASW50ZWwuY29tPgpSZXZpZXdlZC1ieTogVGhv bWFzIERhbmllbCA8VGhvbWFzLkRhbmllbEBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kZWJ1Z2ZzLmMgIHwgICAgNCArKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kaXNwbGF5LmMgfCAgIDI0ICsrKysrKysrKysrKysrKystLS0tLS0tLQogZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggICAgIHwgICAgMiArLQogMyBmaWxlcyBjaGFuZ2VkLCAx OSBpbnNlcnRpb25zKCspLCAxMSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVi dWdmcy5jCmluZGV4IDI3MjBlYjUuLmJjOWIxYzggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZGVidWdmcy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVi dWdmcy5jCkBAIC01NDYsMTEgKzU0NiwxMSBAQCBzdGF0aWMgaW50IGk5MTVfZ2VtX3BhZ2VmbGlw X2luZm8oc3RydWN0IHNlcV9maWxlICptLCB2b2lkICpkYXRhKQogCQkJaWYgKHdvcmstPmZsaXBf cXVldWVkX3JpbmcpIHsKIAkJCQlzZXFfcHJpbnRmKG0sICJGbGlwIHF1ZXVlZCBvbiAlcyBhdCBz ZXFubyAldSwgbmV4dCBzZXFubyAldSBbY3VycmVudCBicmVhZGNydW1iICV1XSwgY29tcGxldGVk PyAlZFxuIiwKIAkJCQkJICAgd29yay0+ZmxpcF9xdWV1ZWRfcmluZy0+bmFtZSwKLQkJCQkJICAg d29yay0+ZmxpcF9xdWV1ZWRfc2Vxbm8sCisJCQkJCSAgIGk5MTVfZ2VtX3JlcXVlc3RfZ2V0X3Nl cW5vKHdvcmstPmZsaXBfcXVldWVkX3JlcSksCiAJCQkJCSAgIGRldl9wcml2LT5uZXh0X3NlcW5v LAogCQkJCQkgICB3b3JrLT5mbGlwX3F1ZXVlZF9yaW5nLT5nZXRfc2Vxbm8od29yay0+ZmxpcF9x dWV1ZWRfcmluZywgdHJ1ZSksCiAJCQkJCSAgIGk5MTVfc2Vxbm9fcGFzc2VkKHdvcmstPmZsaXBf cXVldWVkX3JpbmctPmdldF9zZXFubyh3b3JrLT5mbGlwX3F1ZXVlZF9yaW5nLCB0cnVlKSwKLQkJ CQkJCQkgICAgIHdvcmstPmZsaXBfcXVldWVkX3NlcW5vKSk7CisJCQkJCQkJICAgICBpOTE1X2dl bV9yZXF1ZXN0X2dldF9zZXFubyh3b3JrLT5mbGlwX3F1ZXVlZF9yZXEpKSk7CiAJCQl9IGVsc2UK IAkJCQlzZXFfcHJpbnRmKG0sICJGbGlwIG5vdCBhc3NvY2lhdGVkIHdpdGggYW55IHJpbmdcbiIp OwogCQkJc2VxX3ByaW50ZihtLCAiRmxpcCBxdWV1ZWQgb24gZnJhbWUgJWQsICh3YXMgcmVhZHkg b24gZnJhbWUgJWQpLCBub3cgJWRcbiIsCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMK aW5kZXggOThhNWVkMC4uNGE4MDFlNCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXku YwpAQCAtOTY2OSwxMCArOTY2OSwxOCBAQCBzdGF0aWMgYm9vbCBfX2ludGVsX3BhZ2VmbGlwX3N0 YWxsX2NoZWNrKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCXJldHVybiBmYWxzZTsKIAogCWlm ICh3b3JrLT5mbGlwX3JlYWR5X3ZibGFuayA9PSAwKSB7Ci0JCWlmICh3b3JrLT5mbGlwX3F1ZXVl ZF9yaW5nICYmCi0JCSAgICAhaTkxNV9zZXFub19wYXNzZWQod29yay0+ZmxpcF9xdWV1ZWRfcmlu Zy0+Z2V0X3NlcW5vKHdvcmstPmZsaXBfcXVldWVkX3JpbmcsIHRydWUpLAotCQkJCSAgICAgICB3 b3JrLT5mbGlwX3F1ZXVlZF9zZXFubykpCi0JCQlyZXR1cm4gZmFsc2U7CisJCWlmICh3b3JrLT5m bGlwX3F1ZXVlZF9yaW5nKSB7CisJCQl1aW50MzJfdCBzMSA9IHdvcmstPmZsaXBfcXVldWVkX3Jp bmctPmdldF9zZXFubygKKwkJCQkJICAgICAgIHdvcmstPmZsaXBfcXVldWVkX3JpbmcsIHRydWUp OworCQkJdWludDMyX3QgczIgPSBpOTE1X2dlbV9yZXF1ZXN0X2dldF9zZXFubygKKwkJCQkJCSAg ICAgIHdvcmstPmZsaXBfcXVldWVkX3JlcSk7CisJCQlpZiAoIWk5MTVfc2Vxbm9fcGFzc2VkKHMx LCBzMikpCisJCQkJcmV0dXJuIGZhbHNlOworCisJCQlpOTE1X2dlbV9yZXF1ZXN0X3VucmVmZXJl bmNlX2lycSh3b3JrLT5mbGlwX3F1ZXVlZF9yZXEpOworCQkJd29yay0+ZmxpcF9xdWV1ZWRfcmVx ICA9IE5VTEw7CisJCQl3b3JrLT5mbGlwX3F1ZXVlZF9yaW5nID0gTlVMTDsKKwkJfQogCiAJCXdv cmstPmZsaXBfcmVhZHlfdmJsYW5rID0gZHJtX3ZibGFua19jb3VudChkZXYsIGludGVsX2NydGMt PnBpcGUpOwogCX0KQEAgLTk4MzYsOCArOTg0NCw4IEBAIHN0YXRpYyBpbnQgaW50ZWxfY3J0Y19w YWdlX2ZsaXAoc3RydWN0IGRybV9jcnRjICpjcnRjLAogCQlpZiAocmV0KQogCQkJZ290byBjbGVh bnVwX3VucGluOwogCi0JCXdvcmstPmZsaXBfcXVldWVkX3NlcW5vID0KLQkJCSAgICAgaTkxNV9n ZW1fcmVxdWVzdF9nZXRfc2Vxbm8ob2JqLT5sYXN0X3dyaXRlX3JlcSk7CisJCWk5MTVfZ2VtX3Jl cXVlc3RfYXNzaWduKCZ3b3JrLT5mbGlwX3F1ZXVlZF9yZXEsCisJCQkJCW9iai0+bGFzdF93cml0 ZV9yZXEpOwogCQl3b3JrLT5mbGlwX3F1ZXVlZF9yaW5nID0gb2JqLT5yaW5nOwogCX0gZWxzZSB7 CiAJCXJldCA9IGRldl9wcml2LT5kaXNwbGF5LnF1ZXVlX2ZsaXAoZGV2LCBjcnRjLCBmYiwgb2Jq LCByaW5nLApAQCAtOTg0NSw4ICs5ODUzLDggQEAgc3RhdGljIGludCBpbnRlbF9jcnRjX3BhZ2Vf ZmxpcChzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJCWlmIChyZXQpCiAJCQlnb3RvIGNsZWFudXBf dW5waW47CiAKLQkJd29yay0+ZmxpcF9xdWV1ZWRfc2Vxbm8gPQotCQkgICAgaTkxNV9nZW1fcmVx dWVzdF9nZXRfc2Vxbm8oaW50ZWxfcmluZ19nZXRfcmVxdWVzdChyaW5nKSk7CisJCWk5MTVfZ2Vt X3JlcXVlc3RfYXNzaWduKCZ3b3JrLT5mbGlwX3F1ZXVlZF9yZXEsCisJCQkJCWludGVsX3Jpbmdf Z2V0X3JlcXVlc3QocmluZykpOwogCQl3b3JrLT5mbGlwX3F1ZXVlZF9yaW5nID0gcmluZzsKIAl9 CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKaW5kZXggMjc1NTUzMi4uYzRhODZiYiAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZHJ2LmgKQEAgLTcwOCw3ICs3MDgsNyBAQCBzdHJ1Y3QgaW50ZWxfdW5w aW5fd29yayB7CiAJdTMyIGZsaXBfY291bnQ7CiAJdTMyIGd0dF9vZmZzZXQ7CiAJc3RydWN0IGlu dGVsX2VuZ2luZV9jcyAqZmxpcF9xdWV1ZWRfcmluZzsKLQl1MzIgZmxpcF9xdWV1ZWRfc2Vxbm87 CisJc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpmbGlwX3F1ZXVlZF9yZXE7CiAJaW50IGZs aXBfcXVldWVkX3ZibGFuazsKIAlpbnQgZmxpcF9yZWFkeV92Ymxhbms7CiAJYm9vbCBlbmFibGVf c3RhbGxfY2hlY2s7Ci0tIAoxLjcuOS41CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5m cmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3Rp bmZvL2ludGVsLWdmeAo=