From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH 01/24] drm/i915: Always reset in intel_crtc_restore_mode Date: Mon, 1 Jun 2015 15:27:04 +0200 Message-ID: <1433165247-15928-2-git-send-email-maarten.lankhorst@linux.intel.com> References: <1433165247-15928-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 ESMTP id E72526E5FA for ; Mon, 1 Jun 2015 06:27:43 -0700 (PDT) In-Reply-To: <1433165247-15928-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 QW5kIGdldCByaWQgb2YgdGhpbmdzIHRoYXQgYXJlIG5vIGxvbmdlciB0cnVlLiBUaGlzIGZ1bmN0 aW9uIGlzIG9ubHkKdXNlZCBmb3IgZm9yY2luZyBhIG1vZGVzZXQgd2hlbiBlbmNvZGVyIHByb3Bl cnRpZXMgYXJlIGNoYW5nZWQuCgpBbGwgdGhlIGV4aXN0aW5nIHN0YXRlIGlzIGZpbmUgaW4gdGhp cyBjYXNlLCBvbmx5IHNldHRpbmcgbW9kZV9jaGFuZ2VkCndpbGwgZm9yY2UgYSBmdWxsIHJlY2Fs Y3VsYXRpb24gaGVyZSwgYW5kIHRha2UgYWxsIHRoZSBzdGF0ZSBuZWVkZWQuCgpTaWduZWQtb2Zm LWJ5OiBNYWFydGVuIExhbmtob3JzdCA8bWFhcnRlbi5sYW5raG9yc3RAbGludXguaW50ZWwuY29t PgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8IDYyICsrKysrKysr KysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDE4IGluc2VydGlv bnMoKyksIDQ0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpp bmRleCBmYjlmMDdiMWU1Y2EuLmExZjk5YTMyYmRkYiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2Rpc3BsYXkuYwpAQCAtMTI3NTMsNjYgKzEyNzUzLDQwIEBAIHZvaWQgaW50ZWxfY3J0Y19yZXN0 b3JlX21vZGUoc3RydWN0IGRybV9jcnRjICpjcnRjKQogewogCXN0cnVjdCBkcm1fZGV2aWNlICpk ZXYgPSBjcnRjLT5kZXY7CiAJc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlOwotCXN0cnVj dCBpbnRlbF9jcnRjICppbnRlbF9jcnRjOwotCXN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVy OwotCXN0cnVjdCBpbnRlbF9jb25uZWN0b3IgKmNvbm5lY3RvcjsKLQlzdHJ1Y3QgZHJtX2Nvbm5l Y3Rvcl9zdGF0ZSAqY29ubmVjdG9yX3N0YXRlOwotCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpj cnRjX3N0YXRlOworCXN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZTsKIAlpbnQgcmV0 OwogCiAJc3RhdGUgPSBkcm1fYXRvbWljX3N0YXRlX2FsbG9jKGRldik7CiAJaWYgKCFzdGF0ZSkg ewotCQlEUk1fREVCVUdfS01TKCJbQ1JUQzolZF0gbW9kZSByZXN0b3JlIGZhaWxlZCwgb3V0IG9m IG1lbW9yeSIsCisJCURSTV9ERUJVR19LTVMoIltDUlRDOiVkXSBjcnRjIHJlc3RvcmUgZmFpbGVk LCBvdXQgb2YgbWVtb3J5IiwKIAkJCSAgICAgIGNydGMtPmJhc2UuaWQpOwogCQlyZXR1cm47CiAJ fQogCi0Jc3RhdGUtPmFjcXVpcmVfY3R4ID0gZGV2LT5tb2RlX2NvbmZpZy5hY3F1aXJlX2N0eDsK KwlzdGF0ZS0+YWNxdWlyZV9jdHggPSBkcm1fbW9kZXNldF9sZWdhY3lfYWNxdWlyZV9jdHgoY3J0 Yyk7CiAKLQkvKiBUaGUgZm9yY2UgcmVzdG9yZSBwYXRoIGluIHRoZSBIVyByZWFkb3V0IGNvZGUg cmVsaWVzIG9uIHRoZSBzdGFnZWQKLQkgKiBjb25maWcgc3RpbGwga2VlcGluZyB0aGUgdXNlciBy ZXF1ZXN0ZWQgY29uZmlnIHdoaWxlIHRoZSBhY3R1YWwKLQkgKiBzdGF0ZSBoYXMgYmVlbiBvdmVy d3JpdHRlbiBieSB0aGUgY29uZmlndXJhdGlvbiByZWFkIGZyb20gSFcuIFdlCi0JICogbmVlZCB0 byBjb3B5IHRoZSBzdGFnZWQgY29uZmlnIHRvIHRoZSBhdG9taWMgc3RhdGUsIG90aGVyd2lzZSB0 aGUKLQkgKiBtb2RlIHNldCB3aWxsIGp1c3QgcmVhcHBseSB0aGUgc3RhdGUgdGhlIEhXIGlzIGFs cmVhZHkgaW4uICovCi0JZm9yX2VhY2hfaW50ZWxfZW5jb2RlcihkZXYsIGVuY29kZXIpIHsKLQkJ aWYgKGVuY29kZXItPmJhc2UuY3J0YyAhPSBjcnRjKQotCQkJY29udGludWU7Ci0KLQkJZm9yX2Vh Y2hfaW50ZWxfY29ubmVjdG9yKGRldiwgY29ubmVjdG9yKSB7Ci0JCQlpZiAoY29ubmVjdG9yLT5i YXNlLnN0YXRlLT5iZXN0X2VuY29kZXIgIT0gJmVuY29kZXItPmJhc2UpCi0JCQkJY29udGludWU7 Ci0KLQkJCWNvbm5lY3Rvcl9zdGF0ZSA9IGRybV9hdG9taWNfZ2V0X2Nvbm5lY3Rvcl9zdGF0ZShz dGF0ZSwgJmNvbm5lY3Rvci0+YmFzZSk7Ci0JCQlpZiAoSVNfRVJSKGNvbm5lY3Rvcl9zdGF0ZSkp IHsKLQkJCQlEUk1fREVCVUdfS01TKCJGYWlsZWQgdG8gYWRkIFtDT05ORUNUT1I6JWQ6JXNdIHRv IHN0YXRlOiAlbGRcbiIsCi0JCQkJCSAgICAgIGNvbm5lY3Rvci0+YmFzZS5iYXNlLmlkLAotCQkJ CQkgICAgICBjb25uZWN0b3ItPmJhc2UubmFtZSwKLQkJCQkJICAgICAgUFRSX0VSUihjb25uZWN0 b3Jfc3RhdGUpKTsKLQkJCQljb250aW51ZTsKLQkJCX0KK3JldHJ5OgorCWNydGNfc3RhdGUgPSBk cm1fYXRvbWljX2dldF9jcnRjX3N0YXRlKHN0YXRlLCBjcnRjKTsKKwlyZXQgPSBQVFJfRVJSX09S X1pFUk8oY3J0Y19zdGF0ZSk7CisJaWYgKCFyZXQpIHsKKwkJaWYgKCFjcnRjX3N0YXRlLT5hY3Rp dmUpCisJCQlnb3RvIG91dDsKIAotCQkJY29ubmVjdG9yX3N0YXRlLT5jcnRjID0gY3J0YzsKLQkJ fQorCQljcnRjX3N0YXRlLT5tb2RlX2NoYW5nZWQgPSB0cnVlOworCQlyZXQgPSBpbnRlbF9tb2Rl c2V0X2NvbXB1dGVfY29uZmlnKHN0YXRlKTsKIAl9CiAKLQlmb3JfZWFjaF9pbnRlbF9jcnRjKGRl diwgaW50ZWxfY3J0YykgewotCQljcnRjX3N0YXRlID0gaW50ZWxfYXRvbWljX2dldF9jcnRjX3N0 YXRlKHN0YXRlLCBpbnRlbF9jcnRjKTsKLQkJaWYgKElTX0VSUihjcnRjX3N0YXRlKSkgewotCQkJ RFJNX0RFQlVHX0tNUygiRmFpbGVkIHRvIGFkZCBbQ1JUQzolZF0gdG8gc3RhdGU6ICVsZFxuIiwK LQkJCQkgICAgICBpbnRlbF9jcnRjLT5iYXNlLmJhc2UuaWQsCi0JCQkJICAgICAgUFRSX0VSUihj cnRjX3N0YXRlKSk7Ci0JCQljb250aW51ZTsKLQkJfQorCWlmICghcmV0KQorCQlyZXQgPSBpbnRl bF9zZXRfbW9kZV9jaGVja2VkKHN0YXRlKTsKIAotCQlpZiAoJmludGVsX2NydGMtPmJhc2UgPT0g Y3J0YykKLQkJCWRybV9tb2RlX2NvcHkoJmNydGNfc3RhdGUtPmJhc2UubW9kZSwgJmNydGMtPm1v ZGUpOworCWlmIChyZXQgPT0gLUVERUFETEspIHsKKwkJZHJtX2F0b21pY19zdGF0ZV9jbGVhcihz dGF0ZSk7CisJCWRybV9tb2Rlc2V0X2JhY2tvZmYoc3RhdGUtPmFjcXVpcmVfY3R4KTsKKwkJZ290 byByZXRyeTsKIAl9CiAKLQlpbnRlbF9tb2Rlc2V0X3NldHVwX3BsYW5lX3N0YXRlKHN0YXRlLCBj cnRjLCAmY3J0Yy0+bW9kZSwKLQkJCQkJY3J0Yy0+cHJpbWFyeS0+ZmIsIGNydGMtPngsIGNydGMt PnkpOwotCi0JcmV0ID0gaW50ZWxfc2V0X21vZGUoc3RhdGUpOwogCWlmIChyZXQpCitvdXQ6CiAJ CWRybV9hdG9taWNfc3RhdGVfZnJlZShzdGF0ZSk7CiB9CiAKLS0gCjIuMS4wCgpfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBs aXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNr dG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=