From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH v3 16/19] drm/i915: Update less state during modeset. Date: Mon, 15 Jun 2015 12:33:53 +0200 Message-ID: <1434364436-6366-17-git-send-email-maarten.lankhorst@linux.intel.com> References: <1434364436-6366-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 221F66E73F for ; Mon, 15 Jun 2015 03:34:15 -0700 (PDT) In-Reply-To: <1434364436-6366-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 eS5jIHwgNjYgKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hh bmdlZCwgMTYgaW5zZXJ0aW9ucygrKSwgNTAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZGlzcGxheS5jCmluZGV4IGJlYjY5MjgxZjQ1Yy4uNWZhY2QwNTAxYTM0IDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC0xOTQ1LDEwICsxOTQ1LDEwIEBAIHN0YXRp YyB2b2lkIGludGVsX2Rpc2FibGVfc2hhcmVkX2RwbGwoc3RydWN0IGludGVsX2NydGMgKmNydGMp CiAKIAkvKiBQQ0ggb25seSBhdmFpbGFibGUgb24gSUxLKyAqLwogCUJVR19PTihJTlRFTF9JTkZP KGRldiktPmdlbiA8IDUpOwotCWlmIChXQVJOX09OKHBsbCA9PSBOVUxMKSkKLQkgICAgICAgcmV0 dXJuOworCWlmIChwbGwgPT0gTlVMTCkKKwkJcmV0dXJuOwogCi0JaWYgKFdBUk5fT04ocGxsLT5j b25maWcuY3J0Y19tYXNrID09IDApKQorCWlmIChXQVJOX09OKCEocGxsLT5jb25maWcuY3J0Y19t YXNrICYgKDEgPDwgZHJtX2NydGNfaW5kZXgoJmNydGMtPmJhc2UpKSkpKQogCQlyZXR1cm47CiAK IAlEUk1fREVCVUdfS01TKCJkaXNhYmxlICVzIChhY3RpdmUgJWQsIG9uPyAlZCkgZm9yIGNydGMg JWRcbiIsCkBAIC00NjQzLDEwICs0NjQzLDYgQEAgaW50ZWxfcG9zdF9lbmFibGVfcHJpbWFyeShz dHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAJICovCiAJaHN3X2VuYWJsZV9pcHMoaW50ZWxfY3J0Yyk7 CiAKLQltdXRleF9sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7Ci0JaW50ZWxfZmJjX3VwZGF0ZShk ZXYpOwotCW11dGV4X3VubG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwotCiAJLyoKIAkgKiBHZW4y IHJlcG9ydHMgcGlwZSB1bmRlcnJ1bnMgd2hlbmV2ZXIgYWxsIHBsYW5lcyBhcmUgZGlzYWJsZWQu CiAJICogU28gZG9uJ3QgZW5hYmxlIHVuZGVycnVuIHJlcG9ydGluZyBiZWZvcmUgYXQgbGVhc3Qg c29tZSBwbGFuZXMKQEAgLTQ3MDEsMTEgKzQ2OTcsNiBAQCBpbnRlbF9wcmVfZGlzYWJsZV9wcmlt YXJ5KHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAlpZiAoSEFTX0dNQ0hfRElTUExBWShkZXYpKQog CQlpbnRlbF9zZXRfbWVtb3J5X2N4c3IoZGV2X3ByaXYsIGZhbHNlKTsKIAotCW11dGV4X2xvY2so JmRldi0+c3RydWN0X211dGV4KTsKLQlpZiAoZGV2X3ByaXYtPmZiYy5jcnRjID09IGludGVsX2Ny dGMpCi0JCWludGVsX2ZiY19kaXNhYmxlKGRldik7Ci0JbXV0ZXhfdW5sb2NrKCZkZXYtPnN0cnVj dF9tdXRleCk7Ci0KIAkvKgogCSAqIEZJWE1FIElQUyBzaG91bGQgYmUgZmluZSBhcyBsb25nIGFz IG9uZSBwbGFuZSBpcwogCSAqIGVuYWJsZWQsIGJ1dCBpbiBwcmFjdGljZSBpdCBzZWVtcyB0byBo YXZlIHByb2JsZW1zCkBAIC00NzQ1LDYgKzQ3MzYsNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9wb3N0 X3BsYW5lX3VwZGF0ZShzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKIHN0YXRpYyB2b2lkIGludGVs X3ByZV9wbGFuZV91cGRhdGUoc3RydWN0IGludGVsX2NydGMgKmNydGMpCiB7CiAJc3RydWN0IGRy bV9kZXZpY2UgKmRldiA9IGNydGMtPmJhc2UuZGV2OworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CiAJc3RydWN0IGludGVsX2NydGNfYXRvbWlj X2NvbW1pdCAqYXRvbWljID0gJmNydGMtPmF0b21pYzsKIAlzdHJ1Y3QgZHJtX3BsYW5lICpwOwog CkBAIC00Nzc0LDggKzQ3NjYsMTMgQEAgc3RhdGljIHZvaWQgaW50ZWxfcHJlX3BsYW5lX3VwZGF0 ZShzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKIAlpZiAoYXRvbWljLT53YWl0X2Zvcl9mbGlwcykK IAkJaW50ZWxfY3J0Y193YWl0X2Zvcl9wZW5kaW5nX2ZsaXBzKCZjcnRjLT5iYXNlKTsKIAotCWlm IChhdG9taWMtPmRpc2FibGVfZmJjKQotCQlpbnRlbF9mYmNfZGlzYWJsZShkZXYpOworCWlmIChh dG9taWMtPmRpc2FibGVfZmJjICYmCisJICAgIGRldl9wcml2LT5mYmMuY3J0YyA9PSBjcnRjKSB7 CisJCW11dGV4X2xvY2soJmRldi0+c3RydWN0X211dGV4KTsKKwkJaWYgKGRldl9wcml2LT5mYmMu Y3J0YyA9PSBjcnRjKQorCQkJaW50ZWxfZmJjX2Rpc2FibGUoZGV2KTsKKwkJbXV0ZXhfdW5sb2Nr KCZkZXYtPnN0cnVjdF9tdXRleCk7CisJfQogCiAJaWYgKGF0b21pYy0+cHJlX2Rpc2FibGVfcHJp bWFyeSkKIAkJaW50ZWxfcHJlX2Rpc2FibGVfcHJpbWFyeSgmY3J0Yy0+YmFzZSk7CkBAIC00OTky LDkgKzQ5ODksNiBAQCBzdGF0aWMgdm9pZCBpcm9ubGFrZV9jcnRjX2Rpc2FibGUoc3RydWN0IGRy bV9jcnRjICpjcnRjKQogCWludCBwaXBlID0gaW50ZWxfY3J0Yy0+cGlwZTsKIAl1MzIgcmVnLCB0 ZW1wOwogCi0JaWYgKFdBUk5fT04oIWludGVsX2NydGMtPmFjdGl2ZSkpCi0JCXJldHVybjsKLQog CWZvcl9lYWNoX2VuY29kZXJfb25fY3J0YyhkZXYsIGNydGMsIGVuY29kZXIpCiAJCWVuY29kZXIt PmRpc2FibGUoZW5jb2Rlcik7CiAKQEAgLTUwMzMsMTggKzUwMjcsOCBAQCBzdGF0aWMgdm9pZCBp cm9ubGFrZV9jcnRjX2Rpc2FibGUoc3RydWN0IGRybV9jcnRjICpjcnRjKQogCQkJSTkxNV9XUklU RShQQ0hfRFBMTF9TRUwsIHRlbXApOwogCQl9CiAKLQkJLyogZGlzYWJsZSBQQ0ggRFBMTCAqLwot CQlpbnRlbF9kaXNhYmxlX3NoYXJlZF9kcGxsKGludGVsX2NydGMpOwotCiAJCWlyb25sYWtlX2Zk aV9wbGxfZGlzYWJsZShpbnRlbF9jcnRjKTsKIAl9Ci0KLQlpbnRlbF9jcnRjLT5hY3RpdmUgPSBm YWxzZTsKLQlpbnRlbF91cGRhdGVfd2F0ZXJtYXJrcyhjcnRjKTsKLQotCW11dGV4X2xvY2soJmRl di0+c3RydWN0X211dGV4KTsKLQlpbnRlbF9mYmNfdXBkYXRlKGRldik7Ci0JbXV0ZXhfdW5sb2Nr KCZkZXYtPnN0cnVjdF9tdXRleCk7CiB9CiAKIHN0YXRpYyB2b2lkIGhhc3dlbGxfY3J0Y19kaXNh YmxlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKQEAgLTUwNTUsOSArNTAzOSw2IEBAIHN0YXRpYyB2 b2lkIGhhc3dlbGxfY3J0Y19kaXNhYmxlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAlzdHJ1Y3Qg aW50ZWxfZW5jb2RlciAqZW5jb2RlcjsKIAllbnVtIHRyYW5zY29kZXIgY3B1X3RyYW5zY29kZXIg PSBpbnRlbF9jcnRjLT5jb25maWctPmNwdV90cmFuc2NvZGVyOwogCi0JaWYgKFdBUk5fT04oIWlu dGVsX2NydGMtPmFjdGl2ZSkpCi0JCXJldHVybjsKLQogCWZvcl9lYWNoX2VuY29kZXJfb25fY3J0 YyhkZXYsIGNydGMsIGVuY29kZXIpIHsKIAkJaW50ZWxfb3ByZWdpb25fbm90aWZ5X2VuY29kZXIo ZW5jb2RlciwgZmFsc2UpOwogCQllbmNvZGVyLT5kaXNhYmxlKGVuY29kZXIpOwpAQCAtNTA5Mywx NiArNTA3NCw2IEBAIHN0YXRpYyB2b2lkIGhhc3dlbGxfY3J0Y19kaXNhYmxlKHN0cnVjdCBkcm1f Y3J0YyAqY3J0YykKIAlmb3JfZWFjaF9lbmNvZGVyX29uX2NydGMoZGV2LCBjcnRjLCBlbmNvZGVy KQogCQlpZiAoZW5jb2Rlci0+cG9zdF9kaXNhYmxlKQogCQkJZW5jb2Rlci0+cG9zdF9kaXNhYmxl KGVuY29kZXIpOwotCi0JaW50ZWxfY3J0Yy0+YWN0aXZlID0gZmFsc2U7Ci0JaW50ZWxfdXBkYXRl X3dhdGVybWFya3MoY3J0Yyk7Ci0KLQltdXRleF9sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7Ci0J aW50ZWxfZmJjX3VwZGF0ZShkZXYpOwotCW11dGV4X3VubG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgp OwotCi0JaWYgKGludGVsX2NydGNfdG9fc2hhcmVkX2RwbGwoaW50ZWxfY3J0YykpCi0JCWludGVs X2Rpc2FibGVfc2hhcmVkX2RwbGwoaW50ZWxfY3J0Yyk7CiB9CiAKIHN0YXRpYyB2b2lkIGk5eHhf cGZpdF9lbmFibGUoc3RydWN0IGludGVsX2NydGMgKmNydGMpCkBAIC02MTU0LDkgKzYxMjUsNiBA QCBzdGF0aWMgdm9pZCBpOXh4X2NydGNfZGlzYWJsZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAJ c3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXI7CiAJaW50IHBpcGUgPSBpbnRlbF9jcnRjLT5w aXBlOwogCi0JaWYgKFdBUk5fT04oIWludGVsX2NydGMtPmFjdGl2ZSkpCi0JCXJldHVybjsKLQog CS8qCiAJICogT24gZ2VuMiBwbGFuZXMgYXJlIGRvdWJsZSBidWZmZXJlZCBidXQgdGhlIHBpcGUg aXNuJ3QsIHNvIHdlIG11c3QKIAkgKiB3YWl0IGZvciBwbGFuZXMgdG8gZnVsbHkgdHVybiBvZmYg YmVmb3JlIGRpc2FibGluZyB0aGUgcGlwZS4KQEAgLTYxOTAsMTMgKzYxNTgsNiBAQCBzdGF0aWMg dm9pZCBpOXh4X2NydGNfZGlzYWJsZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAKIAlpZiAoIUlT X0dFTjIoZGV2KSkKIAkJaW50ZWxfc2V0X2NwdV9maWZvX3VuZGVycnVuX3JlcG9ydGluZyhkZXZf cHJpdiwgcGlwZSwgZmFsc2UpOwotCi0JaW50ZWxfY3J0Yy0+YWN0aXZlID0gZmFsc2U7Ci0JaW50 ZWxfdXBkYXRlX3dhdGVybWFya3MoY3J0Yyk7Ci0KLQltdXRleF9sb2NrKCZkZXYtPnN0cnVjdF9t dXRleCk7Ci0JaW50ZWxfZmJjX3VwZGF0ZShkZXYpOwotCW11dGV4X3VubG9jaygmZGV2LT5zdHJ1 Y3RfbXV0ZXgpOwogfQogCiBzdGF0aWMgdm9pZCBpbnRlbF9jcnRjX2Rpc2FibGVfbm9hdG9taWMo c3RydWN0IGRybV9jcnRjICpjcnRjKQpAQCAtMTE5MTksNiArMTE4ODAsOSBAQCBzdGF0aWMgaW50 IGludGVsX2NydGNfYXRvbWljX2NoZWNrKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAlpZiAocGlw ZV9jb25maWctPnF1aXJrcyAmIFBJUEVfQ09ORklHX1FVSVJLX0lOSVRJQUxfUExBTkVTKQogCQlp bnRlbF9jcnRjX2NoZWNrX2luaXRpYWxfcGxhbmVzKGNydGMsIGNydGNfc3RhdGUpOwogCisJaWYg KG1vZGVfY2hhbmdlZCkKKwkJaW50ZWxfY3J0Yy0+YXRvbWljLnVwZGF0ZV93bSA9ICFjcnRjX3N0 YXRlLT5hY3RpdmU7CisKIAlpZiAobW9kZV9jaGFuZ2VkICYmIGNydGNfc3RhdGUtPmVuYWJsZSAm JgogCSAgICBkZXZfcHJpdi0+ZGlzcGxheS5jcnRjX2NvbXB1dGVfY2xvY2sgJiYKIAkgICAgIVdB Uk5fT04ocGlwZV9jb25maWctPnNoYXJlZF9kcGxsICE9IERQTExfSURfUFJJVkFURSkpIHsKQEAg LTEzMjA2LDYgKzEzMTcwLDggQEAgc3RhdGljIGludCBfX2ludGVsX3NldF9tb2RlKHN0cnVjdCBk cm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKIAkJaWYgKGNydGNfc3RhdGUtPmFjdGl2ZSkgewogCQkJ aW50ZWxfY3J0Y19kaXNhYmxlX3BsYW5lcyhjcnRjLCBjcnRjX3N0YXRlLT5wbGFuZV9tYXNrKTsK IAkJCWRldl9wcml2LT5kaXNwbGF5LmNydGNfZGlzYWJsZShjcnRjKTsKKwkJCWludGVsX2NydGMt PmFjdGl2ZSA9IGZhbHNlOworCQkJaW50ZWxfZGlzYWJsZV9zaGFyZWRfZHBsbChpbnRlbF9jcnRj KTsKIAkJfQogCX0KIAotLSAKMi4xLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZy ZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGlu Zm8vaW50ZWwtZ2Z4Cg==