From mboxrd@z Thu Jan  1 00:00:00 1970
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Subject: [PATCH 12/18] drm/i915: Always reset in
	intel_crtc_restore_mode
Date: Thu,  2 Jul 2015 16:36:56 +0200
Message-ID: <1435847822-5318-13-git-send-email-maarten.lankhorst@linux.intel.com>
References: <1435847822-5318-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: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mblankhorst.nl (mblankhorst.nl [141.105.120.124])
 by gabe.freedesktop.org (Postfix) with ESMTPS id DFFAF6ECA6
 for <intel-gfx@lists.freedesktop.org>; Thu,  2 Jul 2015 07:37:25 -0700 (PDT)
In-Reply-To: <1435847822-5318-1-git-send-email-maarten.lankhorst@linux.intel.com>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

QW5kIGdldCByaWQgb2YgdGhpbmdzIHRoYXQgYXJlIG5vIGxvbmdlciB0cnVlLiBUaGlzIGZ1bmN0
aW9uIGlzIG9ubHkKdXNlZCBmb3IgZm9yY2luZyBhIG1vZGVzZXQgd2hlbiBlbmNvZGVyIHByb3Bl
cnRpZXMgYXJlIGNoYW5nZWQuCgpBbGwgdGhlIGV4aXN0aW5nIHN0YXRlIGlzIGZpbmUgaW4gdGhp
cyBjYXNlLCBvbmx5IHNldHRpbmcgbW9kZV9jaGFuZ2VkCndpbGwgZm9yY2UgYSBmdWxsIHJlY2Fs
Y3VsYXRpb24gaGVyZSwgYW5kIHRha2UgYWxsIHRoZSBzdGF0ZSBuZWVkZWQuCgpUaGUgcHJldmlv
dXMgY29tbWl0IHdpbGwgcHJldmVudCB1bm5lZWRlZCBtb2Rlc2V0cyBhbnl3YXkuCgpTaWduZWQt
b2ZmLWJ5OiBNYWFydGVuIExhbmtob3JzdCA8bWFhcnRlbi5sYW5raG9yc3RAbGludXguaW50ZWwu
Y29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8IDU4ICsrKysr
KysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDE2IGluc2Vy
dGlvbnMoKyksIDQyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p
OTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXku
YwppbmRleCBhZTY5NDcyMGUyNjMuLjQ1ODM5M2RmNDYzMCAxMDA2NDQKLS0tIGEvZHJpdmVycy9n
cHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu
dGVsX2Rpc3BsYXkuYwpAQCAtMTMyODAsNjMgKzEzMjgwLDM3IEBAIHZvaWQgaW50ZWxfY3J0Y19y
ZXN0b3JlX21vZGUoc3RydWN0IGRybV9jcnRjICpjcnRjKQogewogCXN0cnVjdCBkcm1fZGV2aWNl
ICpkZXYgPSBjcnRjLT5kZXY7CiAJc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlOwotCXN0
cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyOwotCXN0cnVjdCBpbnRlbF9jb25uZWN0b3IgKmNv
bm5lY3RvcjsKLQlzdHJ1Y3QgZHJtX2Nvbm5lY3Rvcl9zdGF0ZSAqY29ubmVjdG9yX3N0YXRlOwot
CXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlOworCXN0cnVjdCBkcm1fY3J0Y19z
dGF0ZSAqY3J0Y19zdGF0ZTsKIAlpbnQgcmV0OwogCiAJc3RhdGUgPSBkcm1fYXRvbWljX3N0YXRl
X2FsbG9jKGRldik7CiAJaWYgKCFzdGF0ZSkgewotCQlEUk1fREVCVUdfS01TKCJbQ1JUQzolZF0g
bW9kZSByZXN0b3JlIGZhaWxlZCwgb3V0IG9mIG1lbW9yeSIsCisJCURSTV9ERUJVR19LTVMoIltD
UlRDOiVkXSBjcnRjIHJlc3RvcmUgZmFpbGVkLCBvdXQgb2YgbWVtb3J5IiwKIAkJCSAgICAgIGNy
dGMtPmJhc2UuaWQpOwogCQlyZXR1cm47CiAJfQogCi0Jc3RhdGUtPmFjcXVpcmVfY3R4ID0gZGV2
LT5tb2RlX2NvbmZpZy5hY3F1aXJlX2N0eDsKLQotCS8qIFRoZSBmb3JjZSByZXN0b3JlIHBhdGgg
aW4gdGhlIEhXIHJlYWRvdXQgY29kZSByZWxpZXMgb24gdGhlIHN0YWdlZAotCSAqIGNvbmZpZyBz
dGlsbCBrZWVwaW5nIHRoZSB1c2VyIHJlcXVlc3RlZCBjb25maWcgd2hpbGUgdGhlIGFjdHVhbAot
CSAqIHN0YXRlIGhhcyBiZWVuIG92ZXJ3cml0dGVuIGJ5IHRoZSBjb25maWd1cmF0aW9uIHJlYWQg
ZnJvbSBIVy4gV2UKLQkgKiBuZWVkIHRvIGNvcHkgdGhlIHN0YWdlZCBjb25maWcgdG8gdGhlIGF0
b21pYyBzdGF0ZSwgb3RoZXJ3aXNlIHRoZQotCSAqIG1vZGUgc2V0IHdpbGwganVzdCByZWFwcGx5
IHRoZSBzdGF0ZSB0aGUgSFcgaXMgYWxyZWFkeSBpbi4gKi8KLQlmb3JfZWFjaF9pbnRlbF9lbmNv
ZGVyKGRldiwgZW5jb2RlcikgewotCQlpZiAoZW5jb2Rlci0+YmFzZS5jcnRjICE9IGNydGMpCi0J
CQljb250aW51ZTsKKwlzdGF0ZS0+YWNxdWlyZV9jdHggPSBkcm1fbW9kZXNldF9sZWdhY3lfYWNx
dWlyZV9jdHgoY3J0Yyk7CiAKLQkJZm9yX2VhY2hfaW50ZWxfY29ubmVjdG9yKGRldiwgY29ubmVj
dG9yKSB7Ci0JCQlpZiAoY29ubmVjdG9yLT5iYXNlLnN0YXRlLT5iZXN0X2VuY29kZXIgIT0KLQkJ
CSAgICAmZW5jb2Rlci0+YmFzZSkKLQkJCQljb250aW51ZTsKLQotCQkJY29ubmVjdG9yX3N0YXRl
ID0gZHJtX2F0b21pY19nZXRfY29ubmVjdG9yX3N0YXRlKHN0YXRlLCAmY29ubmVjdG9yLT5iYXNl
KTsKLQkJCWlmIChJU19FUlIoY29ubmVjdG9yX3N0YXRlKSkgewotCQkJCURSTV9ERUJVR19LTVMo
IkZhaWxlZCB0byBhZGQgW0NPTk5FQ1RPUjolZDolc10gdG8gc3RhdGU6ICVsZFxuIiwKLQkJCQkJ
ICAgICAgY29ubmVjdG9yLT5iYXNlLmJhc2UuaWQsCi0JCQkJCSAgICAgIGNvbm5lY3Rvci0+YmFz
ZS5uYW1lLAotCQkJCQkgICAgICBQVFJfRVJSKGNvbm5lY3Rvcl9zdGF0ZSkpOwotCQkJCWNvbnRp
bnVlOwotCQkJfQorcmV0cnk6CisJY3J0Y19zdGF0ZSA9IGRybV9hdG9taWNfZ2V0X2NydGNfc3Rh
dGUoc3RhdGUsIGNydGMpOworCXJldCA9IFBUUl9FUlJfT1JfWkVSTyhjcnRjX3N0YXRlKTsKKwlp
ZiAoIXJldCkgeworCQlpZiAoIWNydGNfc3RhdGUtPmFjdGl2ZSkKKwkJCWdvdG8gb3V0OwogCi0J
CQljb25uZWN0b3Jfc3RhdGUtPmNydGMgPSBjcnRjOwotCQl9CisJCWNydGNfc3RhdGUtPm1vZGVf
Y2hhbmdlZCA9IHRydWU7CisJCXJldCA9IGludGVsX3NldF9tb2RlKHN0YXRlKTsKIAl9CiAKLQlj
cnRjX3N0YXRlID0gaW50ZWxfYXRvbWljX2dldF9jcnRjX3N0YXRlKHN0YXRlLCB0b19pbnRlbF9j
cnRjKGNydGMpKTsKLQlpZiAoSVNfRVJSKGNydGNfc3RhdGUpKSB7Ci0JCURSTV9ERUJVR19LTVMo
IkZhaWxlZCB0byBhZGQgW0NSVEM6JWRdIHRvIHN0YXRlOiAlbGRcbiIsCi0JCQkgICAgICBjcnRj
LT5iYXNlLmlkLCBQVFJfRVJSKGNydGNfc3RhdGUpKTsKLQkJZHJtX2F0b21pY19zdGF0ZV9mcmVl
KHN0YXRlKTsKLQkJcmV0dXJuOworCWlmIChyZXQgPT0gLUVERUFETEspIHsKKwkJZHJtX2F0b21p
Y19zdGF0ZV9jbGVhcihzdGF0ZSk7CisJCWRybV9tb2Rlc2V0X2JhY2tvZmYoc3RhdGUtPmFjcXVp
cmVfY3R4KTsKKwkJZ290byByZXRyeTsKIAl9CiAKLQlkcm1fbW9kZV9jb3B5KCZjcnRjX3N0YXRl
LT5iYXNlLm1vZGUsICZjcnRjLT5tb2RlKTsKLQotCWludGVsX21vZGVzZXRfc2V0dXBfcGxhbmVf
c3RhdGUoc3RhdGUsIGNydGMsICZjcnRjLT5tb2RlLAotCQkJCQljcnRjLT5wcmltYXJ5LT5mYiwg
Y3J0Yy0+eCwgY3J0Yy0+eSk7Ci0KLQlyZXQgPSBpbnRlbF9zZXRfbW9kZShzdGF0ZSk7CiAJaWYg
KHJldCkKK291dDoKIAkJZHJtX2F0b21pY19zdGF0ZV9mcmVlKHN0YXRlKTsKIH0KIAotLSAKMi4x
LjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVs
LWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8v
bGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==