From mboxrd@z Thu Jan 1 00:00:00 1970 From: Manasi Navare Subject: [PATCH 2/2] drm/i915/display: Move the commit_tail() disable sequence to commit_modeset_disables() hook Date: Tue, 27 Aug 2019 15:17:35 -0700 Message-ID: <20190827221735.29351-3-manasi.d.navare@intel.com> References: <20190827221735.29351-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 mga12.intel.com (mga12.intel.com [192.55.52.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id B781789B11 for ; Tue, 27 Aug 2019 22:15:59 +0000 (UTC) In-Reply-To: <20190827221735.29351-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 IHRvIHRoaXMgZGlzYWJsZSBob29rLgoKTm8gZnVuY3Rpb25hbCBjaGFuZ2UKCnYzOgoqIFJlYmFz ZSAoTWFuYXNpKQp2MjoKKiBDcmVhdGUgYSBoZWxwZXIgZm9yIG9sZF9jcnRjX3N0YXRlIGRpc2Fi bGVzIChMdWNhcykKClN1Z2dlc3RlZC1ieTogRGFuaWVsIFZldHRlciA8ZGFuaWVsLnZldHRlckBp bnRlbC5jb20+CkNjOiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwu Y29tPgpDYzogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVs LmNvbT4KQ2M6IE1hdHQgUm9wZXIgPG1hdHRoZXcuZC5yb3BlckBpbnRlbC5jb20+CkNjOiBKYW5p IE5pa3VsYSA8amFuaS5uaWt1bGFAaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBNYW5hc2kgTmF2 YXJlIDxtYW5hc2kuZC5uYXZhcmVAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2Rpc3BsYXkvaW50ZWxfZGlzcGxheS5jIHwgOTQgKysrKysrKysrKysrKy0tLS0tLS0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggICAgICAgICAgICAgIHwgIDEgKwogMiBmaWxlcyBj aGFuZ2VkLCA2MSBpbnNlcnRpb25zKCspLCAzNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZGlzcGxheS5jCmluZGV4IDIzYzhjN2Y1YzQ3YS4uN2Yw YWIwMTAxNTY5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVs X2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2Rpc3Bs YXkuYwpAQCAtMTM3NTgsNiArMTM3NTgsNjEgQEAgc3RhdGljIHZvaWQgaW50ZWxfdXBkYXRlX2Ny dGMoc3RydWN0IGludGVsX2NydGMgKmNydGMsCiAJaW50ZWxfZmluaXNoX2NydGNfY29tbWl0KHN0 YXRlLCBjcnRjKTsKIH0KIAorc3RhdGljIHZvaWQgaW50ZWxfb2xkX2NydGNfc3RhdGVfZGlzYWJs ZXMoc3RydWN0IGludGVsX2F0b21pY19zdGF0ZSAqc3RhdGUsCisJCQkJCSAgc3RydWN0IGludGVs X2NydGNfc3RhdGUgKm9sZF9jcnRjX3N0YXRlLAorCQkJCQkgIHN0cnVjdCBpbnRlbF9jcnRjX3N0 YXRlICpuZXdfY3J0Y19zdGF0ZSwKKwkJCQkJICBzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKK3sK KwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KHN0YXRlLT5iYXNl LmRldik7CisKKwlpbnRlbF9jcnRjX2Rpc2FibGVfcGxhbmVzKHN0YXRlLCBjcnRjKTsKKworCS8q CisJICogV2UgbmVlZCB0byBkaXNhYmxlIHBpcGUgQ1JDIGJlZm9yZSBkaXNhYmxpbmcgdGhlIHBp cGUsCisJICogb3Igd2UgcmFjZSBhZ2FpbnN0IHZibGFuayBvZmYuCisJICovCisJaW50ZWxfY3J0 Y19kaXNhYmxlX3BpcGVfY3JjKGNydGMpOworCisJZGV2X3ByaXYtPmRpc3BsYXkuY3J0Y19kaXNh YmxlKG9sZF9jcnRjX3N0YXRlLCBzdGF0ZSk7CisJY3J0Yy0+YWN0aXZlID0gZmFsc2U7CisJaW50 ZWxfZmJjX2Rpc2FibGUoY3J0Yyk7CisJaW50ZWxfZGlzYWJsZV9zaGFyZWRfZHBsbChvbGRfY3J0 Y19zdGF0ZSk7CisKKwkvKgorCSAqIFVuZGVycnVucyBkb24ndCBhbHdheXMgcmFpc2UgaW50ZXJy dXB0cywKKwkgKiBzbyBjaGVjayBtYW51YWxseS4KKwkgKi8KKwlpbnRlbF9jaGVja19jcHVfZmlm b191bmRlcnJ1bnMoZGV2X3ByaXYpOworCWludGVsX2NoZWNrX3BjaF9maWZvX3VuZGVycnVucyhk ZXZfcHJpdik7CisKKwkvKiBGSVhNRSB1bmlmeSB0aGlzIGZvciBhbGwgcGxhdGZvcm1zICovCisJ aWYgKCFuZXdfY3J0Y19zdGF0ZS0+YmFzZS5hY3RpdmUgJiYKKwkgICAgIUhBU19HTUNIKGRldl9w cml2KSAmJgorCSAgICBkZXZfcHJpdi0+ZGlzcGxheS5pbml0aWFsX3dhdGVybWFya3MpCisJCWRl dl9wcml2LT5kaXNwbGF5LmluaXRpYWxfd2F0ZXJtYXJrcyhzdGF0ZSwKKwkJCQkJCSAgICAgbmV3 X2NydGNfc3RhdGUpOworfQorCitzdGF0aWMgdm9pZCBpbnRlbF9jb21taXRfbW9kZXNldF9kaXNh YmxlcyhzdHJ1Y3QgaW50ZWxfYXRvbWljX3N0YXRlICpzdGF0ZSkKK3sKKwlzdHJ1Y3QgaW50ZWxf Y3J0Y19zdGF0ZSAqbmV3X2NydGNfc3RhdGUsICpvbGRfY3J0Y19zdGF0ZTsKKwlzdHJ1Y3QgaW50 ZWxfY3J0YyAqY3J0YzsKKwlpbnQgaTsKKworCWZvcl9lYWNoX29sZG5ld19pbnRlbF9jcnRjX2lu X3N0YXRlKHN0YXRlLCBjcnRjLCBvbGRfY3J0Y19zdGF0ZSwgbmV3X2NydGNfc3RhdGUsIGkpIHsK KwkJaWYgKCFuZWVkc19tb2Rlc2V0KG5ld19jcnRjX3N0YXRlKSkKKwkJCWNvbnRpbnVlOworCisJ CWludGVsX3ByZV9wbGFuZV91cGRhdGUob2xkX2NydGNfc3RhdGUsIG5ld19jcnRjX3N0YXRlKTsK KworCQlpZiAob2xkX2NydGNfc3RhdGUtPmJhc2UuYWN0aXZlKQorCQkJaW50ZWxfb2xkX2NydGNf c3RhdGVfZGlzYWJsZXMoc3RhdGUsCisJCQkJCQkgICAgICBvbGRfY3J0Y19zdGF0ZSwKKwkJCQkJ CSAgICAgIG5ld19jcnRjX3N0YXRlLAorCQkJCQkJICAgICAgY3J0Yyk7CisJfQorfQorCiBzdGF0 aWMgdm9pZCBpbnRlbF9jb21taXRfbW9kZXNldF9lbmFibGVzKHN0cnVjdCBpbnRlbF9hdG9taWNf c3RhdGUgKnN0YXRlKQogewogCXN0cnVjdCBpbnRlbF9jcnRjICpjcnRjOwpAQCAtMTM5MzgsNDIg KzEzOTkzLDEwIEBAIHN0YXRpYyB2b2lkIGludGVsX2F0b21pY19jb21taXRfdGFpbChzdHJ1Y3Qg aW50ZWxfYXRvbWljX3N0YXRlICpzdGF0ZSkKIAkJCXB1dF9kb21haW5zW2NydGMtPnBpcGVdID0K IAkJCQltb2Rlc2V0X2dldF9jcnRjX3Bvd2VyX2RvbWFpbnMobmV3X2NydGNfc3RhdGUpOwogCQl9 Ci0KLQkJaWYgKCFuZWVkc19tb2Rlc2V0KG5ld19jcnRjX3N0YXRlKSkKLQkJCWNvbnRpbnVlOwot Ci0JCWludGVsX3ByZV9wbGFuZV91cGRhdGUob2xkX2NydGNfc3RhdGUsIG5ld19jcnRjX3N0YXRl KTsKLQotCQlpZiAob2xkX2NydGNfc3RhdGUtPmJhc2UuYWN0aXZlKSB7Ci0JCQlpbnRlbF9jcnRj X2Rpc2FibGVfcGxhbmVzKHN0YXRlLCBjcnRjKTsKLQotCQkJLyoKLQkJCSAqIFdlIG5lZWQgdG8g ZGlzYWJsZSBwaXBlIENSQyBiZWZvcmUgZGlzYWJsaW5nIHRoZSBwaXBlLAotCQkJICogb3Igd2Ug cmFjZSBhZ2FpbnN0IHZibGFuayBvZmYuCi0JCQkgKi8KLQkJCWludGVsX2NydGNfZGlzYWJsZV9w aXBlX2NyYyhjcnRjKTsKLQotCQkJZGV2X3ByaXYtPmRpc3BsYXkuY3J0Y19kaXNhYmxlKG9sZF9j cnRjX3N0YXRlLCBzdGF0ZSk7Ci0JCQljcnRjLT5hY3RpdmUgPSBmYWxzZTsKLQkJCWludGVsX2Zi Y19kaXNhYmxlKGNydGMpOwotCQkJaW50ZWxfZGlzYWJsZV9zaGFyZWRfZHBsbChvbGRfY3J0Y19z dGF0ZSk7Ci0KLQkJCS8qCi0JCQkgKiBVbmRlcnJ1bnMgZG9uJ3QgYWx3YXlzIHJhaXNlCi0JCQkg KiBpbnRlcnJ1cHRzLCBzbyBjaGVjayBtYW51YWxseS4KLQkJCSAqLwotCQkJaW50ZWxfY2hlY2tf Y3B1X2ZpZm9fdW5kZXJydW5zKGRldl9wcml2KTsKLQkJCWludGVsX2NoZWNrX3BjaF9maWZvX3Vu ZGVycnVucyhkZXZfcHJpdik7Ci0KLQkJCS8qIEZJWE1FIHVuaWZ5IHRoaXMgZm9yIGFsbCBwbGF0 Zm9ybXMgKi8KLQkJCWlmICghbmV3X2NydGNfc3RhdGUtPmJhc2UuYWN0aXZlICYmCi0JCQkgICAg IUhBU19HTUNIKGRldl9wcml2KSAmJgotCQkJICAgIGRldl9wcml2LT5kaXNwbGF5LmluaXRpYWxf d2F0ZXJtYXJrcykKLQkJCQlkZXZfcHJpdi0+ZGlzcGxheS5pbml0aWFsX3dhdGVybWFya3Moc3Rh dGUsCi0JCQkJCQkJCSAgICAgbmV3X2NydGNfc3RhdGUpOwotCQl9CiAJfQogCisJZGV2X3ByaXYt PmRpc3BsYXkuY29tbWl0X21vZGVzZXRfZGlzYWJsZXMoc3RhdGUpOworCiAJLyogRklYTUU6IEV2 ZW50dWFsbHkgZ2V0IHJpZCBvZiBvdXIgY3J0Yy0+Y29uZmlnIHBvaW50ZXIgKi8KIAlmb3JfZWFj aF9uZXdfaW50ZWxfY3J0Y19pbl9zdGF0ZShzdGF0ZSwgY3J0YywgbmV3X2NydGNfc3RhdGUsIGkp CiAJCWNydGMtPmNvbmZpZyA9IG5ld19jcnRjX3N0YXRlOwpAQCAtMTU5MjksNiArMTU5NTIsOSBA QCB2b2lkIGludGVsX2luaXRfZGlzcGxheV9ob29rcyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYpCiAJCWRldl9wcml2LT5kaXNwbGF5LmNvbW1pdF9tb2Rlc2V0X2VuYWJsZXMgPSBz a2xfY29tbWl0X21vZGVzZXRfZW5hYmxlczsKIAllbHNlCiAJCWRldl9wcml2LT5kaXNwbGF5LmNv bW1pdF9tb2Rlc2V0X2VuYWJsZXMgPSBpbnRlbF9jb21taXRfbW9kZXNldF9lbmFibGVzOworCisJ ZGV2X3ByaXYtPmRpc3BsYXkuY29tbWl0X21vZGVzZXRfZGlzYWJsZXMgPSBpbnRlbF9jb21taXRf bW9kZXNldF9kaXNhYmxlczsKKwogfQogCiBzdGF0aWMgaTkxNV9yZWdfdCBpOTE1X3ZnYWNudHJs X3JlZyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k cnYuaAppbmRleCA3NWE0MmU4ZGY2N2UuLmRiNzQ4MDgzMWU1MiAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2Rydi5oCkBAIC0yODksNiArMjg5LDcgQEAgc3RydWN0IGRybV9pOTE1X2Rpc3BsYXlfZnVuY3Mg ewogCXZvaWQgKCpjcnRjX2Rpc2FibGUpKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpvbGRfY3J0 Y19zdGF0ZSwKIAkJCSAgICAgc3RydWN0IGludGVsX2F0b21pY19zdGF0ZSAqb2xkX3N0YXRlKTsK IAl2b2lkICgqY29tbWl0X21vZGVzZXRfZW5hYmxlcykoc3RydWN0IGludGVsX2F0b21pY19zdGF0 ZSAqc3RhdGUpOworCXZvaWQgKCpjb21taXRfbW9kZXNldF9kaXNhYmxlcykoc3RydWN0IGludGVs X2F0b21pY19zdGF0ZSAqc3RhdGUpOwogCXZvaWQgKCphdWRpb19jb2RlY19lbmFibGUpKHN0cnVj dCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAogCQkJCSAgIGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRj X3N0YXRlICpjcnRjX3N0YXRlLAogCQkJCSAgIGNvbnN0IHN0cnVjdCBkcm1fY29ubmVjdG9yX3N0 YXRlICpjb25uX3N0YXRlKTsKLS0gCjIuMTkuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlz dHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4v bGlzdGluZm8vaW50ZWwtZ2Z4