From: Maarten Lankhorst Subject: [PATCH v2 1/4] drm/i915: Wait for flips to complete before returning. Date: Tue, 24 May 2016 13:24:08 +0200 Message-ID: <1464089051-3995-2-git-send-email-maarten.lankhorst@linux.intel.com> References: <1464089051-3995-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: Received: from mblankhorst.nl (mblankhorst.nl [IPv6:2a02:2308::216:3eff:fe92:dfa3]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4228B6E043 for ; Tue, 24 May 2016 11:24:17 +0000 (UTC) In-Reply-To: <1464089051-3995-1-git-send-email-maarten.lankhorst@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 RG9pbmcgYSBwYWdlIGZsaXAgcmlnaHQgYWZ0ZXIgc2V0Y3J0YyB3b3VsZCBmYWlsIGJlY2F1c2Ug cGFydCBvZiB0aGUgdXBkYXRlIGlzIHJ1bgphc3luY2hyb25vdXNseS4gVGhpcyBpcyBhIHJlZ3Jl c3Npb24gYW5kIGlzIGNhdXNpbmcgdGhlIGttc19mbGlwIHRvIGZhaWxzIGFmdGVyCnJldmVydGlu ZyB0aGUgYXRvbWljIHBhZ2UgZmxpcCBwYXRjaC4KClNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4gTGFu a2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+CkZpeGVzOiBhNjc0N2I3 MzA0YTkgKCJkcm0vaTkxNTogTWFrZSB1bnBpbiBhc3luYy4iKQotLS0KIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8IDI2ICsrKysrKysrKysrKysrKysrKysrLS0tLS0tCiAx IGZpbGUgY2hhbmdlZCwgMjAgaW5zZXJ0aW9ucygrKSwgNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggYTUwMGYwOGVjMGFjLi4yMWMwYTJmMzEwMmIg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTM3ODgsNyArMzc4OCw3IEBA IHN0YXRpYyB2b2lkIHBhZ2VfZmxpcF9jb21wbGV0ZWQoc3RydWN0IGludGVsX2NydGMgKmludGVs X2NydGMsIHN0cnVjdCBpbnRlbF9mbGlwCiAJcXVldWVfd29yayhkZXZfcHJpdi0+d3EsICZ3b3Jr LT51bnBpbl93b3JrKTsKIH0KIAotc3RhdGljIGludCBpbnRlbF9jcnRjX3dhaXRfZm9yX3BlbmRp bmdfZmxpcHMoc3RydWN0IGRybV9jcnRjICpjcnRjKQorc3RhdGljIGludCBpbnRlbF9jcnRjX3dh aXRfZm9yX3BlbmRpbmdfZmxpcHMoc3RydWN0IGRybV9jcnRjICpjcnRjLCBib29sIGludHIpCiB7 CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMtPmRldjsKIAlzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwpAQCAtMzc5NiwxMCArMzc5Niwx NSBAQCBzdGF0aWMgaW50IGludGVsX2NydGNfd2FpdF9mb3JfcGVuZGluZ19mbGlwcyhzdHJ1Y3Qg ZHJtX2NydGMgKmNydGMpCiAKIAlXQVJOX09OKHdhaXRxdWV1ZV9hY3RpdmUoJmRldl9wcml2LT5w ZW5kaW5nX2ZsaXBfcXVldWUpKTsKIAotCXJldCA9IHdhaXRfZXZlbnRfaW50ZXJydXB0aWJsZV90 aW1lb3V0KAotCQkJCQlkZXZfcHJpdi0+cGVuZGluZ19mbGlwX3F1ZXVlLAotCQkJCQkhaW50ZWxf Y3J0Y19oYXNfcGVuZGluZ19mbGlwKGNydGMpLAotCQkJCQk2MCpIWik7CisJaWYgKGludHIpCisJ CXJldCA9IHdhaXRfZXZlbnRfaW50ZXJydXB0aWJsZV90aW1lb3V0KAorCQkJCQkJZGV2X3ByaXYt PnBlbmRpbmdfZmxpcF9xdWV1ZSwKKwkJCQkJCSFpbnRlbF9jcnRjX2hhc19wZW5kaW5nX2ZsaXAo Y3J0YyksCisJCQkJCQk2MCpIWik7CisJZWxzZQorCQlyZXQgPSB3YWl0X2V2ZW50X3RpbWVvdXQo ZGV2X3ByaXYtPnBlbmRpbmdfZmxpcF9xdWV1ZSwKKwkJCQkJICFpbnRlbF9jcnRjX2hhc19wZW5k aW5nX2ZsaXAoY3J0YyksCisJCQkJCSA2MCpIWik7CiAKIAlpZiAocmV0IDwgMCkKIAkJcmV0dXJu IHJldDsKQEAgLTEyNzM2LDcgKzEyNzQxLDcgQEAgc3RhdGljIGludCBpbnRlbF9hdG9taWNfcHJl cGFyZV9jb21taXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJc3RydWN0IGludGVsX2ZsaXBf d29yayAqd29yazsKIAogCQlpZiAoIXN0YXRlLT5sZWdhY3lfY3Vyc29yX3VwZGF0ZSkgewotCQkJ cmV0ID0gaW50ZWxfY3J0Y193YWl0X2Zvcl9wZW5kaW5nX2ZsaXBzKGNydGMpOworCQkJcmV0ID0g aW50ZWxfY3J0Y193YWl0X2Zvcl9wZW5kaW5nX2ZsaXBzKGNydGMsIHRydWUpOwogCQkJaWYgKHJl dCkKIAkJCQlyZXR1cm4gcmV0OwogCkBAIC0xMzAwNSw2ICsxMzAxMCw3IEBAIHN0YXRpYyBpbnQg aW50ZWxfYXRvbWljX2NvbW1pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCXN0cnVjdCBkcm1f Y3J0Y19zdGF0ZSAqb2xkX2NydGNfc3RhdGU7CiAJc3RydWN0IGRybV9jcnRjICpjcnRjOwogCWlu dCByZXQgPSAwLCBpOworCXVuc2lnbmVkIGNydGNfbWFzayA9IDA7CiAKIAlyZXQgPSBpbnRlbF9h dG9taWNfcHJlcGFyZV9jb21taXQoZGV2LCBzdGF0ZSwgbm9uYmxvY2spOwogCWlmIChyZXQpIHsK QEAgLTEzMDc1LDYgKzEzMDgxLDggQEAgc3RhdGljIGludCBpbnRlbF9hdG9taWNfY29tbWl0KHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0g dG9faW50ZWxfY3J0YyhjcnRjKTsKIAkJYm9vbCBtb2Rlc2V0ID0gbmVlZHNfbW9kZXNldChjcnRj LT5zdGF0ZSk7CiAKKwkJY3J0Y19tYXNrIHw9IGRybV9jcnRjX21hc2soY3J0Yyk7CisKIAkJaWYg KG1vZGVzZXQgJiYgY3J0Yy0+c3RhdGUtPmFjdGl2ZSkgewogCQkJdXBkYXRlX3NjYW5saW5lX29m ZnNldCh0b19pbnRlbF9jcnRjKGNydGMpKTsKIAkJCWRldl9wcml2LT5kaXNwbGF5LmNydGNfZW5h YmxlKGNydGMpOwpAQCAtMTMxMDUsNiArMTMxMTMsMTIgQEAgc3RhdGljIGludCBpbnRlbF9hdG9t aWNfY29tbWl0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCWludGVsX3NjaGVkdWxlX3VwZGF0 ZShjcnRjLCBpbnRlbF9zdGF0ZSwgd29yaywgbm9uYmxvY2spOwogCX0KIAorCWlmICghbm9uYmxv Y2sgJiYgIXN0YXRlLT5sZWdhY3lfY3Vyc29yX3VwZGF0ZSkgeworCQlkcm1fZm9yX2VhY2hfY3J0 YyhjcnRjLCBkZXYpCisJCQlpZiAoY3J0Y19tYXNrICYgZHJtX2NydGNfbWFzayhjcnRjKSkKKwkJ CQlpbnRlbF9jcnRjX3dhaXRfZm9yX3BlbmRpbmdfZmxpcHMoY3J0YywgZmFsc2UpOworCX0KKwog CS8qIEZJWE1FOiBhZGQgc3VicGl4ZWwgb3JkZXIgKi8KIAogCWRybV9hdG9taWNfc3RhdGVfZnJl ZShzdGF0ZSk7Ci0tIAoyLjUuNQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRl c2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8v aW50ZWwtZ2Z4Cg==