From mboxrd@z Thu Jan 1 00:00:00 1970 From: ville.syrjala@linux.intel.com Subject: [PATCH 4/6] drm/i915: Move intel_crtc_has_pending_flip() earlier Date: Tue, 29 Jan 2013 18:13:36 +0200 Message-ID: <1359476018-31274-5-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 mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id BA0A4E68C2 for ; Tue, 29 Jan 2013 08:14:12 -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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCkp1 c3Qgc2h1ZmZsZSB0aGUgY29kZSBhcm91bmQuIE5vIGZ1bmN0aW9uYWwgY2hhbmdlcy4KClNpZ25l ZC1vZmYtYnk6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+ Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgMzggKysrKysrKysr KysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTkgaW5zZXJ0aW9u cygrKSwgMTkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmlu ZGV4IGUzNDhhNjguLjZjMjE5ODUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMK QEAgLTIyNjIsNiArMjI2MiwyNSBAQCBzdGF0aWMgdm9pZCBpbnRlbF9jcnRjX3VwZGF0ZV9zYXJl YV9wb3Moc3RydWN0IGRybV9jcnRjICpjcnRjLCBpbnQgeCwgaW50IHkpCiAJfQogfQogCitzdGF0 aWMgYm9vbCBpbnRlbF9jcnRjX2hhc19wZW5kaW5nX2ZsaXAoc3RydWN0IGRybV9jcnRjICpjcnRj KQoreworCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBjcnRjLT5kZXY7CisJc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKKwlzdHJ1Y3QgaW50ZWxf Y3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7CisJdW5zaWduZWQgbG9uZyBm bGFnczsKKwlib29sIHBlbmRpbmc7CisKKwlpZiAoaTkxNV9yZXNldF9pbl9wcm9ncmVzcygmZGV2 X3ByaXYtPmdwdV9lcnJvcikgfHwKKwkgICAgaW50ZWxfY3J0Yy0+cmVzZXRfY291bnRlciAhPSBh dG9taWNfcmVhZCgmZGV2X3ByaXYtPmdwdV9lcnJvci5yZXNldF9jb3VudGVyKSkKKwkJcmV0dXJu IGZhbHNlOworCisJc3Bpbl9sb2NrX2lycXNhdmUoJmRldi0+ZXZlbnRfbG9jaywgZmxhZ3MpOwor CXBlbmRpbmcgPSB0b19pbnRlbF9jcnRjKGNydGMpLT51bnBpbl93b3JrICE9IE5VTEw7CisJc3Bp bl91bmxvY2tfaXJxcmVzdG9yZSgmZGV2LT5ldmVudF9sb2NrLCBmbGFncyk7CisKKwlyZXR1cm4g cGVuZGluZzsKK30KKwogc3RhdGljIGludAogaW50ZWxfcGlwZV9zZXRfYmFzZShzdHJ1Y3QgZHJt X2NydGMgKmNydGMsIGludCB4LCBpbnQgeSwKIAkJICAgIHN0cnVjdCBkcm1fZnJhbWVidWZmZXIg KmZiKQpAQCAtMjg1OCwyNSArMjg3Nyw2IEBAIHN0YXRpYyB2b2lkIGlyb25sYWtlX2ZkaV9kaXNh YmxlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAl1ZGVsYXkoMTAwKTsKIH0KIAotc3RhdGljIGJv b2wgaW50ZWxfY3J0Y19oYXNfcGVuZGluZ19mbGlwKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKLXsK LQlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+ZGV2OwotCXN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7Ci0Jc3RydWN0IGludGVsX2NydGMg KmludGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGNydGMpOwotCXVuc2lnbmVkIGxvbmcgZmxhZ3M7 Ci0JYm9vbCBwZW5kaW5nOwotCi0JaWYgKGk5MTVfcmVzZXRfaW5fcHJvZ3Jlc3MoJmRldl9wcml2 LT5ncHVfZXJyb3IpIHx8Ci0JICAgIGludGVsX2NydGMtPnJlc2V0X2NvdW50ZXIgIT0gYXRvbWlj X3JlYWQoJmRldl9wcml2LT5ncHVfZXJyb3IucmVzZXRfY291bnRlcikpCi0JCXJldHVybiBmYWxz ZTsKLQotCXNwaW5fbG9ja19pcnFzYXZlKCZkZXYtPmV2ZW50X2xvY2ssIGZsYWdzKTsKLQlwZW5k aW5nID0gdG9faW50ZWxfY3J0YyhjcnRjKS0+dW5waW5fd29yayAhPSBOVUxMOwotCXNwaW5fdW5s b2NrX2lycXJlc3RvcmUoJmRldi0+ZXZlbnRfbG9jaywgZmxhZ3MpOwotCi0JcmV0dXJuIHBlbmRp bmc7Ci19Ci0KIHN0YXRpYyB2b2lkIGludGVsX2NydGNfd2FpdF9mb3JfcGVuZGluZ19mbGlwcyhz dHJ1Y3QgZHJtX2NydGMgKmNydGMpCiB7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMt PmRldjsKLS0gCjEuNy4xMi40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVz a3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2lu dGVsLWdmeAo=