From mboxrd@z Thu Jan  1 00:00:00 1970
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Subject: [PATCH v2 20/27] drm/i915: Update less state during
	modeset.
Date: Thu,  4 Jun 2015 14:47:50 +0200
Message-ID: <1433422077-14907-21-git-send-email-maarten.lankhorst@linux.intel.com>
References: <1433422077-14907-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 ESMTP id 21F626EB35
 for <intel-gfx@lists.freedesktop.org>; Thu,  4 Jun 2015 05:48:13 -0700 (PDT)
In-Reply-To: <1433422077-14907-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

Tm8gbmVlZCB0byByZXBlYXRlZGx5IGNhbGwgdXBkYXRlX3dhdGVybWFya3MsIG9yIHVwZGF0ZV9m
YmMuCkRvd24gdG8gYSBzaW5nbGUgY2FsbCB0byB1cGRhdGVfd2F0ZXJtYXJrcyBpbiAuY3J0Y19l
bmFibGUKClNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3Jz
dEBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxh
eS5jIHwgNjUgKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hh
bmdlZCwgMTUgaW5zZXJ0aW9ucygrKSwgNTAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJp
dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv
aW50ZWxfZGlzcGxheS5jCmluZGV4IGQ0ZGRjYWQ3ZWFmMS4uZmNkN2U2NzgzOTAxIDEwMDY0NAot
LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9n
cHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC0xOTQ1LDEwICsxOTQ1LDEwIEBAIHN0YXRp
YyB2b2lkIGludGVsX2Rpc2FibGVfc2hhcmVkX2RwbGwoc3RydWN0IGludGVsX2NydGMgKmNydGMp
CiAKIAkvKiBQQ0ggb25seSBhdmFpbGFibGUgb24gSUxLKyAqLwogCUJVR19PTihJTlRFTF9JTkZP
KGRldiktPmdlbiA8IDUpOwotCWlmIChXQVJOX09OKHBsbCA9PSBOVUxMKSkKKwlpZiAocGxsID09
IE5VTEwpCiAJICAgICAgIHJldHVybjsKIAotCWlmIChXQVJOX09OKHBsbC0+Y29uZmlnLmNydGNf
bWFzayA9PSAwKSkKKwlpZiAoV0FSTl9PTighKHBsbC0+Y29uZmlnLmNydGNfbWFzayAmICgxIDw8
IGRybV9jcnRjX2luZGV4KCZjcnRjLT5iYXNlKSkpKSkKIAkJcmV0dXJuOwogCiAJRFJNX0RFQlVH
X0tNUygiZGlzYWJsZSAlcyAoYWN0aXZlICVkLCBvbj8gJWQpIGZvciBjcnRjICVkXG4iLApAQCAt
NDYzNCwxMCArNDYzNCw2IEBAIGludGVsX3Bvc3RfZW5hYmxlX3ByaW1hcnkoc3RydWN0IGRybV9j
cnRjICpjcnRjKQogCSAqLwogCWhzd19lbmFibGVfaXBzKGludGVsX2NydGMpOwogCi0JbXV0ZXhf
bG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwotCWludGVsX2ZiY191cGRhdGUoZGV2KTsKLQltdXRl
eF91bmxvY2soJmRldi0+c3RydWN0X211dGV4KTsKLQogCS8qCiAJICogR2VuMiByZXBvcnRzIHBp
cGUgdW5kZXJydW5zIHdoZW5ldmVyIGFsbCBwbGFuZXMgYXJlIGRpc2FibGVkLgogCSAqIFNvIGRv
bid0IGVuYWJsZSB1bmRlcnJ1biByZXBvcnRpbmcgYmVmb3JlIGF0IGxlYXN0IHNvbWUgcGxhbmVz
CkBAIC00NjkyLDExICs0Njg4LDYgQEAgaW50ZWxfcHJlX2Rpc2FibGVfcHJpbWFyeShzdHJ1Y3Qg
ZHJtX2NydGMgKmNydGMpCiAJaWYgKEhBU19HTUNIX0RJU1BMQVkoZGV2KSkKIAkJaW50ZWxfc2V0
X21lbW9yeV9jeHNyKGRldl9wcml2LCBmYWxzZSk7CiAKLQltdXRleF9sb2NrKCZkZXYtPnN0cnVj
dF9tdXRleCk7Ci0JaWYgKGRldl9wcml2LT5mYmMuY3J0YyA9PSBpbnRlbF9jcnRjKQotCQlpbnRl
bF9mYmNfZGlzYWJsZShkZXYpOwotCW11dGV4X3VubG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwot
CiAJLyoKIAkgKiBGSVhNRSBJUFMgc2hvdWxkIGJlIGZpbmUgYXMgbG9uZyBhcyBvbmUgcGxhbmUg
aXMKIAkgKiBlbmFibGVkLCBidXQgaW4gcHJhY3RpY2UgaXQgc2VlbXMgdG8gaGF2ZSBwcm9ibGVt
cwpAQCAtNDczNiw2ICs0NzI3LDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfcG9zdF9wbGFuZV91cGRh
dGUoc3RydWN0IGludGVsX2NydGMgKmNydGMpCiBzdGF0aWMgdm9pZCBpbnRlbF9wcmVfcGxhbmVf
dXBkYXRlKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQogewogCXN0cnVjdCBkcm1fZGV2aWNlICpk
ZXYgPSBjcnRjLT5iYXNlLmRldjsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYg
PSBkZXYtPmRldl9wcml2YXRlOwogCXN0cnVjdCBpbnRlbF9jcnRjX2F0b21pY19jb21taXQgKmF0
b21pYyA9ICZjcnRjLT5hdG9taWM7CiAJc3RydWN0IGRybV9wbGFuZSAqcDsKIApAQCAtNDc2NSw4
ICs0NzU3LDEzIEBAIHN0YXRpYyB2b2lkIGludGVsX3ByZV9wbGFuZV91cGRhdGUoc3RydWN0IGlu
dGVsX2NydGMgKmNydGMpCiAJaWYgKGF0b21pYy0+d2FpdF9mb3JfZmxpcHMpCiAJCWludGVsX2Ny
dGNfd2FpdF9mb3JfcGVuZGluZ19mbGlwcygmY3J0Yy0+YmFzZSk7CiAKLQlpZiAoYXRvbWljLT5k
aXNhYmxlX2ZiYykKLQkJaW50ZWxfZmJjX2Rpc2FibGUoZGV2KTsKKwlpZiAoYXRvbWljLT5kaXNh
YmxlX2ZiYyAmJgorCSAgICBkZXZfcHJpdi0+ZmJjLmNydGMgPT0gY3J0YykgeworCQltdXRleF9s
b2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7CisJCWlmIChkZXZfcHJpdi0+ZmJjLmNydGMgPT0gY3J0
YykKKwkJCWludGVsX2ZiY19kaXNhYmxlKGRldik7CisJCW11dGV4X3VubG9jaygmZGV2LT5zdHJ1
Y3RfbXV0ZXgpOworCX0KIAogCWlmIChhdG9taWMtPnByZV9kaXNhYmxlX3ByaW1hcnkpCiAJCWlu
dGVsX3ByZV9kaXNhYmxlX3ByaW1hcnkoJmNydGMtPmJhc2UpOwpAQCAtNDk3Myw5ICs0OTcwLDYg
QEAgc3RhdGljIHZvaWQgaXJvbmxha2VfY3J0Y19kaXNhYmxlKHN0cnVjdCBkcm1fY3J0YyAqY3J0
YykKIAlpbnQgcGlwZSA9IGludGVsX2NydGMtPnBpcGU7CiAJdTMyIHJlZywgdGVtcDsKIAotCWlm
IChXQVJOX09OKCFpbnRlbF9jcnRjLT5hY3RpdmUpKQotCQlyZXR1cm47Ci0KIAlmb3JfZWFjaF9l
bmNvZGVyX29uX2NydGMoZGV2LCBjcnRjLCBlbmNvZGVyKQogCQllbmNvZGVyLT5kaXNhYmxlKGVu
Y29kZXIpOwogCkBAIC01MDE0LDE4ICs1MDA4LDggQEAgc3RhdGljIHZvaWQgaXJvbmxha2VfY3J0
Y19kaXNhYmxlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAkJCUk5MTVfV1JJVEUoUENIX0RQTExf
U0VMLCB0ZW1wKTsKIAkJfQogCi0JCS8qIGRpc2FibGUgUENIIERQTEwgKi8KLQkJaW50ZWxfZGlz
YWJsZV9zaGFyZWRfZHBsbChpbnRlbF9jcnRjKTsKLQogCQlpcm9ubGFrZV9mZGlfcGxsX2Rpc2Fi
bGUoaW50ZWxfY3J0Yyk7CiAJfQotCi0JaW50ZWxfY3J0Yy0+YWN0aXZlID0gZmFsc2U7Ci0JaW50
ZWxfdXBkYXRlX3dhdGVybWFya3MoY3J0Yyk7Ci0KLQltdXRleF9sb2NrKCZkZXYtPnN0cnVjdF9t
dXRleCk7Ci0JaW50ZWxfZmJjX3VwZGF0ZShkZXYpOwotCW11dGV4X3VubG9jaygmZGV2LT5zdHJ1
Y3RfbXV0ZXgpOwogfQogCiBzdGF0aWMgdm9pZCBoYXN3ZWxsX2NydGNfZGlzYWJsZShzdHJ1Y3Qg
ZHJtX2NydGMgKmNydGMpCkBAIC01MDM2LDkgKzUwMjAsNiBAQCBzdGF0aWMgdm9pZCBoYXN3ZWxs
X2NydGNfZGlzYWJsZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAJc3RydWN0IGludGVsX2VuY29k
ZXIgKmVuY29kZXI7CiAJZW51bSB0cmFuc2NvZGVyIGNwdV90cmFuc2NvZGVyID0gaW50ZWxfY3J0
Yy0+Y29uZmlnLT5jcHVfdHJhbnNjb2RlcjsKIAotCWlmIChXQVJOX09OKCFpbnRlbF9jcnRjLT5h
Y3RpdmUpKQotCQlyZXR1cm47Ci0KIAlmb3JfZWFjaF9lbmNvZGVyX29uX2NydGMoZGV2LCBjcnRj
LCBlbmNvZGVyKSB7CiAJCWludGVsX29wcmVnaW9uX25vdGlmeV9lbmNvZGVyKGVuY29kZXIsIGZh
bHNlKTsKIAkJZW5jb2Rlci0+ZGlzYWJsZShlbmNvZGVyKTsKQEAgLTUwNzQsMTYgKzUwNTUsNiBA
QCBzdGF0aWMgdm9pZCBoYXN3ZWxsX2NydGNfZGlzYWJsZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMp
CiAJZm9yX2VhY2hfZW5jb2Rlcl9vbl9jcnRjKGRldiwgY3J0YywgZW5jb2RlcikKIAkJaWYgKGVu
Y29kZXItPnBvc3RfZGlzYWJsZSkKIAkJCWVuY29kZXItPnBvc3RfZGlzYWJsZShlbmNvZGVyKTsK
LQotCWludGVsX2NydGMtPmFjdGl2ZSA9IGZhbHNlOwotCWludGVsX3VwZGF0ZV93YXRlcm1hcmtz
KGNydGMpOwotCi0JbXV0ZXhfbG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwotCWludGVsX2ZiY191
cGRhdGUoZGV2KTsKLQltdXRleF91bmxvY2soJmRldi0+c3RydWN0X211dGV4KTsKLQotCWlmIChp
bnRlbF9jcnRjX3RvX3NoYXJlZF9kcGxsKGludGVsX2NydGMpKQotCQlpbnRlbF9kaXNhYmxlX3No
YXJlZF9kcGxsKGludGVsX2NydGMpOwogfQogCiBzdGF0aWMgdm9pZCBpOXh4X3BmaXRfZW5hYmxl
KHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQpAQCAtNjA4OSw5ICs2MDYwLDYgQEAgc3RhdGljIHZv
aWQgaTl4eF9jcnRjX2Rpc2FibGUoc3RydWN0IGRybV9jcnRjICpjcnRjKQogCXN0cnVjdCBpbnRl
bF9lbmNvZGVyICplbmNvZGVyOwogCWludCBwaXBlID0gaW50ZWxfY3J0Yy0+cGlwZTsKIAotCWlm
IChXQVJOX09OKCFpbnRlbF9jcnRjLT5hY3RpdmUpKQotCQlyZXR1cm47Ci0KIAkvKgogCSAqIE9u
IGdlbjIgcGxhbmVzIGFyZSBkb3VibGUgYnVmZmVyZWQgYnV0IHRoZSBwaXBlIGlzbid0LCBzbyB3
ZSBtdXN0CiAJICogd2FpdCBmb3IgcGxhbmVzIHRvIGZ1bGx5IHR1cm4gb2ZmIGJlZm9yZSBkaXNh
YmxpbmcgdGhlIHBpcGUuCkBAIC02MTI1LDEzICs2MDkzLDYgQEAgc3RhdGljIHZvaWQgaTl4eF9j
cnRjX2Rpc2FibGUoc3RydWN0IGRybV9jcnRjICpjcnRjKQogCiAJaWYgKCFJU19HRU4yKGRldikp
CiAJCWludGVsX3NldF9jcHVfZmlmb191bmRlcnJ1bl9yZXBvcnRpbmcoZGV2X3ByaXYsIHBpcGUs
IGZhbHNlKTsKLQotCWludGVsX2NydGMtPmFjdGl2ZSA9IGZhbHNlOwotCWludGVsX3VwZGF0ZV93
YXRlcm1hcmtzKGNydGMpOwotCi0JbXV0ZXhfbG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwotCWlu
dGVsX2ZiY191cGRhdGUoZGV2KTsKLQltdXRleF91bmxvY2soJmRldi0+c3RydWN0X211dGV4KTsK
IH0KIAogLyoKQEAgLTExNjUwLDggKzExNjExLDEwIEBAIHN0YXRpYyBpbnQgaW50ZWxfY3J0Y19h
dG9taWNfY2hlY2soc3RydWN0IGRybV9jcnRjICpjcnRjLAogCiAJLyogcGxhbmUgbWFzayBpcyBm
aXhlZCB1cCBhZnRlciBhbGwgaW5pdGlhbCBwbGFuZXMgYXJlIGNhbGN1bGF0ZWQgKi8KIAlwaXBl
X2NvbmZpZy0+cXVpcmtzICY9IH5QSVBFX0NPTkZJR19RVUlSS19JTklUSUFMX1BMQU5FUzsKLQlp
ZiAobW9kZV9jaGFuZ2VkKQorCWlmIChtb2RlX2NoYW5nZWQpIHsKIAkJaW50ZWxfY3J0Yy0+YXRv
bWljLmZvcmNlX2Rpc2FibGVkX3BsYW5lcyA9IGNydGMtPnN0YXRlLT5wbGFuZV9tYXNrOworCQlp
bnRlbF9jcnRjLT5hdG9taWMudXBkYXRlX3dtID0gIWNydGNfc3RhdGUtPmFjdGl2ZTsKKwl9CiAK
IAlpZiAobW9kZV9jaGFuZ2VkICYmIGNydGNfc3RhdGUtPmVuYWJsZSAmJgogCSAgICBkZXZfcHJp
di0+ZGlzcGxheS5jcnRjX2NvbXB1dGVfY2xvY2sgJiYKQEAgLTEyODg5LDYgKzEyODUyLDggQEAg
c3RhdGljIGludCBfX2ludGVsX3NldF9tb2RlKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0
ZSkKIAkJCWludGVsX2Zyb250YnVmZmVyX2ZsaXAoZGV2LCBJTlRFTF9GUk9OVEJVRkZFUl9BTExf
TUFTSyhpbnRlbF9jcnRjLT5waXBlKSk7CiAKIAkJCWRldl9wcml2LT5kaXNwbGF5LmNydGNfZGlz
YWJsZShjcnRjKTsKKwkJCWludGVsX2NydGMtPmFjdGl2ZSA9IGZhbHNlOworCQkJaW50ZWxfZGlz
YWJsZV9zaGFyZWRfZHBsbChpbnRlbF9jcnRjKTsKIAkJfQogCX0KIAotLSAKMi4xLjAKCl9fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWls
aW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJl
ZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==