From mboxrd@z Thu Jan 1 00:00:00 1970 From: ville.syrjala@linux.intel.com Subject: [PATCH 2/6] drm/i915: Don't wait for page flips if there was GPU reset Date: Tue, 29 Jan 2013 18:13:34 +0200 Message-ID: <1359476018-31274-3-git-send-email-ville.syrjala@linux.intel.com> References: <1359476018-31274-1-git-send-email-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [143.182.124.21]) by gabe.freedesktop.org (Postfix) with ESMTP id 7B9AAE68AE for ; Tue, 29 Jan 2013 08:14:05 -0800 (PST) In-Reply-To: <1359476018-31274-1-git-send-email-ville.syrjala@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCklm IGEgR1BVIHJlc2V0IG9jY3VycyB3aGlsZSBhIHBhZ2UgZmxpcCBoYXMgYmVlbiBzdWJtaXR0ZWQg dG8gdGhlIHJpbmcsCnRoZSBmbGlwIHdpbGwgbmV2ZXIgY29tcGxldGUgb25jZSB0aGUgcmluZyBo YXMgYmVlbiByZXNldC4KClRoZSBHUFUgcmVzZXQgY2FuIGJlIGRldGVjdGVkIGJ5IHNhbXBsaW5n IHRoZSByZXNldF9jb3VudGVyIGJlZm9yZSB0aGUKZmxpcCBpcyBzdWJtaXR0ZWQsIGFuZCB0aGVu IHdoaWxlIHdhaXRpbmcgZm9yIHRoZSBmbGlwLCB0aGUgc2FtcGxlZApjb3VudGVyIGlzIGNvbXBh cmVkIHdpdGggdGhlIGN1cnJlbnQgcmVzZXRfY291bnRlciB2YWx1ZS4KClNpZ25lZC1vZmYtYnk6 IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgMTQgKysrKysrKysrKysrKy0KIGRy aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oICAgICB8ICAzICsrKwogMiBmaWxlcyBjaGFu Z2VkLCAxNiBpbnNlcnRpb25zKCspLCAxIGRlbGV0aW9uKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZGlzcGxheS5jCmluZGV4IDQwOTcxMTguLmUzNDhhNjggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kaXNwbGF5LmMKQEAgLTI4NjIsMTAgKzI4NjIsMTIgQEAgc3RhdGljIGJvb2wgaW50ZWxf Y3J0Y19oYXNfcGVuZGluZ19mbGlwKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIHsKIAlzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+ZGV2OwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CisJc3RydWN0IGludGVsX2NydGMgKmludGVsX2Ny dGMgPSB0b19pbnRlbF9jcnRjKGNydGMpOwogCXVuc2lnbmVkIGxvbmcgZmxhZ3M7CiAJYm9vbCBw ZW5kaW5nOwogCi0JaWYgKGk5MTVfcmVzZXRfaW5fcHJvZ3Jlc3MoJmRldl9wcml2LT5ncHVfZXJy b3IpKQorCWlmIChpOTE1X3Jlc2V0X2luX3Byb2dyZXNzKCZkZXZfcHJpdi0+Z3B1X2Vycm9yKSB8 fAorCSAgICBpbnRlbF9jcnRjLT5yZXNldF9jb3VudGVyICE9IGF0b21pY19yZWFkKCZkZXZfcHJp di0+Z3B1X2Vycm9yLnJlc2V0X2NvdW50ZXIpKQogCQlyZXR1cm4gZmFsc2U7CiAKIAlzcGluX2xv Y2tfaXJxc2F2ZSgmZGV2LT5ldmVudF9sb2NrLCBmbGFncyk7CkBAIC02OTEyLDYgKzY5MTQsOCBA QCBzdGF0aWMgaW50IGludGVsX2dlbjJfcXVldWVfZmxpcChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 LAogCWlmIChyZXQpCiAJCWdvdG8gZXJyX3VucGluOwogCisJaW50ZWxfY3J0Yy0+cmVzZXRfY291 bnRlciA9IGF0b21pY19yZWFkKCZkZXZfcHJpdi0+Z3B1X2Vycm9yLnJlc2V0X2NvdW50ZXIpOwor CiAJLyogQ2FuJ3QgcXVldWUgbXVsdGlwbGUgZmxpcHMsIHNvIHdhaXQgZm9yIHRoZSBwcmV2aW91 cwogCSAqIG9uZSB0byBmaW5pc2ggYmVmb3JlIGV4ZWN1dGluZyB0aGUgbmV4dC4KIAkgKi8KQEAg LTY5NTYsNiArNjk2MCw4IEBAIHN0YXRpYyBpbnQgaW50ZWxfZ2VuM19xdWV1ZV9mbGlwKHN0cnVj dCBkcm1fZGV2aWNlICpkZXYsCiAJaWYgKHJldCkKIAkJZ290byBlcnJfdW5waW47CiAKKwlpbnRl bF9jcnRjLT5yZXNldF9jb3VudGVyID0gYXRvbWljX3JlYWQoJmRldl9wcml2LT5ncHVfZXJyb3Iu cmVzZXRfY291bnRlcik7CisKIAlpZiAoaW50ZWxfY3J0Yy0+cGxhbmUpCiAJCWZsaXBfbWFzayA9 IE1JX1dBSVRfRk9SX1BMQU5FX0JfRkxJUDsKIAllbHNlCkBAIC02OTk3LDYgKzcwMDMsOCBAQCBz dGF0aWMgaW50IGludGVsX2dlbjRfcXVldWVfZmxpcChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAog CWlmIChyZXQpCiAJCWdvdG8gZXJyX3VucGluOwogCisJaW50ZWxfY3J0Yy0+cmVzZXRfY291bnRl ciA9IGF0b21pY19yZWFkKCZkZXZfcHJpdi0+Z3B1X2Vycm9yLnJlc2V0X2NvdW50ZXIpOworCiAJ LyogaTk2NSsgdXNlcyB0aGUgbGluZWFyIG9yIHRpbGVkIG9mZnNldHMgZnJvbSB0aGUKIAkgKiBE aXNwbGF5IFJlZ2lzdGVycyAod2hpY2ggZG8gbm90IGNoYW5nZSBhY3Jvc3MgYSBwYWdlLWZsaXAp CiAJICogc28gd2UgbmVlZCBvbmx5IHJlcHJvZ3JhbSB0aGUgYmFzZSBhZGRyZXNzLgpAQCAtNzA0 NSw2ICs3MDUzLDggQEAgc3RhdGljIGludCBpbnRlbF9nZW42X3F1ZXVlX2ZsaXAoc3RydWN0IGRy bV9kZXZpY2UgKmRldiwKIAlpZiAocmV0KQogCQlnb3RvIGVycl91bnBpbjsKIAorCWludGVsX2Ny dGMtPnJlc2V0X2NvdW50ZXIgPSBhdG9taWNfcmVhZCgmZGV2X3ByaXYtPmdwdV9lcnJvci5yZXNl dF9jb3VudGVyKTsKKwogCWludGVsX3JpbmdfZW1pdChyaW5nLCBNSV9ESVNQTEFZX0ZMSVAgfAog CQkJTUlfRElTUExBWV9GTElQX1BMQU5FKGludGVsX2NydGMtPnBsYW5lKSk7CiAJaW50ZWxfcmlu Z19lbWl0KHJpbmcsIGZiLT5waXRjaGVzWzBdIHwgb2JqLT50aWxpbmdfbW9kZSk7CkBAIC03MTEx LDYgKzcxMjEsOCBAQCBzdGF0aWMgaW50IGludGVsX2dlbjdfcXVldWVfZmxpcChzdHJ1Y3QgZHJt X2RldmljZSAqZGV2LAogCWlmIChyZXQpCiAJCWdvdG8gZXJyX3VucGluOwogCisJaW50ZWxfY3J0 Yy0+cmVzZXRfY291bnRlciA9IGF0b21pY19yZWFkKCZkZXZfcHJpdi0+Z3B1X2Vycm9yLnJlc2V0 X2NvdW50ZXIpOworCiAJaW50ZWxfcmluZ19lbWl0KHJpbmcsIE1JX0RJU1BMQVlfRkxJUF9JOTE1 IHwgcGxhbmVfYml0KTsKIAlpbnRlbF9yaW5nX2VtaXQocmluZywgKGZiLT5waXRjaGVzWzBdIHwg b2JqLT50aWxpbmdfbW9kZSkpOwogCWludGVsX3JpbmdfZW1pdChyaW5nLCBvYmotPmd0dF9vZmZz ZXQgKyBpbnRlbF9jcnRjLT5kc3BhZGRyX29mZnNldCk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5o CmluZGV4IGZjZGZlNDIuLmE1NTIxZDkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCkBAIC0y MzUsNiArMjM1LDkgQEAgc3RydWN0IGludGVsX2NydGMgewogCS8qIFdlIGNhbiBzaGFyZSBQTExz IGFjcm9zcyBvdXRwdXRzIGlmIHRoZSB0aW1pbmdzIG1hdGNoICovCiAJc3RydWN0IGludGVsX3Bj aF9wbGwgKnBjaF9wbGw7CiAJdWludDMyX3QgZGRpX3BsbF9zZWw7CisKKwkvKiByZXNldCBjb3Vu dGVyIHZhbHVlIHdoZW4gdGhlIGxhc3QgZmxpcCB3YXMgc3VibWl0dGVkICovCisJdW5zaWduZWQg aW50IHJlc2V0X2NvdW50ZXI7CiB9OwogCiBzdHJ1Y3QgaW50ZWxfcGxhbmUgewotLSAKMS43LjEy LjQKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVs LWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8v bGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==