From mboxrd@z Thu Jan  1 00:00:00 1970
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Subject: [PATCH v3.1 15/20] drm/i915: Always force a modeset in
 intel_crtc_restore_mode, v2.
Date: Tue, 14 Jul 2015 16:19:12 +0200
Message-ID: <55A51A60.6040507@linux.intel.com>
References: <1436797833-11493-1-git-send-email-maarten.lankhorst@linux.intel.com>
 <1436797833-11493-16-git-send-email-maarten.lankhorst@linux.intel.com>
 <20150714095641.GS3736@phenom.ffwll.local>
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 mga03.intel.com (mga03.intel.com [134.134.136.65])
 by gabe.freedesktop.org (Postfix) with ESMTP id D11246EA2A
 for <intel-gfx@lists.freedesktop.org>; Tue, 14 Jul 2015 07:19:13 -0700 (PDT)
In-Reply-To: <20150714095641.GS3736@phenom.ffwll.local>
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: Daniel Vetter <daniel@ffwll.ch>
Cc: intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

QW5kIGdldCByaWQgb2YgdGhpbmdzIHRoYXQgYXJlIG5vIGxvbmdlciB0cnVlLiBUaGlzIGZ1bmN0
aW9uIGlzIG9ubHkKdXNlZCBmb3IgZm9yY2luZyBhIG1vZGVzZXQgd2hlbiBlbmNvZGVyIHByb3Bl
cnRpZXMgYXJlIGNoYW5nZWQuCgpCZWNhdXNlIHRoaXMgaXMgbm90IHlldCBkb25lIGF0b21pY2Fs
bHksIGFzc3VtZSBhIGZ1bGwgbW9kZXNldCBpcwpuZWVkZWQgYW5kIGZvcmNlIGEgbW9kZXNldCBv
biB0aGUgY3J0Yy4KCkNoYW5nZXMgc2luY2UgdjE6Ci0gcy9yZXNldC9mb3JjZSBtb2Rlc2V0LwoK
U2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4
LmludGVsLmNvbT4KUmV2aWV3ZWQtYnk6IERhbmllbCBTdG9uZSA8ZGFuaWVsc0Bjb2xsYWJvcmEu
Y29tPgotLS0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXku
YyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCA5NTM3YWQ4YmU0
YTkuLjQ5OTIyM2U2ZjczNiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf
ZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAt
MTMyNzMsNjMgKzEzMjczLDM3IEBAIHZvaWQgaW50ZWxfY3J0Y19yZXN0b3JlX21vZGUoc3RydWN0
IGRybV9jcnRjICpjcnRjKQogewogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBjcnRjLT5kZXY7
CiAJc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlOwotCXN0cnVjdCBpbnRlbF9lbmNvZGVy
ICplbmNvZGVyOwotCXN0cnVjdCBpbnRlbF9jb25uZWN0b3IgKmNvbm5lY3RvcjsKLQlzdHJ1Y3Qg
ZHJtX2Nvbm5lY3Rvcl9zdGF0ZSAqY29ubmVjdG9yX3N0YXRlOwotCXN0cnVjdCBpbnRlbF9jcnRj
X3N0YXRlICpjcnRjX3N0YXRlOworCXN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZTsK
IAlpbnQgcmV0OwogCiAJc3RhdGUgPSBkcm1fYXRvbWljX3N0YXRlX2FsbG9jKGRldik7CiAJaWYg
KCFzdGF0ZSkgewotCQlEUk1fREVCVUdfS01TKCJbQ1JUQzolZF0gbW9kZSByZXN0b3JlIGZhaWxl
ZCwgb3V0IG9mIG1lbW9yeSIsCisJCURSTV9ERUJVR19LTVMoIltDUlRDOiVkXSBjcnRjIHJlc3Rv
cmUgZmFpbGVkLCBvdXQgb2YgbWVtb3J5IiwKIAkJCSAgICAgIGNydGMtPmJhc2UuaWQpOwogCQly
ZXR1cm47CiAJfQogCi0Jc3RhdGUtPmFjcXVpcmVfY3R4ID0gZGV2LT5tb2RlX2NvbmZpZy5hY3F1
aXJlX2N0eDsKLQotCS8qIFRoZSBmb3JjZSByZXN0b3JlIHBhdGggaW4gdGhlIEhXIHJlYWRvdXQg
Y29kZSByZWxpZXMgb24gdGhlIHN0YWdlZAotCSAqIGNvbmZpZyBzdGlsbCBrZWVwaW5nIHRoZSB1
c2VyIHJlcXVlc3RlZCBjb25maWcgd2hpbGUgdGhlIGFjdHVhbAotCSAqIHN0YXRlIGhhcyBiZWVu
IG92ZXJ3cml0dGVuIGJ5IHRoZSBjb25maWd1cmF0aW9uIHJlYWQgZnJvbSBIVy4gV2UKLQkgKiBu
ZWVkIHRvIGNvcHkgdGhlIHN0YWdlZCBjb25maWcgdG8gdGhlIGF0b21pYyBzdGF0ZSwgb3RoZXJ3
aXNlIHRoZQotCSAqIG1vZGUgc2V0IHdpbGwganVzdCByZWFwcGx5IHRoZSBzdGF0ZSB0aGUgSFcg
aXMgYWxyZWFkeSBpbi4gKi8KLQlmb3JfZWFjaF9pbnRlbF9lbmNvZGVyKGRldiwgZW5jb2Rlcikg
ewotCQlpZiAoZW5jb2Rlci0+YmFzZS5jcnRjICE9IGNydGMpCi0JCQljb250aW51ZTsKKwlzdGF0
ZS0+YWNxdWlyZV9jdHggPSBkcm1fbW9kZXNldF9sZWdhY3lfYWNxdWlyZV9jdHgoY3J0Yyk7CiAK
LQkJZm9yX2VhY2hfaW50ZWxfY29ubmVjdG9yKGRldiwgY29ubmVjdG9yKSB7Ci0JCQlpZiAoY29u
bmVjdG9yLT5iYXNlLnN0YXRlLT5iZXN0X2VuY29kZXIgIT0KLQkJCSAgICAmZW5jb2Rlci0+YmFz
ZSkKLQkJCQljb250aW51ZTsKLQotCQkJY29ubmVjdG9yX3N0YXRlID0gZHJtX2F0b21pY19nZXRf
Y29ubmVjdG9yX3N0YXRlKHN0YXRlLCAmY29ubmVjdG9yLT5iYXNlKTsKLQkJCWlmIChJU19FUlIo
Y29ubmVjdG9yX3N0YXRlKSkgewotCQkJCURSTV9ERUJVR19LTVMoIkZhaWxlZCB0byBhZGQgW0NP
Tk5FQ1RPUjolZDolc10gdG8gc3RhdGU6ICVsZFxuIiwKLQkJCQkJICAgICAgY29ubmVjdG9yLT5i
YXNlLmJhc2UuaWQsCi0JCQkJCSAgICAgIGNvbm5lY3Rvci0+YmFzZS5uYW1lLAotCQkJCQkgICAg
ICBQVFJfRVJSKGNvbm5lY3Rvcl9zdGF0ZSkpOwotCQkJCWNvbnRpbnVlOwotCQkJfQorcmV0cnk6
CisJY3J0Y19zdGF0ZSA9IGRybV9hdG9taWNfZ2V0X2NydGNfc3RhdGUoc3RhdGUsIGNydGMpOwor
CXJldCA9IFBUUl9FUlJfT1JfWkVSTyhjcnRjX3N0YXRlKTsKKwlpZiAoIXJldCkgeworCQlpZiAo
IWNydGNfc3RhdGUtPmFjdGl2ZSkKKwkJCWdvdG8gb3V0OwogCi0JCQljb25uZWN0b3Jfc3RhdGUt
PmNydGMgPSBjcnRjOwotCQl9CisJCWNydGNfc3RhdGUtPm1vZGVfY2hhbmdlZCA9IHRydWU7CisJ
CXJldCA9IGludGVsX3NldF9tb2RlKHN0YXRlKTsKIAl9CiAKLQljcnRjX3N0YXRlID0gaW50ZWxf
YXRvbWljX2dldF9jcnRjX3N0YXRlKHN0YXRlLCB0b19pbnRlbF9jcnRjKGNydGMpKTsKLQlpZiAo
SVNfRVJSKGNydGNfc3RhdGUpKSB7Ci0JCURSTV9ERUJVR19LTVMoIkZhaWxlZCB0byBhZGQgW0NS
VEM6JWRdIHRvIHN0YXRlOiAlbGRcbiIsCi0JCQkgICAgICBjcnRjLT5iYXNlLmlkLCBQVFJfRVJS
KGNydGNfc3RhdGUpKTsKLQkJZHJtX2F0b21pY19zdGF0ZV9mcmVlKHN0YXRlKTsKLQkJcmV0dXJu
OworCWlmIChyZXQgPT0gLUVERUFETEspIHsKKwkJZHJtX2F0b21pY19zdGF0ZV9jbGVhcihzdGF0
ZSk7CisJCWRybV9tb2Rlc2V0X2JhY2tvZmYoc3RhdGUtPmFjcXVpcmVfY3R4KTsKKwkJZ290byBy
ZXRyeTsKIAl9CiAKLQlkcm1fbW9kZV9jb3B5KCZjcnRjX3N0YXRlLT5iYXNlLm1vZGUsICZjcnRj
LT5tb2RlKTsKLQotCWludGVsX21vZGVzZXRfc2V0dXBfcGxhbmVfc3RhdGUoc3RhdGUsIGNydGMs
ICZjcnRjLT5tb2RlLAotCQkJCQljcnRjLT5wcmltYXJ5LT5mYiwgY3J0Yy0+eCwgY3J0Yy0+eSk7
Ci0KLQlyZXQgPSBpbnRlbF9zZXRfbW9kZShzdGF0ZSk7CiAJaWYgKHJldCkKK291dDoKIAkJZHJt
X2F0b21pY19zdGF0ZV9mcmVlKHN0YXRlKTsKIH0KIAoKX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhA
bGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1h
bi9saXN0aW5mby9pbnRlbC1nZngK