From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH 2/2] drm/i915: Only check pipe state for fast modeset when it's possible. Date: Mon, 14 Sep 2015 11:30:11 +0200 Message-ID: <1442223011-15581-2-git-send-email-maarten.lankhorst@linux.intel.com> References: <1442223011-15581-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 [141.105.120.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id B999C6E0CC for ; Mon, 14 Sep 2015 02:30:17 -0700 (PDT) In-Reply-To: <1442223011-15581-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 QSBmYXN0IG1vZGVzZXQgY2FuIG9ubHkgYmUgcGVyZm9ybWVkIHdoZW4gY29ubmVjdG9ycyBhbmQg YWN0aXZlIGFyZQpub3QgY2hhbmdlZC4gVGhpcyBwcmV2ZW50cyBhIGxvdCBvZiBLTVMgc3BhbSB3 aGVuIGdvaW5nIGZyb20gYSBOVUxMCm1vZGUgd2l0aCAwIGNvbm5lY3RvcnMgdG8gYW4gYWN0dWFs IG1vZGUuCgpXaGVuIGEgY3J0YyBpcyBpbmFjdGl2ZSB0aGVyZSdzIG5vIG5lZWQgdG8gZXZhZGUg ZWl0aGVyLCB0aGUgY2hhbmdlcwpjYW4gYmUgYXBwbGllZCB3aGVuIHRoZSBjcnRjIHR1cm5zIG9u IGFnYWluLgoKU2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hv cnN0QGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNw bGF5LmMgfCAyMSArKysrKysrKysrKy0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxMSBpbnNl cnRpb25zKCspLCAxMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5 LmMKaW5kZXggZGViNzZjODRhMzA3Li5lZGRjODFjMmQ0NTkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kaXNwbGF5LmMKQEAgLTEyMjgxLDcgKzEyMjgxLDcgQEAgaW50ZWxfY29tcGFyZV9saW5r X21fbihjb25zdCBzdHJ1Y3QgaW50ZWxfbGlua19tX24gKm1fbiwKIAogc3RhdGljIGJvb2wKIGlu dGVsX3BpcGVfY29uZmlnX2NvbXBhcmUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKLQkJCSAgc3Ry dWN0IGludGVsX2NydGNfc3RhdGUgKmN1cnJlbnRfY29uZmlnLAorCQkJICBjb25zdCBzdHJ1Y3Qg aW50ZWxfY3J0Y19zdGF0ZSAqY3VycmVudF9jb25maWcsCiAJCQkgIHN0cnVjdCBpbnRlbF9jcnRj X3N0YXRlICpwaXBlX2NvbmZpZywKIAkJCSAgYm9vbCBhZGp1c3QpCiB7CkBAIC0xMzAxMywxNCAr MTMwMTMsMTUgQEAgc3RhdGljIGludCBpbnRlbF9hdG9taWNfY2hlY2soc3RydWN0IGRybV9kZXZp Y2UgKmRldiwKIAkJaWYgKHJldCkKIAkJCXJldHVybiByZXQ7CiAKLQkJaWYgKGludGVsX3BpcGVf Y29uZmlnX2NvbXBhcmUoc3RhdGUtPmRldiwKLQkJCQkJdG9faW50ZWxfY3J0Y19zdGF0ZShjcnRj LT5zdGF0ZSksCi0JCQkJCXBpcGVfY29uZmlnLCB0cnVlKSkgeworCQlpZiAoIWNydGNfc3RhdGUt PmNvbm5lY3RvcnNfY2hhbmdlZCAmJgorCQkgICAgIWNydGNfc3RhdGUtPmFjdGl2ZV9jaGFuZ2Vk ICYmCisJCSAgICBjcnRjX3N0YXRlLT5hY3RpdmUgJiYKKwkJICAgIGludGVsX3BpcGVfY29uZmln X2NvbXBhcmUoc3RhdGUtPmRldiwKKwkJCQkJICAgICAgdG9faW50ZWxfY3J0Y19zdGF0ZShjcnRj LT5zdGF0ZSksCisJCQkJCSAgICAgIHBpcGVfY29uZmlnLCB0cnVlKSkgewogCQkJY3J0Y19zdGF0 ZS0+bW9kZV9jaGFuZ2VkID0gZmFsc2U7Ci0JCQl0b19pbnRlbF9jcnRjX3N0YXRlKGNydGNfc3Rh dGUpLT51cGRhdGVfcGlwZSA9IHRydWU7Ci0JCX0KLQotCQlpZiAobmVlZHNfbW9kZXNldChjcnRj X3N0YXRlKSkgeworCQkJcGlwZV9jb25maWctPnVwZGF0ZV9waXBlID0gdHJ1ZTsKKwkJfSBlbHNl IHsKIAkJCWFueV9tcyA9IHRydWU7CiAKIAkJCXJldCA9IGRybV9hdG9taWNfYWRkX2FmZmVjdGVk X3BsYW5lcyhzdGF0ZSwgY3J0Yyk7CkBAIC0xMzAyOSw4ICsxMzAzMCw4IEBAIHN0YXRpYyBpbnQg aW50ZWxfYXRvbWljX2NoZWNrKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCX0KIAogCQlpbnRl bF9kdW1wX3BpcGVfY29uZmlnKHRvX2ludGVsX2NydGMoY3J0YyksIHBpcGVfY29uZmlnLAotCQkJ CSAgICAgICBuZWVkc19tb2Rlc2V0KGNydGNfc3RhdGUpID8KLQkJCQkgICAgICAgIlttb2Rlc2V0 XSIgOiAiW2Zhc3RzZXRdIik7CisJCQkJICAgICAgIHBpcGVfY29uZmlnLT51cGRhdGVfcGlwZSA/ CisJCQkJICAgICAgICJbZmFzdHNldF0iIDogIlttb2Rlc2V0XSIpOwogCX0KIAogCWlmIChhbnlf bXMpIHsKLS0gCjIuMS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVs LWdmeAo=