From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH 17/24] drm/i915: Update less state during modeset. Date: Mon, 1 Jun 2015 15:27:20 +0200 Message-ID: <1433165247-15928-18-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 4CDEB6E5FA for ; Mon, 1 Jun 2015 06:27:45 -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 Tm8gbmVlZCB0byByZXBlYXRlZGx5IGNhbGwgdXBkYXRlX3dhdGVybWFya3MsIG9yIHVwZGF0ZV9m YmMuCkRvd24gdG8gYSBzaW5nbGUgY2FsbCB0byB1cGRhdGVfd2F0ZXJtYXJrcyBpbiAuY3J0Y19l bmFibGUKClNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3Jz dEBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxh eS5jIHwgNjYgKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hh bmdlZCwgMTcgaW5zZXJ0aW9ucygrKSwgNDkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZGlzcGxheS5jCmluZGV4IGUyYTFjNGMwMTAzMi4uMDI2OTliYWRjNTAwIDEwMDY0NAot 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 b21pYyA9ICZjcnRjLT5hdG9taWM7CiAJc3RydWN0IGRybV9wbGFuZSAqcDsKIApAQCAtNDc2OCw4 ICs0NzYwLDEzIEBAIHN0YXRpYyB2b2lkIGludGVsX3ByZV9wbGFuZV91cGRhdGUoc3RydWN0IGlu dGVsX2NydGMgKmNydGMpCiAJaWYgKElOVEVMX0lORk8oZGV2KS0+Z2VuID49IDkpCiAJCXNrbF9k ZXRhY2hfc2NhbGVycyhjcnRjKTsKIAotCWlmIChhdG9taWMtPmRpc2FibGVfZmJjKQotCQlpbnRl bF9mYmNfZGlzYWJsZShkZXYpOworCWlmIChhdG9taWMtPmRpc2FibGVfZmJjICYmCisJICAgIGRl dl9wcml2LT5mYmMuY3J0YyA9PSBjcnRjKSB7CisJCW11dGV4X2xvY2soJmRldi0+c3RydWN0X211 dGV4KTsKKwkJaWYgKGRldl9wcml2LT5mYmMuY3J0YyA9PSBjcnRjKQorCQkJaW50ZWxfZmJjX2Rp c2FibGUoZGV2KTsKKwkJbXV0ZXhfdW5sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7CisJfQogCiAJ aWYgKGF0b21pYy0+cHJlX2Rpc2FibGVfcHJpbWFyeSkKIAkJaW50ZWxfcHJlX2Rpc2FibGVfcHJp bWFyeSgmY3J0Yy0+YmFzZSk7CkBAIC00OTk1LDkgKzQ5OTIsNiBAQCBzdGF0aWMgdm9pZCBpcm9u bGFrZV9jcnRjX2Rpc2FibGUoc3RydWN0IGRybV9jcnRjICpjcnRjKQogCWludCBwaXBlID0gaW50 ZWxfY3J0Yy0+cGlwZTsKIAl1MzIgcmVnLCB0ZW1wOwogCi0JaWYgKFdBUk5fT04oIWludGVsX2Ny dGMtPmFjdGl2ZSkpCi0JCXJldHVybjsKLQogCWZvcl9lYWNoX2VuY29kZXJfb25fY3J0YyhkZXYs IGNydGMsIGVuY29kZXIpCiAJCWVuY29kZXItPmRpc2FibGUoZW5jb2Rlcik7CiAKQEAgLTUwMzYs MTggKzUwMzAsOCBAQCBzdGF0aWMgdm9pZCBpcm9ubGFrZV9jcnRjX2Rpc2FibGUoc3RydWN0IGRy bV9jcnRjICpjcnRjKQogCQkJSTkxNV9XUklURShQQ0hfRFBMTF9TRUwsIHRlbXApOwogCQl9CiAK LQkJLyogZGlzYWJsZSBQQ0ggRFBMTCAqLwotCQlpbnRlbF9kaXNhYmxlX3NoYXJlZF9kcGxsKGlu dGVsX2NydGMpOwotCiAJCWlyb25sYWtlX2ZkaV9wbGxfZGlzYWJsZShpbnRlbF9jcnRjKTsKIAl9 Ci0KLQlpbnRlbF9jcnRjLT5hY3RpdmUgPSBmYWxzZTsKLQlpbnRlbF91cGRhdGVfd2F0ZXJtYXJr cyhjcnRjKTsKLQotCW11dGV4X2xvY2soJmRldi0+c3RydWN0X211dGV4KTsKLQlpbnRlbF9mYmNf dXBkYXRlKGRldik7Ci0JbXV0ZXhfdW5sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7CiB9CiAKIHN0 YXRpYyB2b2lkIGhhc3dlbGxfY3J0Y19kaXNhYmxlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKQEAg LTUwNTgsOSArNTA0Miw2IEBAIHN0YXRpYyB2b2lkIGhhc3dlbGxfY3J0Y19kaXNhYmxlKHN0cnVj dCBkcm1fY3J0YyAqY3J0YykKIAlzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlcjsKIAllbnVt IHRyYW5zY29kZXIgY3B1X3RyYW5zY29kZXIgPSBpbnRlbF9jcnRjLT5jb25maWctPmNwdV90cmFu c2NvZGVyOwogCi0JaWYgKFdBUk5fT04oIWludGVsX2NydGMtPmFjdGl2ZSkpCi0JCXJldHVybjsK LQogCWZvcl9lYWNoX2VuY29kZXJfb25fY3J0YyhkZXYsIGNydGMsIGVuY29kZXIpIHsKIAkJaW50 ZWxfb3ByZWdpb25fbm90aWZ5X2VuY29kZXIoZW5jb2RlciwgZmFsc2UpOwogCQllbmNvZGVyLT5k aXNhYmxlKGVuY29kZXIpOwpAQCAtNTA5NiwxNiArNTA3Nyw2IEBAIHN0YXRpYyB2b2lkIGhhc3dl bGxfY3J0Y19kaXNhYmxlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAlmb3JfZWFjaF9lbmNvZGVy X29uX2NydGMoZGV2LCBjcnRjLCBlbmNvZGVyKQogCQlpZiAoZW5jb2Rlci0+cG9zdF9kaXNhYmxl KQogCQkJZW5jb2Rlci0+cG9zdF9kaXNhYmxlKGVuY29kZXIpOwotCi0JaW50ZWxfY3J0Yy0+YWN0 aXZlID0gZmFsc2U7Ci0JaW50ZWxfdXBkYXRlX3dhdGVybWFya3MoY3J0Yyk7Ci0KLQltdXRleF9s b2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7Ci0JaW50ZWxfZmJjX3VwZGF0ZShkZXYpOwotCW11dGV4 X3VubG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwotCi0JaWYgKGludGVsX2NydGNfdG9fc2hhcmVk X2RwbGwoaW50ZWxfY3J0YykpCi0JCWludGVsX2Rpc2FibGVfc2hhcmVkX2RwbGwoaW50ZWxfY3J0 Yyk7CiB9CiAKIHN0YXRpYyB2b2lkIGk5eHhfcGZpdF9lbmFibGUoc3RydWN0IGludGVsX2NydGMg KmNydGMpCkBAIC02MTEwLDkgKzYwODEsNiBAQCBzdGF0aWMgdm9pZCBpOXh4X2NydGNfZGlzYWJs ZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAJc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXI7 CiAJaW50IHBpcGUgPSBpbnRlbF9jcnRjLT5waXBlOwogCi0JaWYgKFdBUk5fT04oIWludGVsX2Ny dGMtPmFjdGl2ZSkpCi0JCXJldHVybjsKLQogCS8qCiAJICogT24gZ2VuMiBwbGFuZXMgYXJlIGRv dWJsZSBidWZmZXJlZCBidXQgdGhlIHBpcGUgaXNuJ3QsIHNvIHdlIG11c3QKIAkgKiB3YWl0IGZv ciBwbGFuZXMgdG8gZnVsbHkgdHVybiBvZmYgYmVmb3JlIGRpc2FibGluZyB0aGUgcGlwZS4KQEAg LTYxNDYsMTMgKzYxMTQsNiBAQCBzdGF0aWMgdm9pZCBpOXh4X2NydGNfZGlzYWJsZShzdHJ1Y3Qg ZHJtX2NydGMgKmNydGMpCiAKIAlpZiAoIUlTX0dFTjIoZGV2KSkKIAkJaW50ZWxfc2V0X2NwdV9m aWZvX3VuZGVycnVuX3JlcG9ydGluZyhkZXZfcHJpdiwgcGlwZSwgZmFsc2UpOwotCi0JaW50ZWxf Y3J0Yy0+YWN0aXZlID0gZmFsc2U7Ci0JaW50ZWxfdXBkYXRlX3dhdGVybWFya3MoY3J0Yyk7Ci0K LQltdXRleF9sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7Ci0JaW50ZWxfZmJjX3VwZGF0ZShkZXYp OwotCW11dGV4X3VubG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwogfQogCiAvKgpAQCAtMTI4Mjks NiArMTI3OTAsOCBAQCBzdGF0aWMgaW50IF9faW50ZWxfc2V0X21vZGUoc3RydWN0IGRybV9hdG9t aWNfc3RhdGUgKnN0YXRlKQogCWRybV9hdG9taWNfaGVscGVyX3N3YXBfc3RhdGUoZGV2LCBzdGF0 ZSk7CiAKIAlmb3JfZWFjaF9jcnRjX2luX3N0YXRlKHN0YXRlLCBjcnRjLCBjcnRjX3N0YXRlLCBp KSB7CisJCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRj KTsKKwogCQlpZiAoIW5lZWRzX21vZGVzZXQoY3J0Yy0+c3RhdGUpKQogCQkJY29udGludWU7CiAK QEAgLTEyODM3LDYgKzEyODAwLDggQEAgc3RhdGljIGludCBfX2ludGVsX3NldF9tb2RlKHN0cnVj dCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKIAkJaWYgKGNydGNfc3RhdGUtPmFjdGl2ZSkgewog CQkJaW50ZWxfY3J0Y19kaXNhYmxlX3BsYW5lcyhjcnRjLCBjcnRjX3N0YXRlKTsKIAkJCWRldl9w cml2LT5kaXNwbGF5LmNydGNfZGlzYWJsZShjcnRjKTsKKwkJCWludGVsX2NydGMtPmFjdGl2ZSA9 IGZhbHNlOworCQkJaW50ZWxfZGlzYWJsZV9zaGFyZWRfZHBsbChpbnRlbF9jcnRjKTsKIAkJfQog CX0KIApAQCAtMTI4NjAsNiArMTI4MjUsOSBAQCBzdGF0aWMgaW50IF9faW50ZWxfc2V0X21vZGUo c3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlKQogCQkJdXBkYXRlX3NjYW5saW5lX29mZnNl dCh0b19pbnRlbF9jcnRjKGNydGMpKTsKIAkJCWRldl9wcml2LT5kaXNwbGF5LmNydGNfZW5hYmxl KGNydGMpOwogCQkJaW50ZWxfY3J0Y19lbmFibGVfcGxhbmVzKGNydGMpOworCQl9IGVsc2Ugewor CQkJaWYgKHRvX2ludGVsX2NydGMoY3J0YyktPmF0b21pYy51cGRhdGVfd20pCisJCQkJaW50ZWxf dXBkYXRlX3dhdGVybWFya3MoY3J0Yyk7CiAJCX0KIAkJaW50ZWxfcG9zdF9wbGFuZV91cGRhdGUo dG9faW50ZWxfY3J0YyhjcnRjKSk7CiAJfQotLSAKMi4xLjAKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwt Z2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h aWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==