From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH v2 15/28] drm/i915: Convert 'flip_queued_seqno' into 'flip_queued_request' Date: Fri, 14 Nov 2014 12:19:06 +0000 Message-ID: <1415967559-17074-16-git-send-email-John.C.Harrison@Intel.com> References: <1415967559-17074-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 mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 523B96EDD1 for ; Fri, 14 Nov 2014 04:19:37 -0800 (PST) In-Reply-To: <1415967559-17074-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 MTUvaW50ZWxfZGlzcGxheS5jIHwgICAyNCArKysrKysrKysrKysrKysrLS0tLS0tLS0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oICAgICB8ICAgIDIgKy0KIDMgZmlsZXMgY2hhbmdl ZCwgMTkgaW5zZXJ0aW9ucygrKSwgMTEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2RlYnVnZnMuYwppbmRleCBjYTcwNGFmLi5kMzVlNmUwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2RlYnVnZnMuYwpAQCAtNTQ2LDExICs1NDYsMTEgQEAgc3RhdGljIGludCBpOTE1X2dlbV9wYWdl ZmxpcF9pbmZvKHN0cnVjdCBzZXFfZmlsZSAqbSwgdm9pZCAqZGF0YSkKIAkJCWlmICh3b3JrLT5m bGlwX3F1ZXVlZF9yaW5nKSB7CiAJCQkJc2VxX3ByaW50ZihtLCAiRmxpcCBxdWV1ZWQgb24gJXMg YXQgc2Vxbm8gJXUsIG5leHQgc2Vxbm8gJXUgW2N1cnJlbnQgYnJlYWRjcnVtYiAldV0sIGNvbXBs ZXRlZD8gJWRcbiIsCiAJCQkJCSAgIHdvcmstPmZsaXBfcXVldWVkX3JpbmctPm5hbWUsCi0JCQkJ CSAgIHdvcmstPmZsaXBfcXVldWVkX3NlcW5vLAorCQkJCQkgICBpOTE1X2dlbV9yZXF1ZXN0X2dl dF9zZXFubyh3b3JrLT5mbGlwX3F1ZXVlZF9yZXEpLAogCQkJCQkgICBkZXZfcHJpdi0+bmV4dF9z ZXFubywKIAkJCQkJICAgd29yay0+ZmxpcF9xdWV1ZWRfcmluZy0+Z2V0X3NlcW5vKHdvcmstPmZs aXBfcXVldWVkX3JpbmcsIHRydWUpLAogCQkJCQkgICBpOTE1X3NlcW5vX3Bhc3NlZCh3b3JrLT5m bGlwX3F1ZXVlZF9yaW5nLT5nZXRfc2Vxbm8od29yay0+ZmxpcF9xdWV1ZWRfcmluZywgdHJ1ZSks Ci0JCQkJCQkJICAgICB3b3JrLT5mbGlwX3F1ZXVlZF9zZXFubykpOworCQkJCQkJCSAgICAgaTkx NV9nZW1fcmVxdWVzdF9nZXRfc2Vxbm8od29yay0+ZmxpcF9xdWV1ZWRfcmVxKSkpOwogCQkJfSBl bHNlCiAJCQkJc2VxX3ByaW50ZihtLCAiRmxpcCBub3QgYXNzb2NpYXRlZCB3aXRoIGFueSByaW5n XG4iKTsKIAkJCXNlcV9wcmludGYobSwgIkZsaXAgcXVldWVkIG9uIGZyYW1lICVkLCAod2FzIHJl YWR5IG9uIGZyYW1lICVkKSwgbm93ICVkXG4iLApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxh eS5jCmluZGV4IDQ1N2Q5NjguLjg4ZjcwZGIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNw bGF5LmMKQEAgLTk0ODQsMTAgKzk0ODQsMTggQEAgc3RhdGljIGJvb2wgX19pbnRlbF9wYWdlZmxp cF9zdGFsbF9jaGVjayhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQlyZXR1cm4gZmFsc2U7CiAK IAlpZiAod29yay0+ZmxpcF9yZWFkeV92YmxhbmsgPT0gMCkgewotCQlpZiAod29yay0+ZmxpcF9x dWV1ZWRfcmluZyAmJgotCQkgICAgIWk5MTVfc2Vxbm9fcGFzc2VkKHdvcmstPmZsaXBfcXVldWVk X3JpbmctPmdldF9zZXFubyh3b3JrLT5mbGlwX3F1ZXVlZF9yaW5nLCB0cnVlKSwKLQkJCQkgICAg ICAgd29yay0+ZmxpcF9xdWV1ZWRfc2Vxbm8pKQotCQkJcmV0dXJuIGZhbHNlOworCQlpZiAod29y ay0+ZmxpcF9xdWV1ZWRfcmluZykgeworCQkJdWludDMyX3QgczEgPSB3b3JrLT5mbGlwX3F1ZXVl ZF9yaW5nLT5nZXRfc2Vxbm8oCisJCQkJCSAgICAgICB3b3JrLT5mbGlwX3F1ZXVlZF9yaW5nLCB0 cnVlKTsKKwkJCXVpbnQzMl90IHMyID0gaTkxNV9nZW1fcmVxdWVzdF9nZXRfc2Vxbm8oCisJCQkJ CQkgICAgICB3b3JrLT5mbGlwX3F1ZXVlZF9yZXEpOworCQkJaWYgKCFpOTE1X3NlcW5vX3Bhc3Nl ZChzMSwgczIpKQorCQkJCXJldHVybiBmYWxzZTsKKworCQkJaTkxNV9nZW1fcmVxdWVzdF91bnJl ZmVyZW5jZV9pcnEod29yay0+ZmxpcF9xdWV1ZWRfcmVxKTsKKwkJCXdvcmstPmZsaXBfcXVldWVk X3JlcSAgPSBOVUxMOworCQkJd29yay0+ZmxpcF9xdWV1ZWRfcmluZyA9IE5VTEw7CisJCX0KIAog CQl3b3JrLT5mbGlwX3JlYWR5X3ZibGFuayA9IGRybV92YmxhbmtfY291bnQoZGV2LCBpbnRlbF9j cnRjLT5waXBlKTsKIAl9CkBAIC05NjUxLDggKzk2NTksOCBAQCBzdGF0aWMgaW50IGludGVsX2Ny dGNfcGFnZV9mbGlwKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAkJaWYgKHJldCkKIAkJCWdvdG8g Y2xlYW51cF91bnBpbjsKIAotCQl3b3JrLT5mbGlwX3F1ZXVlZF9zZXFubyA9Ci0JCQkgICAgIGk5 MTVfZ2VtX3JlcXVlc3RfZ2V0X3NlcW5vKG9iai0+bGFzdF93cml0ZV9yZXEpOworCQlpOTE1X2dl bV9yZXF1ZXN0X2Fzc2lnbigmd29yay0+ZmxpcF9xdWV1ZWRfcmVxLAorCQkJCQlvYmotPmxhc3Rf d3JpdGVfcmVxKTsKIAkJd29yay0+ZmxpcF9xdWV1ZWRfcmluZyA9IG9iai0+cmluZzsKIAl9IGVs c2UgewogCQlyZXQgPSBkZXZfcHJpdi0+ZGlzcGxheS5xdWV1ZV9mbGlwKGRldiwgY3J0YywgZmIs IG9iaiwgcmluZywKQEAgLTk2NjAsOCArOTY2OCw4IEBAIHN0YXRpYyBpbnQgaW50ZWxfY3J0Y19w YWdlX2ZsaXAoc3RydWN0IGRybV9jcnRjICpjcnRjLAogCQlpZiAocmV0KQogCQkJZ290byBjbGVh bnVwX3VucGluOwogCi0JCXdvcmstPmZsaXBfcXVldWVkX3NlcW5vID0KLQkJICAgIGk5MTVfZ2Vt X3JlcXVlc3RfZ2V0X3NlcW5vKGludGVsX3JpbmdfZ2V0X3JlcXVlc3QocmluZykpOworCQlpOTE1 X2dlbV9yZXF1ZXN0X2Fzc2lnbigmd29yay0+ZmxpcF9xdWV1ZWRfcmVxLAorCQkJCQlpbnRlbF9y aW5nX2dldF9yZXF1ZXN0KHJpbmcpKTsKIAkJd29yay0+ZmxpcF9xdWV1ZWRfcmluZyA9IHJpbmc7 CiAJfQogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCmluZGV4IGZiZDFjYWIuLmJhNGNmYmIgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCkBAIC03MDUsNyArNzA1LDcgQEAgc3RydWN0IGludGVs X3VucGluX3dvcmsgewogCXUzMiBmbGlwX2NvdW50OwogCXUzMiBndHRfb2Zmc2V0OwogCXN0cnVj dCBpbnRlbF9lbmdpbmVfY3MgKmZsaXBfcXVldWVkX3Jpbmc7Ci0JdTMyIGZsaXBfcXVldWVkX3Nl cW5vOworCXN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqZmxpcF9xdWV1ZWRfcmVxOwogCWlu dCBmbGlwX3F1ZXVlZF92Ymxhbms7CiAJaW50IGZsaXBfcmVhZHlfdmJsYW5rOwogCWJvb2wgZW5h YmxlX3N0YWxsX2NoZWNrOwotLSAKMS43LjkuNQoKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlz dHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9s aXN0aW5mby9pbnRlbC1nZngK