From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH 1/2] drm/i915: Wait for flips to complete before returning. Date: Mon, 23 May 2016 15:43:46 +0200 Message-ID: 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: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id E57CF6E110 for ; Mon, 23 May 2016 13:43:48 +0000 (UTC) In-Reply-To: <1464010661-32674-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 c3Npb24gYW5kIGlzIGNhdXNlZCBrbXNfZmxpcCB0byBmYWlscyB3aXRob3V0CnRoZSBhdG9taWMg cGFnZSBmbGlwIHBhdGNoLCBhbmQga21zX2Zyb250YnVmZmVyX3RyYWNraW5nIHRvIGZhaWwgb24g cm8tYmR3LWk3LTU2MDB1LgoKU2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0 ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4KLS0tCk9vcHMsIHN0cmlwcGVkIDEvMiBmcm9t IHN1YmplY3QsIGZpeGVkIQoKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8 IDI2ICsrKysrKysrKysrKysrKysrKysrLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMjAgaW5zZXJ0 aW9ucygrKSwgNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMK aW5kZXggYTUwMGYwOGVjMGFjLi4yMWMwYTJmMzEwMmIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kaXNwbGF5LmMKQEAgLTM3ODgsNyArMzc4OCw3IEBAIHN0YXRpYyB2b2lkIHBhZ2VfZmxpcF9j b21wbGV0ZWQoc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMsIHN0cnVjdCBpbnRlbF9mbGlw CiAJcXVldWVfd29yayhkZXZfcHJpdi0+d3EsICZ3b3JrLT51bnBpbl93b3JrKTsKIH0KIAotc3Rh dGljIGludCBpbnRlbF9jcnRjX3dhaXRfZm9yX3BlbmRpbmdfZmxpcHMoc3RydWN0IGRybV9jcnRj ICpjcnRjKQorc3RhdGljIGludCBpbnRlbF9jcnRjX3dhaXRfZm9yX3BlbmRpbmdfZmxpcHMoc3Ry dWN0IGRybV9jcnRjICpjcnRjLCBib29sIGludHIpCiB7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRl diA9IGNydGMtPmRldjsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYt PmRldl9wcml2YXRlOwpAQCAtMzc5NiwxMCArMzc5NiwxNSBAQCBzdGF0aWMgaW50IGludGVsX2Ny dGNfd2FpdF9mb3JfcGVuZGluZ19mbGlwcyhzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAKIAlXQVJO X09OKHdhaXRxdWV1ZV9hY3RpdmUoJmRldl9wcml2LT5wZW5kaW5nX2ZsaXBfcXVldWUpKTsKIAot CXJldCA9IHdhaXRfZXZlbnRfaW50ZXJydXB0aWJsZV90aW1lb3V0KAotCQkJCQlkZXZfcHJpdi0+ cGVuZGluZ19mbGlwX3F1ZXVlLAotCQkJCQkhaW50ZWxfY3J0Y19oYXNfcGVuZGluZ19mbGlwKGNy dGMpLAotCQkJCQk2MCpIWik7CisJaWYgKGludHIpCisJCXJldCA9IHdhaXRfZXZlbnRfaW50ZXJy dXB0aWJsZV90aW1lb3V0KAorCQkJCQkJZGV2X3ByaXYtPnBlbmRpbmdfZmxpcF9xdWV1ZSwKKwkJ CQkJCSFpbnRlbF9jcnRjX2hhc19wZW5kaW5nX2ZsaXAoY3J0YyksCisJCQkJCQk2MCpIWik7CisJ ZWxzZQorCQlyZXQgPSB3YWl0X2V2ZW50X3RpbWVvdXQoZGV2X3ByaXYtPnBlbmRpbmdfZmxpcF9x dWV1ZSwKKwkJCQkJICFpbnRlbF9jcnRjX2hhc19wZW5kaW5nX2ZsaXAoY3J0YyksCisJCQkJCSA2 MCpIWik7CiAKIAlpZiAocmV0IDwgMCkKIAkJcmV0dXJuIHJldDsKQEAgLTEyNzM2LDcgKzEyNzQx LDcgQEAgc3RhdGljIGludCBpbnRlbF9hdG9taWNfcHJlcGFyZV9jb21taXQoc3RydWN0IGRybV9k ZXZpY2UgKmRldiwKIAkJc3RydWN0IGludGVsX2ZsaXBfd29yayAqd29yazsKIAogCQlpZiAoIXN0 YXRlLT5sZWdhY3lfY3Vyc29yX3VwZGF0ZSkgewotCQkJcmV0ID0gaW50ZWxfY3J0Y193YWl0X2Zv cl9wZW5kaW5nX2ZsaXBzKGNydGMpOworCQkJcmV0ID0gaW50ZWxfY3J0Y193YWl0X2Zvcl9wZW5k aW5nX2ZsaXBzKGNydGMsIHRydWUpOwogCQkJaWYgKHJldCkKIAkJCQlyZXR1cm4gcmV0OwogCkBA IC0xMzAwNSw2ICsxMzAxMCw3IEBAIHN0YXRpYyBpbnQgaW50ZWxfYXRvbWljX2NvbW1pdChzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2LAogCXN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqb2xkX2NydGNfc3Rh dGU7CiAJc3RydWN0IGRybV9jcnRjICpjcnRjOwogCWludCByZXQgPSAwLCBpOworCXVuc2lnbmVk IGNydGNfbWFzayA9IDA7CiAKIAlyZXQgPSBpbnRlbF9hdG9taWNfcHJlcGFyZV9jb21taXQoZGV2 LCBzdGF0ZSwgbm9uYmxvY2spOwogCWlmIChyZXQpIHsKQEAgLTEzMDc1LDYgKzEzMDgxLDggQEAg c3RhdGljIGludCBpbnRlbF9hdG9taWNfY29tbWl0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJ CXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjKTsKIAkJ Ym9vbCBtb2Rlc2V0ID0gbmVlZHNfbW9kZXNldChjcnRjLT5zdGF0ZSk7CiAKKwkJY3J0Y19tYXNr IHw9IGRybV9jcnRjX21hc2soY3J0Yyk7CisKIAkJaWYgKG1vZGVzZXQgJiYgY3J0Yy0+c3RhdGUt PmFjdGl2ZSkgewogCQkJdXBkYXRlX3NjYW5saW5lX29mZnNldCh0b19pbnRlbF9jcnRjKGNydGMp KTsKIAkJCWRldl9wcml2LT5kaXNwbGF5LmNydGNfZW5hYmxlKGNydGMpOwpAQCAtMTMxMDUsNiAr MTMxMTMsMTIgQEAgc3RhdGljIGludCBpbnRlbF9hdG9taWNfY29tbWl0KHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYsCiAJCWludGVsX3NjaGVkdWxlX3VwZGF0ZShjcnRjLCBpbnRlbF9zdGF0ZSwgd29y aywgbm9uYmxvY2spOwogCX0KIAorCWlmICghbm9uYmxvY2sgJiYgIXN0YXRlLT5sZWdhY3lfY3Vy c29yX3VwZGF0ZSkgeworCQlkcm1fZm9yX2VhY2hfY3J0YyhjcnRjLCBkZXYpCisJCQlpZiAoY3J0 Y19tYXNrICYgZHJtX2NydGNfbWFzayhjcnRjKSkKKwkJCQlpbnRlbF9jcnRjX3dhaXRfZm9yX3Bl bmRpbmdfZmxpcHMoY3J0YywgZmFsc2UpOworCX0KKwogCS8qIEZJWE1FOiBhZGQgc3VicGl4ZWwg b3JkZXIgKi8KIAogCWRybV9hdG9taWNfc3RhdGVfZnJlZShzdGF0ZSk7Ci0tIAoyLjUuNQoKX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1h aWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMu ZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==