From: Manasi Navare Subject: [PATCH v4 2/8] drm/i915/display: Move the commit_tail() disable sequence to commit_modeset_disables() hook Date: Thu, 27 Jun 2019 15:57:36 -0700 Message-ID: <20190627225736.2665-2-manasi.d.navare@intel.com> References: <20190624210850.17223-3-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 6577D6E855 for ; Thu, 27 Jun 2019 22:55:46 +0000 (UTC) In-Reply-To: <20190624210850.17223-3-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 IHRvIHRoaXMgZGlzYWJsZSBob29rLgoKTm8gZnVuY3Rpb25hbCBjaGFuZ2UKCnYyOgoqIENyZWF0 ZSBhIGhlbHBlciBmb3Igb2xkX2NydGNfc3RhdGUgZGlzYWJsZXMgKEx1Y2FzKQoKU3VnZ2VzdGVk LWJ5OiBEYW5pZWwgVmV0dGVyIDxkYW5pZWwudmV0dGVyQGludGVsLmNvbT4KQ2M6IFZpbGxlIFN5 cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+CkNjOiBNYWFydGVuIExhbmto b3JzdCA8bWFhcnRlbi5sYW5raG9yc3RAbGludXguaW50ZWwuY29tPgpDYzogTWF0dCBSb3BlciA8 bWF0dGhldy5kLnJvcGVyQGludGVsLmNvbT4KQ2M6IEphbmkgTmlrdWxhIDxqYW5pLm5pa3VsYUBp bnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IE1hbmFzaSBOYXZhcmUgPG1hbmFzaS5kLm5hdmFyZUBp bnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9kaXNwbGF5 LmMgfCAxMTYgKysrKysrKysrKysrLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k cnYuaCAgICAgICAgICAgICAgfCAgIDEgKwogMiBmaWxlcyBjaGFuZ2VkLCA3NSBpbnNlcnRpb25z KCspLCA0MiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9k aXNwbGF5L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50 ZWxfZGlzcGxheS5jCmluZGV4IDcxZTg2ZTJmMGY5MC4uNGIwODhmYTI0YWFkIDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2Rpc3BsYXkuYwpAQCAtMTM2MTMsNiArMTM2 MTMsNjkgQEAgc3RhdGljIHZvaWQgaW50ZWxfdXBkYXRlX2NydGMoc3RydWN0IGRybV9jcnRjICpj cnRjLAogCWludGVsX2ZpbmlzaF9jcnRjX2NvbW1pdCh0b19pbnRlbF9hdG9taWNfc3RhdGUoc3Rh dGUpLCBpbnRlbF9jcnRjKTsKIH0KIAorc3RhdGljIHZvaWQgaW50ZWxfb2xkX2NydGNfc3RhdGVf ZGlzYWJsZXMoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlLAorCQkJCQkgIHN0cnVjdCBp bnRlbF9jcnRjX3N0YXRlICpvbGRfaW50ZWxfY3J0Y19zdGF0ZSwKKwkJCQkJICBzdHJ1Y3QgaW50 ZWxfY3J0Y19zdGF0ZSAqbmV3X2ludGVsX2NydGNfc3RhdGUsCisJCQkJCSAgc3RydWN0IGludGVs X2NydGMgKmludGVsX2NydGMpCit7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 ID0gdG9faTkxNShzdGF0ZS0+ZGV2KTsKKwlzdHJ1Y3QgaW50ZWxfYXRvbWljX3N0YXRlICppbnRl bF9zdGF0ZSA9IHRvX2ludGVsX2F0b21pY19zdGF0ZShzdGF0ZSk7CisJc3RydWN0IGRybV9jcnRj X3N0YXRlICpuZXdfY3J0Y19zdGF0ZSA9ICZuZXdfaW50ZWxfY3J0Y19zdGF0ZS0+YmFzZTsKKwor CWludGVsX2NydGNfZGlzYWJsZV9wbGFuZXMoaW50ZWxfc3RhdGUsIGludGVsX2NydGMpOworCisJ LyoKKwkgKiBXZSBuZWVkIHRvIGRpc2FibGUgcGlwZSBDUkMgYmVmb3JlIGRpc2FibGluZyB0aGUg cGlwZSwKKwkgKiBvciB3ZSByYWNlIGFnYWluc3QgdmJsYW5rIG9mZi4KKwkgKi8KKwlpbnRlbF9j cnRjX2Rpc2FibGVfcGlwZV9jcmMoaW50ZWxfY3J0Yyk7CisKKwlkZXZfcHJpdi0+ZGlzcGxheS5j cnRjX2Rpc2FibGUob2xkX2ludGVsX2NydGNfc3RhdGUsIHN0YXRlKTsKKwlpbnRlbF9jcnRjLT5h Y3RpdmUgPSBmYWxzZTsKKwlpbnRlbF9mYmNfZGlzYWJsZShpbnRlbF9jcnRjKTsKKwlpbnRlbF9k aXNhYmxlX3NoYXJlZF9kcGxsKG9sZF9pbnRlbF9jcnRjX3N0YXRlKTsKKworCS8qCisJICogVW5k ZXJydW5zIGRvbid0IGFsd2F5cyByYWlzZSBpbnRlcnJ1cHRzLAorCSAqIHNvIGNoZWNrIG1hbnVh bGx5LgorCSAqLworCWludGVsX2NoZWNrX2NwdV9maWZvX3VuZGVycnVucyhkZXZfcHJpdik7CisJ aW50ZWxfY2hlY2tfcGNoX2ZpZm9fdW5kZXJydW5zKGRldl9wcml2KTsKKworCS8qIEZJWE1FIHVu aWZ5IHRoaXMgZm9yIGFsbCBwbGF0Zm9ybXMgKi8KKwlpZiAoIW5ld19jcnRjX3N0YXRlLT5hY3Rp dmUgJiYKKwkgICAgIUhBU19HTUNIKGRldl9wcml2KSAmJgorCSAgICBkZXZfcHJpdi0+ZGlzcGxh eS5pbml0aWFsX3dhdGVybWFya3MpCisJCWRldl9wcml2LT5kaXNwbGF5LmluaXRpYWxfd2F0ZXJt YXJrcyhpbnRlbF9zdGF0ZSwKKwkJCQkJCSAgICAgbmV3X2ludGVsX2NydGNfc3RhdGUpOworfQor CitzdGF0aWMgdm9pZCBpbnRlbF9jb21taXRfbW9kZXNldF9kaXNhYmxlcyhzdHJ1Y3QgZHJtX2F0 b21pY19zdGF0ZSAqc3RhdGUpCit7CisJc3RydWN0IGRybV9jcnRjX3N0YXRlICpvbGRfY3J0Y19z dGF0ZSwgKm5ld19jcnRjX3N0YXRlOworCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpuZXdfaW50 ZWxfY3J0Y19zdGF0ZSwgKm9sZF9pbnRlbF9jcnRjX3N0YXRlOworCXN0cnVjdCBkcm1fY3J0YyAq Y3J0YzsKKwlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YzsKKwlpbnQgaTsKKworCWZvcl9l YWNoX29sZG5ld19jcnRjX2luX3N0YXRlKHN0YXRlLCBjcnRjLCBvbGRfY3J0Y19zdGF0ZSwgbmV3 X2NydGNfc3RhdGUsIGkpIHsKKwkJb2xkX2ludGVsX2NydGNfc3RhdGUgPSB0b19pbnRlbF9jcnRj X3N0YXRlKG9sZF9jcnRjX3N0YXRlKTsKKwkJbmV3X2ludGVsX2NydGNfc3RhdGUgPSB0b19pbnRl bF9jcnRjX3N0YXRlKG5ld19jcnRjX3N0YXRlKTsKKwkJaW50ZWxfY3J0YyA9IHRvX2ludGVsX2Ny dGMoY3J0Yyk7CisKKwkJaWYgKCFuZWVkc19tb2Rlc2V0KG5ld19jcnRjX3N0YXRlKSkKKwkJCWNv bnRpbnVlOworCisJCWludGVsX3ByZV9wbGFuZV91cGRhdGUob2xkX2ludGVsX2NydGNfc3RhdGUs IG5ld19pbnRlbF9jcnRjX3N0YXRlKTsKKworCQlpZiAob2xkX2NydGNfc3RhdGUtPmFjdGl2ZSkK KwkJCWludGVsX29sZF9jcnRjX3N0YXRlX2Rpc2FibGVzKHN0YXRlLAorCQkJCQkJICAgICAgb2xk X2ludGVsX2NydGNfc3RhdGUsCisJCQkJCQkgICAgICBuZXdfaW50ZWxfY3J0Y19zdGF0ZSwKKwkJ CQkJCSAgICAgIGludGVsX2NydGMpOworCX0KK30KKwogc3RhdGljIHZvaWQgaW50ZWxfY29tbWl0 X21vZGVzZXRfZW5hYmxlcyhzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUpCiB7CiAJc3Ry dWN0IGRybV9jcnRjICpjcnRjOwpAQCAtMTM3NjksNyArMTM4MzIsNyBAQCBzdGF0aWMgdm9pZCBp bnRlbF9hdG9taWNfY29tbWl0X3RhaWwoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlKQog CXN0cnVjdCBpbnRlbF9hdG9taWNfc3RhdGUgKmludGVsX3N0YXRlID0gdG9faW50ZWxfYXRvbWlj X3N0YXRlKHN0YXRlKTsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19p OTE1KGRldik7CiAJc3RydWN0IGRybV9jcnRjX3N0YXRlICpvbGRfY3J0Y19zdGF0ZSwgKm5ld19j cnRjX3N0YXRlOwotCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpuZXdfaW50ZWxfY3J0Y19zdGF0 ZSwgKm9sZF9pbnRlbF9jcnRjX3N0YXRlOworCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpuZXdf aW50ZWxfY3J0Y19zdGF0ZTsKIAlzdHJ1Y3QgZHJtX2NydGMgKmNydGM7CiAJc3RydWN0IGludGVs X2NydGMgKmludGVsX2NydGM7CiAJdTY0IHB1dF9kb21haW5zW0k5MTVfTUFYX1BJUEVTXSA9IHt9 OwpAQCAtMTM3NzgsNTggKzEzODQxLDI0IEBAIHN0YXRpYyB2b2lkIGludGVsX2F0b21pY19jb21t aXRfdGFpbChzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUpCiAKIAlpbnRlbF9hdG9taWNf Y29tbWl0X2ZlbmNlX3dhaXQoaW50ZWxfc3RhdGUpOwogCi0JZHJtX2F0b21pY19oZWxwZXJfd2Fp dF9mb3JfZGVwZW5kZW5jaWVzKHN0YXRlKTsKLQotCWlmIChpbnRlbF9zdGF0ZS0+bW9kZXNldCkK LQkJd2FrZXJlZiA9IGludGVsX2Rpc3BsYXlfcG93ZXJfZ2V0KGRldl9wcml2LCBQT1dFUl9ET01B SU5fTU9ERVNFVCk7Ci0KIAlmb3JfZWFjaF9vbGRuZXdfY3J0Y19pbl9zdGF0ZShzdGF0ZSwgY3J0 Yywgb2xkX2NydGNfc3RhdGUsIG5ld19jcnRjX3N0YXRlLCBpKSB7Ci0JCW9sZF9pbnRlbF9jcnRj X3N0YXRlID0gdG9faW50ZWxfY3J0Y19zdGF0ZShvbGRfY3J0Y19zdGF0ZSk7CiAJCW5ld19pbnRl bF9jcnRjX3N0YXRlID0gdG9faW50ZWxfY3J0Y19zdGF0ZShuZXdfY3J0Y19zdGF0ZSk7CiAJCWlu dGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGNydGMpOwogCiAJCWlmIChuZWVkc19tb2Rlc2V0KG5l d19jcnRjX3N0YXRlKSB8fAotCQkgICAgdG9faW50ZWxfY3J0Y19zdGF0ZShuZXdfY3J0Y19zdGF0 ZSktPnVwZGF0ZV9waXBlKSB7Ci0KKwkJICAgIG5ld19pbnRlbF9jcnRjX3N0YXRlLT51cGRhdGVf cGlwZSkgewogCQkJcHV0X2RvbWFpbnNbaW50ZWxfY3J0Yy0+cGlwZV0gPQogCQkJCW1vZGVzZXRf Z2V0X2NydGNfcG93ZXJfZG9tYWlucyhjcnRjLAotCQkJCQluZXdfaW50ZWxfY3J0Y19zdGF0ZSk7 CisJCQkJCQkJICAgICAgIG5ld19pbnRlbF9jcnRjX3N0YXRlKTsKIAkJfQorCX0KIAotCQlpZiAo IW5lZWRzX21vZGVzZXQobmV3X2NydGNfc3RhdGUpKQotCQkJY29udGludWU7Ci0KLQkJaW50ZWxf cHJlX3BsYW5lX3VwZGF0ZShvbGRfaW50ZWxfY3J0Y19zdGF0ZSwgbmV3X2ludGVsX2NydGNfc3Rh dGUpOwotCi0JCWlmIChvbGRfY3J0Y19zdGF0ZS0+YWN0aXZlKSB7Ci0JCQlpbnRlbF9jcnRjX2Rp c2FibGVfcGxhbmVzKGludGVsX3N0YXRlLCBpbnRlbF9jcnRjKTsKLQotCQkJLyoKLQkJCSAqIFdl IG5lZWQgdG8gZGlzYWJsZSBwaXBlIENSQyBiZWZvcmUgZGlzYWJsaW5nIHRoZSBwaXBlLAotCQkJ ICogb3Igd2UgcmFjZSBhZ2FpbnN0IHZibGFuayBvZmYuCi0JCQkgKi8KLQkJCWludGVsX2NydGNf ZGlzYWJsZV9waXBlX2NyYyhpbnRlbF9jcnRjKTsKKwlkcm1fYXRvbWljX2hlbHBlcl93YWl0X2Zv cl9kZXBlbmRlbmNpZXMoc3RhdGUpOwogCi0JCQlkZXZfcHJpdi0+ZGlzcGxheS5jcnRjX2Rpc2Fi bGUob2xkX2ludGVsX2NydGNfc3RhdGUsIHN0YXRlKTsKLQkJCWludGVsX2NydGMtPmFjdGl2ZSA9 IGZhbHNlOwotCQkJaW50ZWxfZmJjX2Rpc2FibGUoaW50ZWxfY3J0Yyk7Ci0JCQlpbnRlbF9kaXNh YmxlX3NoYXJlZF9kcGxsKG9sZF9pbnRlbF9jcnRjX3N0YXRlKTsKKwlpZiAoaW50ZWxfc3RhdGUt Pm1vZGVzZXQpCisJCXdha2VyZWYgPSBpbnRlbF9kaXNwbGF5X3Bvd2VyX2dldChkZXZfcHJpdiwg UE9XRVJfRE9NQUlOX01PREVTRVQpOwogCi0JCQkvKgotCQkJICogVW5kZXJydW5zIGRvbid0IGFs d2F5cyByYWlzZQotCQkJICogaW50ZXJydXB0cywgc28gY2hlY2sgbWFudWFsbHkuCi0JCQkgKi8K LQkJCWludGVsX2NoZWNrX2NwdV9maWZvX3VuZGVycnVucyhkZXZfcHJpdik7Ci0JCQlpbnRlbF9j aGVja19wY2hfZmlmb191bmRlcnJ1bnMoZGV2X3ByaXYpOwotCi0JCQkvKiBGSVhNRSB1bmlmeSB0 aGlzIGZvciBhbGwgcGxhdGZvcm1zICovCi0JCQlpZiAoIW5ld19jcnRjX3N0YXRlLT5hY3RpdmUg JiYKLQkJCSAgICAhSEFTX0dNQ0goZGV2X3ByaXYpICYmCi0JCQkgICAgZGV2X3ByaXYtPmRpc3Bs YXkuaW5pdGlhbF93YXRlcm1hcmtzKQotCQkJCWRldl9wcml2LT5kaXNwbGF5LmluaXRpYWxfd2F0 ZXJtYXJrcyhpbnRlbF9zdGF0ZSwKLQkJCQkJCQkJICAgICBuZXdfaW50ZWxfY3J0Y19zdGF0ZSk7 Ci0JCX0KLQl9CisJZGV2X3ByaXYtPmRpc3BsYXkuY29tbWl0X21vZGVzZXRfZGlzYWJsZXMoc3Rh dGUpOwogCiAJLyogRklYTUU6IEV2ZW50dWFsbHkgZ2V0IHJpZCBvZiBvdXIgaW50ZWxfY3J0Yy0+ Y29uZmlnIHBvaW50ZXIgKi8KIAlmb3JfZWFjaF9uZXdfY3J0Y19pbl9zdGF0ZShzdGF0ZSwgY3J0 YywgbmV3X2NydGNfc3RhdGUsIGkpCkBAIC0xNTcyMiw2ICsxNTc1MSw5IEBAIHZvaWQgaW50ZWxf aW5pdF9kaXNwbGF5X2hvb2tzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAkJ ZGV2X3ByaXYtPmRpc3BsYXkuY29tbWl0X21vZGVzZXRfZW5hYmxlcyA9IHNrbF9jb21taXRfbW9k ZXNldF9lbmFibGVzOwogCWVsc2UKIAkJZGV2X3ByaXYtPmRpc3BsYXkuY29tbWl0X21vZGVzZXRf ZW5hYmxlcyA9IGludGVsX2NvbW1pdF9tb2Rlc2V0X2VuYWJsZXM7CisKKwlkZXZfcHJpdi0+ZGlz cGxheS5jb21taXRfbW9kZXNldF9kaXNhYmxlcyA9IGludGVsX2NvbW1pdF9tb2Rlc2V0X2Rpc2Fi bGVzOworCiB9CiAKIHN0YXRpYyBpOTE1X3JlZ190IGk5MTVfdmdhY250cmxfcmVnKHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IDA3 NWQ3ZWIzYzNmMi4uZWRiNmI0MzFmOTBjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTMx MSw2ICszMTEsNyBAQCBzdHJ1Y3QgZHJtX2k5MTVfZGlzcGxheV9mdW5jcyB7CiAJdm9pZCAoKmNy dGNfZGlzYWJsZSkoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKm9sZF9jcnRjX3N0YXRlLAogCQkJ ICAgICBzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqb2xkX3N0YXRlKTsKIAl2b2lkICgqY29tbWl0 X21vZGVzZXRfZW5hYmxlcykoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlKTsKKwl2b2lk ICgqY29tbWl0X21vZGVzZXRfZGlzYWJsZXMpKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0 ZSk7CiAJdm9pZCAoKmF1ZGlvX2NvZGVjX2VuYWJsZSkoc3RydWN0IGludGVsX2VuY29kZXIgKmVu Y29kZXIsCiAJCQkJICAgY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUs CiAJCQkJICAgY29uc3Qgc3RydWN0IGRybV9jb25uZWN0b3Jfc3RhdGUgKmNvbm5fc3RhdGUpOwot LSAKMi4xOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcK aHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZng=