From mboxrd@z Thu Jan 1 00:00:00 1970 From: Manasi Navare Subject: [PATCH v3 2/8] drm/i915/display: Move the commit_tail() disable sequence to commit_modeset_disables() hook Date: Mon, 24 Jun 2019 14:08:44 -0700 Message-ID: <20190624210850.17223-3-manasi.d.navare@intel.com> References: <20190624210850.17223-1-manasi.d.navare@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id C352F89D6C for ; Mon, 24 Jun 2019 21:07:09 +0000 (UTC) In-Reply-To: <20190624210850.17223-1-manasi.d.navare@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 Cc: Jani Nikula List-Id: intel-gfx@lists.freedesktop.org Q3JlYXRlIGEgbmV3IGhvb2sgY29tbWl0X21vZGVzZXRfZGlzYWJsZXMoKSBjb25zaXN0ZW50IHdp dGggdGhlIG5hbWluZwppbiBkcm0gYXRvbWljIGhlbHBlcnMgYW5kIHNpbWlsYXIgdG8gdGhlIGNv bW1pdF9tb2Rlc2V0X2VuYWJsZXMoKSBob29rLgpUaGlzIGhlbHBzIGJldHRlciBvcmdhbml6ZSB0 aGUgZGlzYWJsZSBzZXF1ZW5jZSBpbiBhdG9taWNfY29tbWl0X3RhaWwoKQphbmQgbW92ZSB0aGF0 IHRvIHRoaXMgZGlzYWJsZSBob29rLgoKTm8gZnVuY3Rpb25hbCBjaGFuZ2UKClN1Z2dlc3RlZC1i eTogRGFuaWVsIFZldHRlciA8ZGFuaWVsLnZldHRlckBpbnRlbC5jb20+CkNjOiBWaWxsZSBTeXJq w6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tPgpDYzogTWFhcnRlbiBMYW5raG9y c3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4KQ2M6IE1hdHQgUm9wZXIgPG1h dHRoZXcuZC5yb3BlckBpbnRlbC5jb20+CkNjOiBKYW5pIE5pa3VsYSA8amFuaS5uaWt1bGFAaW50 ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBNYW5hc2kgTmF2YXJlIDxtYW5hc2kuZC5uYXZhcmVAaW50 ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZGlzcGxheS5j IHwgMTA1ICsrKysrKysrKysrLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2 LmggICAgICAgICAgICAgIHwgICAxICsKIDIgZmlsZXMgY2hhbmdlZCwgNjQgaW5zZXJ0aW9ucygr KSwgNDIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlz cGxheS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVs X2Rpc3BsYXkuYwppbmRleCA3MWU4NmUyZjBmOTAuLmMzNDExODk5OGFjZSAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9kaXNwbGF5LmMKQEAgLTEzNjEzLDYgKzEzNjEz LDU4IEBAIHN0YXRpYyB2b2lkIGludGVsX3VwZGF0ZV9jcnRjKHN0cnVjdCBkcm1fY3J0YyAqY3J0 YywKIAlpbnRlbF9maW5pc2hfY3J0Y19jb21taXQodG9faW50ZWxfYXRvbWljX3N0YXRlKHN0YXRl KSwgaW50ZWxfY3J0Yyk7CiB9CiAKK3N0YXRpYyB2b2lkIGludGVsX2NvbW1pdF9tb2Rlc2V0X2Rp c2FibGVzKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKK3sKKwlzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2ID0gc3RhdGUtPmRldjsKKwlzdHJ1Y3QgaW50ZWxfYXRvbWljX3N0YXRlICppbnRl bF9zdGF0ZSA9IHRvX2ludGVsX2F0b21pY19zdGF0ZShzdGF0ZSk7CisJc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOworCXN0cnVjdCBkcm1fY3J0Y19zdGF0 ZSAqb2xkX2NydGNfc3RhdGUsICpuZXdfY3J0Y19zdGF0ZTsKKwlzdHJ1Y3QgaW50ZWxfY3J0Y19z dGF0ZSAqbmV3X2ludGVsX2NydGNfc3RhdGUsICpvbGRfaW50ZWxfY3J0Y19zdGF0ZTsKKwlzdHJ1 Y3QgZHJtX2NydGMgKmNydGM7CisJc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGM7CisJaW50 IGk7CisKKwlmb3JfZWFjaF9vbGRuZXdfY3J0Y19pbl9zdGF0ZShzdGF0ZSwgY3J0Yywgb2xkX2Ny dGNfc3RhdGUsIG5ld19jcnRjX3N0YXRlLCBpKSB7CisJCW9sZF9pbnRlbF9jcnRjX3N0YXRlID0g dG9faW50ZWxfY3J0Y19zdGF0ZShvbGRfY3J0Y19zdGF0ZSk7CisJCW5ld19pbnRlbF9jcnRjX3N0 YXRlID0gdG9faW50ZWxfY3J0Y19zdGF0ZShuZXdfY3J0Y19zdGF0ZSk7CisJCWludGVsX2NydGMg PSB0b19pbnRlbF9jcnRjKGNydGMpOworCisJCWlmICghbmVlZHNfbW9kZXNldChuZXdfY3J0Y19z dGF0ZSkpCisJCQljb250aW51ZTsKKworCQlpbnRlbF9wcmVfcGxhbmVfdXBkYXRlKG9sZF9pbnRl bF9jcnRjX3N0YXRlLCBuZXdfaW50ZWxfY3J0Y19zdGF0ZSk7CisKKwkJaWYgKG9sZF9jcnRjX3N0 YXRlLT5hY3RpdmUpIHsKKwkJCWludGVsX2NydGNfZGlzYWJsZV9wbGFuZXMoaW50ZWxfc3RhdGUs IGludGVsX2NydGMpOworCisJCQkvKgorCQkJICogV2UgbmVlZCB0byBkaXNhYmxlIHBpcGUgQ1JD IGJlZm9yZSBkaXNhYmxpbmcgdGhlIHBpcGUsCisJCQkgKiBvciB3ZSByYWNlIGFnYWluc3QgdmJs YW5rIG9mZi4KKwkJCSAqLworCQkJaW50ZWxfY3J0Y19kaXNhYmxlX3BpcGVfY3JjKGludGVsX2Ny dGMpOworCisJCQlkZXZfcHJpdi0+ZGlzcGxheS5jcnRjX2Rpc2FibGUob2xkX2ludGVsX2NydGNf c3RhdGUsIHN0YXRlKTsKKwkJCWludGVsX2NydGMtPmFjdGl2ZSA9IGZhbHNlOworCQkJaW50ZWxf ZmJjX2Rpc2FibGUoaW50ZWxfY3J0Yyk7CisJCQlpbnRlbF9kaXNhYmxlX3NoYXJlZF9kcGxsKG9s ZF9pbnRlbF9jcnRjX3N0YXRlKTsKKworCQkJLyoKKwkJCSAqIFVuZGVycnVucyBkb24ndCBhbHdh eXMgcmFpc2UgaW50ZXJydXB0cywKKwkJCSAqIHNvIGNoZWNrIG1hbnVhbGx5LgorCQkJICovCisJ CQlpbnRlbF9jaGVja19jcHVfZmlmb191bmRlcnJ1bnMoZGV2X3ByaXYpOworCQkJaW50ZWxfY2hl Y2tfcGNoX2ZpZm9fdW5kZXJydW5zKGRldl9wcml2KTsKKworCQkJLyogRklYTUUgdW5pZnkgdGhp cyBmb3IgYWxsIHBsYXRmb3JtcyAqLworCQkJaWYgKCFuZXdfY3J0Y19zdGF0ZS0+YWN0aXZlICYm CisJCQkgICAgIUhBU19HTUNIKGRldl9wcml2KSAmJgorCQkJICAgIGRldl9wcml2LT5kaXNwbGF5 LmluaXRpYWxfd2F0ZXJtYXJrcykKKwkJCQlkZXZfcHJpdi0+ZGlzcGxheS5pbml0aWFsX3dhdGVy bWFya3MoaW50ZWxfc3RhdGUsCisJCQkJCQkJCSAgICAgbmV3X2ludGVsX2NydGNfc3RhdGUpOwor CQl9CisJfQorfQorCiBzdGF0aWMgdm9pZCBpbnRlbF9jb21taXRfbW9kZXNldF9lbmFibGVzKHN0 cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKIHsKIAlzdHJ1Y3QgZHJtX2NydGMgKmNydGM7 CkBAIC0xMzc2OSw3ICsxMzgyMSw3IEBAIHN0YXRpYyB2b2lkIGludGVsX2F0b21pY19jb21taXRf dGFpbChzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUpCiAJc3RydWN0IGludGVsX2F0b21p Y19zdGF0ZSAqaW50ZWxfc3RhdGUgPSB0b19pbnRlbF9hdG9taWNfc3RhdGUoc3RhdGUpOwogCXN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKIAlzdHJ1Y3Qg ZHJtX2NydGNfc3RhdGUgKm9sZF9jcnRjX3N0YXRlLCAqbmV3X2NydGNfc3RhdGU7Ci0Jc3RydWN0 IGludGVsX2NydGNfc3RhdGUgKm5ld19pbnRlbF9jcnRjX3N0YXRlLCAqb2xkX2ludGVsX2NydGNf c3RhdGU7CisJc3RydWN0IGludGVsX2NydGNfc3RhdGUgKm5ld19pbnRlbF9jcnRjX3N0YXRlOwog CXN0cnVjdCBkcm1fY3J0YyAqY3J0YzsKIAlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YzsK IAl1NjQgcHV0X2RvbWFpbnNbSTkxNV9NQVhfUElQRVNdID0ge307CkBAIC0xMzc3OCw1OCArMTM4 MzAsMjQgQEAgc3RhdGljIHZvaWQgaW50ZWxfYXRvbWljX2NvbW1pdF90YWlsKHN0cnVjdCBkcm1f YXRvbWljX3N0YXRlICpzdGF0ZSkKIAogCWludGVsX2F0b21pY19jb21taXRfZmVuY2Vfd2FpdChp bnRlbF9zdGF0ZSk7CiAKLQlkcm1fYXRvbWljX2hlbHBlcl93YWl0X2Zvcl9kZXBlbmRlbmNpZXMo c3RhdGUpOwotCi0JaWYgKGludGVsX3N0YXRlLT5tb2Rlc2V0KQotCQl3YWtlcmVmID0gaW50ZWxf ZGlzcGxheV9wb3dlcl9nZXQoZGV2X3ByaXYsIFBPV0VSX0RPTUFJTl9NT0RFU0VUKTsKLQogCWZv cl9lYWNoX29sZG5ld19jcnRjX2luX3N0YXRlKHN0YXRlLCBjcnRjLCBvbGRfY3J0Y19zdGF0ZSwg bmV3X2NydGNfc3RhdGUsIGkpIHsKLQkJb2xkX2ludGVsX2NydGNfc3RhdGUgPSB0b19pbnRlbF9j cnRjX3N0YXRlKG9sZF9jcnRjX3N0YXRlKTsKIAkJbmV3X2ludGVsX2NydGNfc3RhdGUgPSB0b19p bnRlbF9jcnRjX3N0YXRlKG5ld19jcnRjX3N0YXRlKTsKIAkJaW50ZWxfY3J0YyA9IHRvX2ludGVs X2NydGMoY3J0Yyk7CiAKIAkJaWYgKG5lZWRzX21vZGVzZXQobmV3X2NydGNfc3RhdGUpIHx8Ci0J CSAgICB0b19pbnRlbF9jcnRjX3N0YXRlKG5ld19jcnRjX3N0YXRlKS0+dXBkYXRlX3BpcGUpIHsK LQorCQkgICAgbmV3X2ludGVsX2NydGNfc3RhdGUtPnVwZGF0ZV9waXBlKSB7CiAJCQlwdXRfZG9t YWluc1tpbnRlbF9jcnRjLT5waXBlXSA9CiAJCQkJbW9kZXNldF9nZXRfY3J0Y19wb3dlcl9kb21h aW5zKGNydGMsCi0JCQkJCW5ld19pbnRlbF9jcnRjX3N0YXRlKTsKKwkJCQkJCQkgICAgICAgbmV3 X2ludGVsX2NydGNfc3RhdGUpOwogCQl9CisJfQogCi0JCWlmICghbmVlZHNfbW9kZXNldChuZXdf Y3J0Y19zdGF0ZSkpCi0JCQljb250aW51ZTsKLQotCQlpbnRlbF9wcmVfcGxhbmVfdXBkYXRlKG9s ZF9pbnRlbF9jcnRjX3N0YXRlLCBuZXdfaW50ZWxfY3J0Y19zdGF0ZSk7Ci0KLQkJaWYgKG9sZF9j cnRjX3N0YXRlLT5hY3RpdmUpIHsKLQkJCWludGVsX2NydGNfZGlzYWJsZV9wbGFuZXMoaW50ZWxf c3RhdGUsIGludGVsX2NydGMpOwotCi0JCQkvKgotCQkJICogV2UgbmVlZCB0byBkaXNhYmxlIHBp cGUgQ1JDIGJlZm9yZSBkaXNhYmxpbmcgdGhlIHBpcGUsCi0JCQkgKiBvciB3ZSByYWNlIGFnYWlu c3QgdmJsYW5rIG9mZi4KLQkJCSAqLwotCQkJaW50ZWxfY3J0Y19kaXNhYmxlX3BpcGVfY3JjKGlu dGVsX2NydGMpOwotCi0JCQlkZXZfcHJpdi0+ZGlzcGxheS5jcnRjX2Rpc2FibGUob2xkX2ludGVs X2NydGNfc3RhdGUsIHN0YXRlKTsKLQkJCWludGVsX2NydGMtPmFjdGl2ZSA9IGZhbHNlOwotCQkJ aW50ZWxfZmJjX2Rpc2FibGUoaW50ZWxfY3J0Yyk7Ci0JCQlpbnRlbF9kaXNhYmxlX3NoYXJlZF9k cGxsKG9sZF9pbnRlbF9jcnRjX3N0YXRlKTsKKwlkcm1fYXRvbWljX2hlbHBlcl93YWl0X2Zvcl9k ZXBlbmRlbmNpZXMoc3RhdGUpOwogCi0JCQkvKgotCQkJICogVW5kZXJydW5zIGRvbid0IGFsd2F5 cyByYWlzZQotCQkJICogaW50ZXJydXB0cywgc28gY2hlY2sgbWFudWFsbHkuCi0JCQkgKi8KLQkJ CWludGVsX2NoZWNrX2NwdV9maWZvX3VuZGVycnVucyhkZXZfcHJpdik7Ci0JCQlpbnRlbF9jaGVj a19wY2hfZmlmb191bmRlcnJ1bnMoZGV2X3ByaXYpOworCWlmIChpbnRlbF9zdGF0ZS0+bW9kZXNl dCkKKwkJd2FrZXJlZiA9IGludGVsX2Rpc3BsYXlfcG93ZXJfZ2V0KGRldl9wcml2LCBQT1dFUl9E T01BSU5fTU9ERVNFVCk7CiAKLQkJCS8qIEZJWE1FIHVuaWZ5IHRoaXMgZm9yIGFsbCBwbGF0Zm9y bXMgKi8KLQkJCWlmICghbmV3X2NydGNfc3RhdGUtPmFjdGl2ZSAmJgotCQkJICAgICFIQVNfR01D SChkZXZfcHJpdikgJiYKLQkJCSAgICBkZXZfcHJpdi0+ZGlzcGxheS5pbml0aWFsX3dhdGVybWFy a3MpCi0JCQkJZGV2X3ByaXYtPmRpc3BsYXkuaW5pdGlhbF93YXRlcm1hcmtzKGludGVsX3N0YXRl LAotCQkJCQkJCQkgICAgIG5ld19pbnRlbF9jcnRjX3N0YXRlKTsKLQkJfQotCX0KKwlkZXZfcHJp di0+ZGlzcGxheS5jb21taXRfbW9kZXNldF9kaXNhYmxlcyhzdGF0ZSk7CiAKIAkvKiBGSVhNRTog RXZlbnR1YWxseSBnZXQgcmlkIG9mIG91ciBpbnRlbF9jcnRjLT5jb25maWcgcG9pbnRlciAqLwog CWZvcl9lYWNoX25ld19jcnRjX2luX3N0YXRlKHN0YXRlLCBjcnRjLCBuZXdfY3J0Y19zdGF0ZSwg aSkKQEAgLTE1NzIyLDYgKzE1NzQwLDkgQEAgdm9pZCBpbnRlbF9pbml0X2Rpc3BsYXlfaG9va3Mo c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCQlkZXZfcHJpdi0+ZGlzcGxheS5j b21taXRfbW9kZXNldF9lbmFibGVzID0gc2tsX2NvbW1pdF9tb2Rlc2V0X2VuYWJsZXM7CiAJZWxz ZQogCQlkZXZfcHJpdi0+ZGlzcGxheS5jb21taXRfbW9kZXNldF9lbmFibGVzID0gaW50ZWxfY29t bWl0X21vZGVzZXRfZW5hYmxlczsKKworCWRldl9wcml2LT5kaXNwbGF5LmNvbW1pdF9tb2Rlc2V0 X2Rpc2FibGVzID0gaW50ZWxfY29tbWl0X21vZGVzZXRfZGlzYWJsZXM7CisKIH0KIAogc3RhdGlj IGk5MTVfcmVnX3QgaTkxNV92Z2FjbnRybF9yZWcoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2KQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggMDc1ZDdlYjNjM2YyLi5lZGI2YjQz MWY5MGMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtMzExLDYgKzMxMSw3IEBAIHN0cnVj dCBkcm1faTkxNV9kaXNwbGF5X2Z1bmNzIHsKIAl2b2lkICgqY3J0Y19kaXNhYmxlKShzdHJ1Y3Qg aW50ZWxfY3J0Y19zdGF0ZSAqb2xkX2NydGNfc3RhdGUsCiAJCQkgICAgIHN0cnVjdCBkcm1fYXRv bWljX3N0YXRlICpvbGRfc3RhdGUpOwogCXZvaWQgKCpjb21taXRfbW9kZXNldF9lbmFibGVzKShz dHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUpOworCXZvaWQgKCpjb21taXRfbW9kZXNldF9k aXNhYmxlcykoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlKTsKIAl2b2lkICgqYXVkaW9f Y29kZWNfZW5hYmxlKShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwKIAkJCQkgICBjb25z dCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKIAkJCQkgICBjb25zdCBzdHJ1 Y3QgZHJtX2Nvbm5lY3Rvcl9zdGF0ZSAqY29ubl9zdGF0ZSk7Ci0tIAoyLjE5LjEKCl9fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5n IGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVk ZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeA==