From mboxrd@z Thu Jan  1 00:00:00 1970
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Subject: [PATCH v3 15/20] drm/i915: Always reset in
	intel_crtc_restore_mode
Date: Mon, 13 Jul 2015 16:30:28 +0200
Message-ID: <1436797833-11493-16-git-send-email-maarten.lankhorst@linux.intel.com>
References: <1436797833-11493-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 C6E476E858
 for <intel-gfx@lists.freedesktop.org>; Mon, 13 Jul 2015 07:30:54 -0700 (PDT)
In-Reply-To: <1436797833-11493-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
cnRpZXMgYXJlIGNoYW5nZWQuCgpCZWNhdXNlIHRoaXMgaXMgbm90IHlldCBkb25lIGF0b21pY2Fs
bHksIGFzc3VtZSBhIGZ1bGwgbW9kZXNldCBpcwpuZWVkZWQgYW5kIHJlc2V0IHRoZSBjcnRjLgoK
U2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4
LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCA1
OCArKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAx
NiBpbnNlcnRpb25zKCspLCA0MiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw
dS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k
aXNwbGF5LmMKaW5kZXggZjZjNjU3MDZjZWJmLi41OTlhZjc2ZDM0ZjYgMTAwNjQ0Ci0tLSBhL2Ry
aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v
aTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTEzMjczLDYzICsxMzI3MywzNyBAQCB2b2lkIGludGVs
X2NydGNfcmVzdG9yZV9tb2RlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIHsKIAlzdHJ1Y3QgZHJt
X2RldmljZSAqZGV2ID0gY3J0Yy0+ZGV2OwogCXN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0
ZTsKLQlzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlcjsKLQlzdHJ1Y3QgaW50ZWxfY29ubmVj
dG9yICpjb25uZWN0b3I7Ci0Jc3RydWN0IGRybV9jb25uZWN0b3Jfc3RhdGUgKmNvbm5lY3Rvcl9z
dGF0ZTsKLQlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZTsKKwlzdHJ1Y3QgZHJt
X2NydGNfc3RhdGUgKmNydGNfc3RhdGU7CiAJaW50IHJldDsKIAogCXN0YXRlID0gZHJtX2F0b21p
Y19zdGF0ZV9hbGxvYyhkZXYpOwogCWlmICghc3RhdGUpIHsKLQkJRFJNX0RFQlVHX0tNUygiW0NS
VEM6JWRdIG1vZGUgcmVzdG9yZSBmYWlsZWQsIG91dCBvZiBtZW1vcnkiLAorCQlEUk1fREVCVUdf
S01TKCJbQ1JUQzolZF0gY3J0YyByZXN0b3JlIGZhaWxlZCwgb3V0IG9mIG1lbW9yeSIsCiAJCQkg
ICAgICBjcnRjLT5iYXNlLmlkKTsKIAkJcmV0dXJuOwogCX0KIAotCXN0YXRlLT5hY3F1aXJlX2N0
eCA9IGRldi0+bW9kZV9jb25maWcuYWNxdWlyZV9jdHg7Ci0KLQkvKiBUaGUgZm9yY2UgcmVzdG9y
ZSBwYXRoIGluIHRoZSBIVyByZWFkb3V0IGNvZGUgcmVsaWVzIG9uIHRoZSBzdGFnZWQKLQkgKiBj
b25maWcgc3RpbGwga2VlcGluZyB0aGUgdXNlciByZXF1ZXN0ZWQgY29uZmlnIHdoaWxlIHRoZSBh
Y3R1YWwKLQkgKiBzdGF0ZSBoYXMgYmVlbiBvdmVyd3JpdHRlbiBieSB0aGUgY29uZmlndXJhdGlv
biByZWFkIGZyb20gSFcuIFdlCi0JICogbmVlZCB0byBjb3B5IHRoZSBzdGFnZWQgY29uZmlnIHRv
IHRoZSBhdG9taWMgc3RhdGUsIG90aGVyd2lzZSB0aGUKLQkgKiBtb2RlIHNldCB3aWxsIGp1c3Qg
cmVhcHBseSB0aGUgc3RhdGUgdGhlIEhXIGlzIGFscmVhZHkgaW4uICovCi0JZm9yX2VhY2hfaW50
ZWxfZW5jb2RlcihkZXYsIGVuY29kZXIpIHsKLQkJaWYgKGVuY29kZXItPmJhc2UuY3J0YyAhPSBj
cnRjKQotCQkJY29udGludWU7CisJc3RhdGUtPmFjcXVpcmVfY3R4ID0gZHJtX21vZGVzZXRfbGVn
YWN5X2FjcXVpcmVfY3R4KGNydGMpOwogCi0JCWZvcl9lYWNoX2ludGVsX2Nvbm5lY3RvcihkZXYs
IGNvbm5lY3RvcikgewotCQkJaWYgKGNvbm5lY3Rvci0+YmFzZS5zdGF0ZS0+YmVzdF9lbmNvZGVy
ICE9Ci0JCQkgICAgJmVuY29kZXItPmJhc2UpCi0JCQkJY29udGludWU7Ci0KLQkJCWNvbm5lY3Rv
cl9zdGF0ZSA9IGRybV9hdG9taWNfZ2V0X2Nvbm5lY3Rvcl9zdGF0ZShzdGF0ZSwgJmNvbm5lY3Rv
ci0+YmFzZSk7Ci0JCQlpZiAoSVNfRVJSKGNvbm5lY3Rvcl9zdGF0ZSkpIHsKLQkJCQlEUk1fREVC
VUdfS01TKCJGYWlsZWQgdG8gYWRkIFtDT05ORUNUT1I6JWQ6JXNdIHRvIHN0YXRlOiAlbGRcbiIs
Ci0JCQkJCSAgICAgIGNvbm5lY3Rvci0+YmFzZS5iYXNlLmlkLAotCQkJCQkgICAgICBjb25uZWN0
b3ItPmJhc2UubmFtZSwKLQkJCQkJICAgICAgUFRSX0VSUihjb25uZWN0b3Jfc3RhdGUpKTsKLQkJ
CQljb250aW51ZTsKLQkJCX0KK3JldHJ5OgorCWNydGNfc3RhdGUgPSBkcm1fYXRvbWljX2dldF9j
cnRjX3N0YXRlKHN0YXRlLCBjcnRjKTsKKwlyZXQgPSBQVFJfRVJSX09SX1pFUk8oY3J0Y19zdGF0
ZSk7CisJaWYgKCFyZXQpIHsKKwkJaWYgKCFjcnRjX3N0YXRlLT5hY3RpdmUpCisJCQlnb3RvIG91
dDsKIAotCQkJY29ubmVjdG9yX3N0YXRlLT5jcnRjID0gY3J0YzsKLQkJfQorCQljcnRjX3N0YXRl
LT5tb2RlX2NoYW5nZWQgPSB0cnVlOworCQlyZXQgPSBpbnRlbF9zZXRfbW9kZShzdGF0ZSk7CiAJ
fQogCi0JY3J0Y19zdGF0ZSA9IGludGVsX2F0b21pY19nZXRfY3J0Y19zdGF0ZShzdGF0ZSwgdG9f
aW50ZWxfY3J0YyhjcnRjKSk7Ci0JaWYgKElTX0VSUihjcnRjX3N0YXRlKSkgewotCQlEUk1fREVC
VUdfS01TKCJGYWlsZWQgdG8gYWRkIFtDUlRDOiVkXSB0byBzdGF0ZTogJWxkXG4iLAotCQkJICAg
ICAgY3J0Yy0+YmFzZS5pZCwgUFRSX0VSUihjcnRjX3N0YXRlKSk7Ci0JCWRybV9hdG9taWNfc3Rh
dGVfZnJlZShzdGF0ZSk7Ci0JCXJldHVybjsKKwlpZiAocmV0ID09IC1FREVBRExLKSB7CisJCWRy
bV9hdG9taWNfc3RhdGVfY2xlYXIoc3RhdGUpOworCQlkcm1fbW9kZXNldF9iYWNrb2ZmKHN0YXRl
LT5hY3F1aXJlX2N0eCk7CisJCWdvdG8gcmV0cnk7CiAJfQogCi0JZHJtX21vZGVfY29weSgmY3J0
Y19zdGF0ZS0+YmFzZS5tb2RlLCAmY3J0Yy0+bW9kZSk7Ci0KLQlpbnRlbF9tb2Rlc2V0X3NldHVw
X3BsYW5lX3N0YXRlKHN0YXRlLCBjcnRjLCAmY3J0Yy0+bW9kZSwKLQkJCQkJY3J0Yy0+cHJpbWFy
eS0+ZmIsIGNydGMtPngsIGNydGMtPnkpOwotCi0JcmV0ID0gaW50ZWxfc2V0X21vZGUoc3RhdGUp
OwogCWlmIChyZXQpCitvdXQ6CiAJCWRybV9hdG9taWNfc3RhdGVfZnJlZShzdGF0ZSk7CiB9CiAK
LS0gCjIuMS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
XwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcK
aHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=