From: Maarten Lankhorst Subject: [PATCH 07/23] drm/i915: Remove begin/finish_crtc_commit. Date: Fri, 20 Sep 2019 13:42:19 +0200 Message-ID: <20190920114235.22411-7-maarten.lankhorst@linux.intel.com> References: <20190920114235.22411-1-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 ESMTPS id 2C36B6FC9B for ; Fri, 20 Sep 2019 11:42:42 +0000 (UTC) In-Reply-To: <20190920114235.22411-1-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 VGhpcyBjYW4gYWxsIGJlIGRvbmUgZnJvbSB0aGUgaW50ZWxfdXBkYXRlX2NydGMgZnVuY3Rpb24u IFNwbGl0IG91dCB0aGUKcGlwZSB1cGRhdGUgaW50byBhIHNlcGFyYXRlIGZ1bmN0aW9uLCBqdXN0 IGxpa2UgaXMgZG9uZSBmb3IgdGhlIHBsYW5lcy4KClNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4gTGFu a2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9n cHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9kaXNwbGF5LmMgfCAxMjQgKysrKysrKystLS0tLS0t LS0tLQogMSBmaWxlIGNoYW5nZWQsIDUyIGluc2VydGlvbnMoKyksIDcyIGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZGlzcGxheS5j IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggNTIw YzY2MDcxZTY3Li5mZDhiMzk4NzMzYjggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2Rpc3BsYXkvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3Bs YXkvaW50ZWxfZGlzcGxheS5jCkBAIC0xMzYsOCArMTM2LDYgQEAgc3RhdGljIHZvaWQgdmx2X3By ZXBhcmVfcGxsKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAogCQkJICAgIGNvbnN0IHN0cnVjdCBp bnRlbF9jcnRjX3N0YXRlICpwaXBlX2NvbmZpZyk7CiBzdGF0aWMgdm9pZCBjaHZfcHJlcGFyZV9w bGwoc3RydWN0IGludGVsX2NydGMgKmNydGMsCiAJCQkgICAgY29uc3Qgc3RydWN0IGludGVsX2Ny dGNfc3RhdGUgKnBpcGVfY29uZmlnKTsKLXN0YXRpYyB2b2lkIGludGVsX2JlZ2luX2NydGNfY29t bWl0KHN0cnVjdCBpbnRlbF9hdG9taWNfc3RhdGUgKiwgc3RydWN0IGludGVsX2NydGMgKik7Ci1z dGF0aWMgdm9pZCBpbnRlbF9maW5pc2hfY3J0Y19jb21taXQoc3RydWN0IGludGVsX2F0b21pY19z dGF0ZSAqLCBzdHJ1Y3QgaW50ZWxfY3J0YyAqKTsKIHN0YXRpYyB2b2lkIGludGVsX2NydGNfaW5p dF9zY2FsZXJzKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAogCQkJCSAgICBzdHJ1Y3QgaW50ZWxf Y3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSk7CiBzdGF0aWMgdm9pZCBza3lsYWtlX3BmaXRfZW5hYmxl KGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlKTsKQEAgLTEzNjczLDEz ICsxMzY3MSw1NCBAQCB1MzIgaW50ZWxfY3J0Y19nZXRfdmJsYW5rX2NvdW50ZXIoc3RydWN0IGlu dGVsX2NydGMgKmNydGMpCiAJcmV0dXJuIGNydGMtPmJhc2UuZnVuY3MtPmdldF92YmxhbmtfY291 bnRlcigmY3J0Yy0+YmFzZSk7CiB9CiAKK3ZvaWQgaW50ZWxfY3J0Y19hcm1fZmlmb191bmRlcnJ1 bihzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywKKwkJCQkgIHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRl ICpjcnRjX3N0YXRlKQoreworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRv X2k5MTUoY3J0Yy0+YmFzZS5kZXYpOworCisJaWYgKCFJU19HRU4oZGV2X3ByaXYsIDIpKQorCQlp bnRlbF9zZXRfY3B1X2ZpZm9fdW5kZXJydW5fcmVwb3J0aW5nKGRldl9wcml2LCBjcnRjLT5waXBl LCB0cnVlKTsKKworCWlmIChjcnRjX3N0YXRlLT5oYXNfcGNoX2VuY29kZXIpIHsKKwkJZW51bSBw aXBlIHBjaF90cmFuc2NvZGVyID0KKwkJCWludGVsX2NydGNfcGNoX3RyYW5zY29kZXIoY3J0Yyk7 CisKKwkJaW50ZWxfc2V0X3BjaF9maWZvX3VuZGVycnVuX3JlcG9ydGluZyhkZXZfcHJpdiwgcGNo X3RyYW5zY29kZXIsIHRydWUpOworCX0KK30KKworc3RhdGljIHZvaWQgY29tbWl0X3BpcGVfY29u ZmlnKHN0cnVjdCBpbnRlbF9hdG9taWNfc3RhdGUgKnN0YXRlLAorCQkJICAgICAgIHN0cnVjdCBp bnRlbF9jcnRjX3N0YXRlICpvbGRfY3J0Y19zdGF0ZSwKKwkJCSAgICAgICBzdHJ1Y3QgaW50ZWxf Y3J0Y19zdGF0ZSAqbmV3X2NydGNfc3RhdGUpCit7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2ID0gdG9faTkxNShzdGF0ZS0+YmFzZS5kZXYpOworCWJvb2wgbW9kZXNldCA9IG5l ZWRzX21vZGVzZXQobmV3X2NydGNfc3RhdGUpOworCisJaWYgKCFtb2Rlc2V0KSB7CisJCWlmIChu ZXdfY3J0Y19zdGF0ZS0+dWFwaS5jb2xvcl9tZ210X2NoYW5nZWQgfHwKKwkJICAgIG5ld19jcnRj X3N0YXRlLT51cGRhdGVfcGlwZSkKKwkJCWludGVsX2NvbG9yX2NvbW1pdChuZXdfY3J0Y19zdGF0 ZSk7CisKKwkJaWYgKG5ld19jcnRjX3N0YXRlLT51cGRhdGVfcGlwZSkKKwkJCWludGVsX3VwZGF0 ZV9waXBlX2NvbmZpZyhvbGRfY3J0Y19zdGF0ZSwgbmV3X2NydGNfc3RhdGUpOworCQllbHNlIGlm IChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDkpCisJCQlza2xfZGV0YWNoX3NjYWxlcnMobmV3X2Ny dGNfc3RhdGUpOworCisJCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDkgfHwgSVNfQlJPQURX RUxMKGRldl9wcml2KSkKKwkJCWJkd19zZXRfcGlwZW1pc2MobmV3X2NydGNfc3RhdGUpOworCX0K KworCWlmIChkZXZfcHJpdi0+ZGlzcGxheS5hdG9taWNfdXBkYXRlX3dhdGVybWFya3MpCisJCWRl dl9wcml2LT5kaXNwbGF5LmF0b21pY191cGRhdGVfd2F0ZXJtYXJrcyhzdGF0ZSwKKwkJCQkJCQkg ICBuZXdfY3J0Y19zdGF0ZSk7Cit9CisKIHN0YXRpYyB2b2lkIGludGVsX3VwZGF0ZV9jcnRjKHN0 cnVjdCBpbnRlbF9jcnRjICpjcnRjLAogCQkJICAgICAgc3RydWN0IGludGVsX2F0b21pY19zdGF0 ZSAqc3RhdGUsCiAJCQkgICAgICBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqb2xkX2NydGNfc3Rh dGUsCiAJCQkgICAgICBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqbmV3X2NydGNfc3RhdGUpCiB7 Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IHN0YXRlLT5iYXNlLmRldjsKLQlzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CisJc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShzdGF0ZS0+YmFzZS5kZXYpOwogCWJvb2wgbW9k ZXNldCA9IG5lZWRzX21vZGVzZXQobmV3X2NydGNfc3RhdGUpOwogCXN0cnVjdCBpbnRlbF9wbGFu ZV9zdGF0ZSAqbmV3X3BsYW5lX3N0YXRlID0KIAkJaW50ZWxfYXRvbWljX2dldF9uZXdfcGxhbmVf c3RhdGUoc3RhdGUsCkBAIC0xMzcwMywxNCArMTM3NDIsMjEgQEAgc3RhdGljIHZvaWQgaW50ZWxf dXBkYXRlX2NydGMoc3RydWN0IGludGVsX2NydGMgKmNydGMsCiAJZWxzZSBpZiAobmV3X3BsYW5l X3N0YXRlKQogCQlpbnRlbF9mYmNfZW5hYmxlKGNydGMsIG5ld19jcnRjX3N0YXRlLCBuZXdfcGxh bmVfc3RhdGUpOwogCi0JaW50ZWxfYmVnaW5fY3J0Y19jb21taXQoc3RhdGUsIGNydGMpOworCS8q IFBlcmZvcm0gdmJsYW5rIGV2YXNpb24gYXJvdW5kIGNvbW1pdCBvcGVyYXRpb24gKi8KKwlpbnRl bF9waXBlX3VwZGF0ZV9zdGFydChuZXdfY3J0Y19zdGF0ZSk7CisKKwljb21taXRfcGlwZV9jb25m aWcoc3RhdGUsIG9sZF9jcnRjX3N0YXRlLCBuZXdfY3J0Y19zdGF0ZSk7CiAKIAlpZiAoSU5URUxf R0VOKGRldl9wcml2KSA+PSA5KQogCQlza2xfdXBkYXRlX3BsYW5lc19vbl9jcnRjKHN0YXRlLCBj cnRjKTsKIAllbHNlCiAJCWk5eHhfdXBkYXRlX3BsYW5lc19vbl9jcnRjKHN0YXRlLCBjcnRjKTsK IAotCWludGVsX2ZpbmlzaF9jcnRjX2NvbW1pdChzdGF0ZSwgY3J0Yyk7CisJaW50ZWxfcGlwZV91 cGRhdGVfZW5kKG5ld19jcnRjX3N0YXRlKTsKKworCWlmIChuZXdfY3J0Y19zdGF0ZS0+dXBkYXRl X3BpcGUgJiYgIW1vZGVzZXQgJiYKKwkgICAgb2xkX2NydGNfc3RhdGUtPmh3Lm1vZGUucHJpdmF0 ZV9mbGFncyAmIEk5MTVfTU9ERV9GTEFHX0lOSEVSSVRFRCkKKwkJaW50ZWxfY3J0Y19hcm1fZmlm b191bmRlcnJ1bihjcnRjLCBuZXdfY3J0Y19zdGF0ZSk7CiB9CiAKIHN0YXRpYyB2b2lkIGludGVs X29sZF9jcnRjX3N0YXRlX2Rpc2FibGVzKHN0cnVjdCBpbnRlbF9hdG9taWNfc3RhdGUgKnN0YXRl LApAQCAtMTQ1MDcsNzIgKzE0NTUzLDYgQEAgc2tsX21heF9zY2FsZShjb25zdCBzdHJ1Y3QgaW50 ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKIAlyZXR1cm4gbWF4X3NjYWxlOwogfQogCi1zdGF0 aWMgdm9pZCBpbnRlbF9iZWdpbl9jcnRjX2NvbW1pdChzdHJ1Y3QgaW50ZWxfYXRvbWljX3N0YXRl ICpzdGF0ZSwKLQkJCQkgICAgc3RydWN0IGludGVsX2NydGMgKmNydGMpCi17Ci0Jc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShjcnRjLT5iYXNlLmRldik7Ci0Jc3Ry dWN0IGludGVsX2NydGNfc3RhdGUgKm9sZF9jcnRjX3N0YXRlID0KLQkJaW50ZWxfYXRvbWljX2dl dF9vbGRfY3J0Y19zdGF0ZShzdGF0ZSwgY3J0Yyk7Ci0Jc3RydWN0IGludGVsX2NydGNfc3RhdGUg Km5ld19jcnRjX3N0YXRlID0KLQkJaW50ZWxfYXRvbWljX2dldF9uZXdfY3J0Y19zdGF0ZShzdGF0 ZSwgY3J0Yyk7Ci0JYm9vbCBtb2Rlc2V0ID0gbmVlZHNfbW9kZXNldChuZXdfY3J0Y19zdGF0ZSk7 Ci0KLQkvKiBQZXJmb3JtIHZibGFuayBldmFzaW9uIGFyb3VuZCBjb21taXQgb3BlcmF0aW9uICov Ci0JaW50ZWxfcGlwZV91cGRhdGVfc3RhcnQobmV3X2NydGNfc3RhdGUpOwotCi0JaWYgKG1vZGVz ZXQpCi0JCWdvdG8gb3V0OwotCi0JaWYgKG5ld19jcnRjX3N0YXRlLT51YXBpLmNvbG9yX21nbXRf Y2hhbmdlZCB8fAotCSAgICBuZXdfY3J0Y19zdGF0ZS0+dXBkYXRlX3BpcGUpCi0JCWludGVsX2Nv bG9yX2NvbW1pdChuZXdfY3J0Y19zdGF0ZSk7Ci0KLQlpZiAobmV3X2NydGNfc3RhdGUtPnVwZGF0 ZV9waXBlKQotCQlpbnRlbF91cGRhdGVfcGlwZV9jb25maWcob2xkX2NydGNfc3RhdGUsIG5ld19j cnRjX3N0YXRlKTsKLQllbHNlIGlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDkpCi0JCXNrbF9k ZXRhY2hfc2NhbGVycyhuZXdfY3J0Y19zdGF0ZSk7Ci0KLQlpZiAoSU5URUxfR0VOKGRldl9wcml2 KSA+PSA5IHx8IElTX0JST0FEV0VMTChkZXZfcHJpdikpCi0JCWJkd19zZXRfcGlwZW1pc2MobmV3 X2NydGNfc3RhdGUpOwotCi1vdXQ6Ci0JaWYgKGRldl9wcml2LT5kaXNwbGF5LmF0b21pY191cGRh dGVfd2F0ZXJtYXJrcykKLQkJZGV2X3ByaXYtPmRpc3BsYXkuYXRvbWljX3VwZGF0ZV93YXRlcm1h cmtzKHN0YXRlLAotCQkJCQkJCSAgIG5ld19jcnRjX3N0YXRlKTsKLX0KLQotdm9pZCBpbnRlbF9j cnRjX2FybV9maWZvX3VuZGVycnVuKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAotCQkJCSAgc3Ry dWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpCi17Ci0Jc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShjcnRjLT5iYXNlLmRldik7Ci0KLQlpZiAoIUlTX0dF TihkZXZfcHJpdiwgMikpCi0JCWludGVsX3NldF9jcHVfZmlmb191bmRlcnJ1bl9yZXBvcnRpbmco ZGV2X3ByaXYsIGNydGMtPnBpcGUsIHRydWUpOwotCi0JaWYgKGNydGNfc3RhdGUtPmhhc19wY2hf ZW5jb2RlcikgewotCQllbnVtIHBpcGUgcGNoX3RyYW5zY29kZXIgPQotCQkJaW50ZWxfY3J0Y19w Y2hfdHJhbnNjb2RlcihjcnRjKTsKLQotCQlpbnRlbF9zZXRfcGNoX2ZpZm9fdW5kZXJydW5fcmVw b3J0aW5nKGRldl9wcml2LCBwY2hfdHJhbnNjb2RlciwgdHJ1ZSk7Ci0JfQotfQotCi1zdGF0aWMg dm9pZCBpbnRlbF9maW5pc2hfY3J0Y19jb21taXQoc3RydWN0IGludGVsX2F0b21pY19zdGF0ZSAq c3RhdGUsCi0JCQkJICAgICBzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKLXsKLQlzdHJ1Y3QgaW50 ZWxfY3J0Y19zdGF0ZSAqb2xkX2NydGNfc3RhdGUgPQotCQlpbnRlbF9hdG9taWNfZ2V0X29sZF9j cnRjX3N0YXRlKHN0YXRlLCBjcnRjKTsKLQlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqbmV3X2Ny dGNfc3RhdGUgPQotCQlpbnRlbF9hdG9taWNfZ2V0X25ld19jcnRjX3N0YXRlKHN0YXRlLCBjcnRj KTsKLQotCWludGVsX3BpcGVfdXBkYXRlX2VuZChuZXdfY3J0Y19zdGF0ZSk7Ci0KLQlpZiAobmV3 X2NydGNfc3RhdGUtPnVwZGF0ZV9waXBlICYmCi0JICAgICFuZWVkc19tb2Rlc2V0KG5ld19jcnRj X3N0YXRlKSAmJgotCSAgICBvbGRfY3J0Y19zdGF0ZS0+aHcubW9kZS5wcml2YXRlX2ZsYWdzICYg STkxNV9NT0RFX0ZMQUdfSU5IRVJJVEVEKQotCQlpbnRlbF9jcnRjX2FybV9maWZvX3VuZGVycnVu KGNydGMsIG5ld19jcnRjX3N0YXRlKTsKLX0KLQogLyoqCiAgKiBpbnRlbF9wbGFuZV9kZXN0cm95 IC0gZGVzdHJveSBhIHBsYW5lCiAgKiBAcGxhbmU6IHBsYW5lIHRvIGRlc3Ryb3kKLS0gCjIuMjAu MQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwt Z2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8v bGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4