From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ander Conselvan de Oliveira Subject: [PATCH 19/35] drm/i915: Don't modeset with old mode when set_crtc fails Date: Tue, 21 Apr 2015 17:13:08 +0300 Message-ID: <1429625604-22252-20-git-send-email-ander.conselvan.de.oliveira@intel.com> References: <1429625604-22252-1-git-send-email-ander.conselvan.de.oliveira@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 0E3EC6E5DF for ; Tue, 21 Apr 2015 07:13:58 -0700 (PDT) In-Reply-To: <1429625604-22252-1-git-send-email-ander.conselvan.de.oliveira@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 Cc: Ander Conselvan de Oliveira List-Id: intel-gfx@lists.freedesktop.org VGhlIG1vZGVzZXQgY29kZSBpcyBub3cgcHJvcGVybHkgZGl2aWRlZCBpbiB0d28gcGhhc2VzLCBz byB0aGF0IGl0IG9ubHkKY2hhbmdlcyBoYXJkd2FyZSBzdGF0ZSBpZiBpdCBzdWNjZWVkcywgc28g dGhlcmUncyBubyBpbGwtZWZmZWN0IHRoYXQKbmVlZHMgdG8gYmUgdW5kb25lIG9uIGZhaWx1cmUg YW55bW9yZS4KClNpZ25lZC1vZmYtYnk6IEFuZGVyIENvbnNlbHZhbiBkZSBPbGl2ZWlyYSA8YW5k ZXIuY29uc2VsdmFuLmRlLm9saXZlaXJhQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kaXNwbGF5LmMgfCA0OCAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA0OCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kaXNwbGF5LmMKaW5kZXggMDgzY2YyMy4uOTAyODcwYSAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2Rpc3BsYXkuYwpAQCAtMTI2OTksMzMgKzEyNjk5LDkgQEAgaW50ZWxfbW9kZXNldF9z dGFnZV9vdXRwdXRfc3RhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAlyZXR1cm4gMDsKIH0K IAotc3RhdGljIHZvaWQgZGlzYWJsZV9jcnRjX25vZmIoc3RydWN0IGludGVsX2NydGMgKmNydGMp Ci17Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMtPmJhc2UuZGV2OwotCXN0cnVjdCBp bnRlbF9lbmNvZGVyICplbmNvZGVyOwotCXN0cnVjdCBpbnRlbF9jb25uZWN0b3IgKmNvbm5lY3Rv cjsKLQotCURSTV9ERUJVR19LTVMoIlRyeWluZyB0byByZXN0b3JlIHdpdGhvdXQgRkIgLT4gZGlz YWJsaW5nIHBpcGUgJWNcbiIsCi0JCSAgICAgIHBpcGVfbmFtZShjcnRjLT5waXBlKSk7Ci0KLQlm b3JfZWFjaF9pbnRlbF9jb25uZWN0b3IoZGV2LCBjb25uZWN0b3IpIHsKLQkJaWYgKGNvbm5lY3Rv ci0+bmV3X2VuY29kZXIgJiYKLQkJICAgIGNvbm5lY3Rvci0+bmV3X2VuY29kZXItPm5ld19jcnRj ID09IGNydGMpCi0JCQljb25uZWN0b3ItPm5ld19lbmNvZGVyID0gTlVMTDsKLQl9Ci0KLQlmb3Jf ZWFjaF9pbnRlbF9lbmNvZGVyKGRldiwgZW5jb2RlcikgewotCQlpZiAoZW5jb2Rlci0+bmV3X2Ny dGMgPT0gY3J0YykKLQkJCWVuY29kZXItPm5ld19jcnRjID0gTlVMTDsKLQl9Ci0KLQljcnRjLT5u ZXdfZW5hYmxlZCA9IGZhbHNlOwotfQotCiBzdGF0aWMgaW50IGludGVsX2NydGNfc2V0X2NvbmZp ZyhzdHJ1Y3QgZHJtX21vZGVfc2V0ICpzZXQpCiB7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldjsK LQlzdHJ1Y3QgZHJtX21vZGVfc2V0IHNhdmVfc2V0OwogCXN0cnVjdCBkcm1fYXRvbWljX3N0YXRl ICpzdGF0ZSA9IE5VTEw7CiAJc3RydWN0IGludGVsX3NldF9jb25maWcgKmNvbmZpZzsKIAlzdHJ1 Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqcGlwZV9jb25maWc7CkBAIC0xMjc1OCwxMiArMTI3MzQsNiBA QCBzdGF0aWMgaW50IGludGVsX2NydGNfc2V0X2NvbmZpZyhzdHJ1Y3QgZHJtX21vZGVfc2V0ICpz ZXQpCiAJaWYgKHJldCkKIAkJZ290byBvdXRfY29uZmlnOwogCi0Jc2F2ZV9zZXQuY3J0YyA9IHNl dC0+Y3J0YzsKLQlzYXZlX3NldC5tb2RlID0gJnNldC0+Y3J0Yy0+bW9kZTsKLQlzYXZlX3NldC54 ID0gc2V0LT5jcnRjLT54OwotCXNhdmVfc2V0LnkgPSBzZXQtPmNydGMtPnk7Ci0Jc2F2ZV9zZXQu ZmIgPSBzZXQtPmNydGMtPnByaW1hcnktPmZiOwotCiAJc3RhdGUgPSBkcm1fYXRvbWljX3N0YXRl X2FsbG9jKGRldik7CiAJaWYgKCFzdGF0ZSkgewogCQlyZXQgPSAtRU5PTUVNOwpAQCAtMTI4NDcs MjQgKzEyODE3LDYgQEAgc3RhdGljIGludCBpbnRlbF9jcnRjX3NldF9jb25maWcoc3RydWN0IGRy bV9tb2RlX3NldCAqc2V0KQogCQkJICAgICAgc2V0LT5jcnRjLT5iYXNlLmlkLCByZXQpOwogZmFp bDoKIAkJaW50ZWxfc2V0X2NvbmZpZ19yZXN0b3JlX3N0YXRlKGRldiwgY29uZmlnKTsKLQotCQlk cm1fYXRvbWljX3N0YXRlX2NsZWFyKHN0YXRlKTsKLQotCQkvKgotCQkgKiBIQUNLOiBpZiB0aGUg cGlwZSB3YXMgb24sIGJ1dCB3ZSBkaWRuJ3QgaGF2ZSBhIGZyYW1lYnVmZmVyLAotCQkgKiBmb3Jj ZSB0aGUgcGlwZSBvZmYgdG8gYXZvaWQgb29wc2luZyBpbiB0aGUgbW9kZXNldCBjb2RlCi0JCSAq IGR1ZSB0byBmYj09TlVMTC4gVGhpcyBzaG91bGQgb25seSBoYXBwZW4gZHVyaW5nIGJvb3Qgc2lu Y2UKLQkJICogd2UgZG9uJ3QgeWV0IHJlY29uc3RydWN0IHRoZSBGQiBmcm9tIHRoZSBoYXJkd2Fy ZSBzdGF0ZS4KLQkJICovCi0JCWlmICh0b19pbnRlbF9jcnRjKHNhdmVfc2V0LmNydGMpLT5uZXdf ZW5hYmxlZCAmJiAhc2F2ZV9zZXQuZmIpCi0JCQlkaXNhYmxlX2NydGNfbm9mYih0b19pbnRlbF9j cnRjKHNhdmVfc2V0LmNydGMpKTsKLQotCQkvKiBUcnkgdG8gcmVzdG9yZSB0aGUgY29uZmlnICov Ci0JCWlmIChjb25maWctPm1vZGVfY2hhbmdlZCAmJgotCQkgICAgaW50ZWxfc2V0X21vZGUoc2F2 ZV9zZXQuY3J0Yywgc2F2ZV9zZXQubW9kZSwKLQkJCQkgICBzYXZlX3NldC54LCBzYXZlX3NldC55 LCBzYXZlX3NldC5mYiwKLQkJCQkgICBzdGF0ZSkpCi0JCQlEUk1fRVJST1IoImZhaWxlZCB0byBy ZXN0b3JlIGNvbmZpZyBhZnRlciBtb2Rlc2V0IGZhaWx1cmVcbiIpOwogCX0KIAogb3V0X2NvbmZp ZzoKLS0gCjIuMS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5v cmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdm eAo=