From mboxrd@z Thu Jan  1 00:00:00 1970
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Subject: [PATCH] drm/i915: Wait for flips to complete before
	returning.
Date: Mon, 23 May 2016 15:37:40 +0200
Message-ID: <1464010661-32674-2-git-send-email-maarten.lankhorst@linux.intel.com>
References: <1464010661-32674-1-git-send-email-maarten.lankhorst@linux.intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mblankhorst.nl (mblankhorst.nl
 [IPv6:2a02:2308::216:3eff:fe92:dfa3])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 24F5C6E091
 for <intel-gfx@lists.freedesktop.org>; Mon, 23 May 2016 13:37:46 +0000 (UTC)
In-Reply-To: <1464010661-32674-1-git-send-email-maarten.lankhorst@linux.intel.com>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

RG9pbmcgYSBwYWdlIGZsaXAgcmlnaHQgYWZ0ZXIgc2V0Y3J0YyB3b3VsZCBmYWlsIGJlY2F1c2Ug
cGFydCBvZiB0aGUgdXBkYXRlIGlzIHJ1bgphc3luY2hyb25vdXNseS4gVGhpcyBpcyBhIHJlZ3Jl
c3Npb24gYW5kIGlzIGNhdXNlZCBrbXNfZmxpcCB0byBmYWlscyB3aXRob3V0CnRoZSBhdG9taWMg
cGFnZSBmbGlwIHBhdGNoLCBhbmQga21zX2Zyb250YnVmZmVyX3RyYWNraW5nIHRvIGZhaWwgb24g
cm8tYmR3LWk3LTU2MDB1LgoKU2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0
ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p
bnRlbF9kaXNwbGF5LmMgfCAyNiArKysrKysrKysrKysrKysrKysrKy0tLS0tLQogMSBmaWxlIGNo
YW5nZWQsIDIwIGluc2VydGlvbnMoKyksIDYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJp
dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv
aW50ZWxfZGlzcGxheS5jCmluZGV4IGE1MDBmMDhlYzBhYy4uMjFjMGEyZjMxMDJiIDEwMDY0NAot
LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9n
cHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC0zNzg4LDcgKzM3ODgsNyBAQCBzdGF0aWMg
dm9pZCBwYWdlX2ZsaXBfY29tcGxldGVkKHN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjLCBz
dHJ1Y3QgaW50ZWxfZmxpcAogCXF1ZXVlX3dvcmsoZGV2X3ByaXYtPndxLCAmd29yay0+dW5waW5f
d29yayk7CiB9CiAKLXN0YXRpYyBpbnQgaW50ZWxfY3J0Y193YWl0X2Zvcl9wZW5kaW5nX2ZsaXBz
KHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKK3N0YXRpYyBpbnQgaW50ZWxfY3J0Y193YWl0X2Zvcl9w
ZW5kaW5nX2ZsaXBzKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywgYm9vbCBpbnRyKQogewogCXN0cnVj
dCBkcm1fZGV2aWNlICpkZXYgPSBjcnRjLT5kZXY7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg
KmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKQEAgLTM3OTYsMTAgKzM3OTYsMTUgQEAgc3Rh
dGljIGludCBpbnRlbF9jcnRjX3dhaXRfZm9yX3BlbmRpbmdfZmxpcHMoc3RydWN0IGRybV9jcnRj
ICpjcnRjKQogCiAJV0FSTl9PTih3YWl0cXVldWVfYWN0aXZlKCZkZXZfcHJpdi0+cGVuZGluZ19m
bGlwX3F1ZXVlKSk7CiAKLQlyZXQgPSB3YWl0X2V2ZW50X2ludGVycnVwdGlibGVfdGltZW91dCgK
LQkJCQkJZGV2X3ByaXYtPnBlbmRpbmdfZmxpcF9xdWV1ZSwKLQkJCQkJIWludGVsX2NydGNfaGFz
X3BlbmRpbmdfZmxpcChjcnRjKSwKLQkJCQkJNjAqSFopOworCWlmIChpbnRyKQorCQlyZXQgPSB3
YWl0X2V2ZW50X2ludGVycnVwdGlibGVfdGltZW91dCgKKwkJCQkJCWRldl9wcml2LT5wZW5kaW5n
X2ZsaXBfcXVldWUsCisJCQkJCQkhaW50ZWxfY3J0Y19oYXNfcGVuZGluZ19mbGlwKGNydGMpLAor
CQkJCQkJNjAqSFopOworCWVsc2UKKwkJcmV0ID0gd2FpdF9ldmVudF90aW1lb3V0KGRldl9wcml2
LT5wZW5kaW5nX2ZsaXBfcXVldWUsCisJCQkJCSAhaW50ZWxfY3J0Y19oYXNfcGVuZGluZ19mbGlw
KGNydGMpLAorCQkJCQkgNjAqSFopOwogCiAJaWYgKHJldCA8IDApCiAJCXJldHVybiByZXQ7CkBA
IC0xMjczNiw3ICsxMjc0MSw3IEBAIHN0YXRpYyBpbnQgaW50ZWxfYXRvbWljX3ByZXBhcmVfY29t
bWl0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCXN0cnVjdCBpbnRlbF9mbGlwX3dvcmsgKndv
cms7CiAKIAkJaWYgKCFzdGF0ZS0+bGVnYWN5X2N1cnNvcl91cGRhdGUpIHsKLQkJCXJldCA9IGlu
dGVsX2NydGNfd2FpdF9mb3JfcGVuZGluZ19mbGlwcyhjcnRjKTsKKwkJCXJldCA9IGludGVsX2Ny
dGNfd2FpdF9mb3JfcGVuZGluZ19mbGlwcyhjcnRjLCB0cnVlKTsKIAkJCWlmIChyZXQpCiAJCQkJ
cmV0dXJuIHJldDsKIApAQCAtMTMwMDUsNiArMTMwMTAsNyBAQCBzdGF0aWMgaW50IGludGVsX2F0
b21pY19jb21taXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAlzdHJ1Y3QgZHJtX2NydGNfc3Rh
dGUgKm9sZF9jcnRjX3N0YXRlOwogCXN0cnVjdCBkcm1fY3J0YyAqY3J0YzsKIAlpbnQgcmV0ID0g
MCwgaTsKKwl1bnNpZ25lZCBjcnRjX21hc2sgPSAwOwogCiAJcmV0ID0gaW50ZWxfYXRvbWljX3By
ZXBhcmVfY29tbWl0KGRldiwgc3RhdGUsIG5vbmJsb2NrKTsKIAlpZiAocmV0KSB7CkBAIC0xMzA3
NSw2ICsxMzA4MSw4IEBAIHN0YXRpYyBpbnQgaW50ZWxfYXRvbWljX2NvbW1pdChzdHJ1Y3QgZHJt
X2RldmljZSAqZGV2LAogCQlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVs
X2NydGMoY3J0Yyk7CiAJCWJvb2wgbW9kZXNldCA9IG5lZWRzX21vZGVzZXQoY3J0Yy0+c3RhdGUp
OwogCisJCWNydGNfbWFzayB8PSBkcm1fY3J0Y19tYXNrKGNydGMpOworCiAJCWlmIChtb2Rlc2V0
ICYmIGNydGMtPnN0YXRlLT5hY3RpdmUpIHsKIAkJCXVwZGF0ZV9zY2FubGluZV9vZmZzZXQodG9f
aW50ZWxfY3J0YyhjcnRjKSk7CiAJCQlkZXZfcHJpdi0+ZGlzcGxheS5jcnRjX2VuYWJsZShjcnRj
KTsKQEAgLTEzMTA1LDYgKzEzMTEzLDEyIEBAIHN0YXRpYyBpbnQgaW50ZWxfYXRvbWljX2NvbW1p
dChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQlpbnRlbF9zY2hlZHVsZV91cGRhdGUoY3J0Yywg
aW50ZWxfc3RhdGUsIHdvcmssIG5vbmJsb2NrKTsKIAl9CiAKKwlpZiAoIW5vbmJsb2NrICYmICFz
dGF0ZS0+bGVnYWN5X2N1cnNvcl91cGRhdGUpIHsKKwkJZHJtX2Zvcl9lYWNoX2NydGMoY3J0Yywg
ZGV2KQorCQkJaWYgKGNydGNfbWFzayAmIGRybV9jcnRjX21hc2soY3J0YykpCisJCQkJaW50ZWxf
Y3J0Y193YWl0X2Zvcl9wZW5kaW5nX2ZsaXBzKGNydGMsIGZhbHNlKTsKKwl9CisKIAkvKiBGSVhN
RTogYWRkIHN1YnBpeGVsIG9yZGVyICovCiAKIAlkcm1fYXRvbWljX3N0YXRlX2ZyZWUoc3RhdGUp
OwotLSAKMi41LjUKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9y
ZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdm
eAo=