From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH 07/10] drm/i915: Remove begin/finish_crtc_commit. Date: Wed, 21 Aug 2019 15:32:18 +0200 Message-ID: <20190821133221.29456-8-maarten.lankhorst@linux.intel.com> References: <20190821133221.29456-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 [IPv6:2a02:2308::216:3eff:fe92:dfa3]) by gabe.freedesktop.org (Postfix) with ESMTPS id D92CA6E3A6 for ; Wed, 21 Aug 2019 13:32:25 +0000 (UTC) In-Reply-To: <20190821133221.29456-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 IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggYjg3 YmZjMDcwNmQ2Li5jMjYyNGI1ZjRmMDUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2Rpc3BsYXkvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3Bs YXkvaW50ZWxfZGlzcGxheS5jCkBAIC0xMzYsOCArMTM2LDYgQEAgc3RhdGljIHZvaWQgdmx2X3By ZXBhcmVfcGxsKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAogCQkJICAgIGNvbnN0IHN0cnVjdCBp bnRlbF9jcnRjX3N0YXRlICpwaXBlX2NvbmZpZyk7CiBzdGF0aWMgdm9pZCBjaHZfcHJlcGFyZV9w bGwoc3RydWN0IGludGVsX2NydGMgKmNydGMsCiAJCQkgICAgY29uc3Qgc3RydWN0IGludGVsX2Ny dGNfc3RhdGUgKnBpcGVfY29uZmlnKTsKLXN0YXRpYyB2b2lkIGludGVsX2JlZ2luX2NydGNfY29t bWl0KHN0cnVjdCBpbnRlbF9hdG9taWNfc3RhdGUgKiwgc3RydWN0IGludGVsX2NydGMgKik7Ci1z dGF0aWMgdm9pZCBpbnRlbF9maW5pc2hfY3J0Y19jb21taXQoc3RydWN0IGludGVsX2F0b21pY19z dGF0ZSAqLCBzdHJ1Y3QgaW50ZWxfY3J0YyAqKTsKIHN0YXRpYyB2b2lkIGludGVsX2NydGNfaW5p dF9zY2FsZXJzKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAogCQkJCSAgICBzdHJ1Y3QgaW50ZWxf Y3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSk7CiBzdGF0aWMgdm9pZCBza3lsYWtlX3BmaXRfZW5hYmxl KGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlKTsKQEAgLTEzNzI1LDEz ICsxMzcyMyw1NCBAQCB1MzIgaW50ZWxfY3J0Y19nZXRfdmJsYW5rX2NvdW50ZXIoc3RydWN0IGlu 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 c3RhdGUoc3RhdGUsCkBAIC0xMzc1NSwxNCArMTM3OTQsMjEgQEAgc3RhdGljIHZvaWQgaW50ZWxf dXBkYXRlX2NydGMoc3RydWN0IGludGVsX2NydGMgKmNydGMsCiAJZWxzZSBpZiAobmV3X3BsYW5l X3N0YXRlKQogCQlpbnRlbF9mYmNfZW5hYmxlKGNydGMsIG5ld19jcnRjX3N0YXRlLCBuZXdfcGxh bmVfc3RhdGUpOwogCi0JaW50ZWxfYmVnaW5fY3J0Y19jb21taXQoc3RhdGUsIGNydGMpOworCS8q IFBlcmZvcm0gdmJsYW5rIGV2YXNpb24gYXJvdW5kIGNvbW1pdCBvcGVyYXRpb24gKi8KKwlpbnRl bF9waXBlX3VwZGF0ZV9zdGFydChuZXdfY3J0Y19zdGF0ZSk7CisKKwljb21taXRfcGlwZV9jb25m aWcoc3RhdGUsIG9sZF9jcnRjX3N0YXRlLCBuZXdfY3J0Y19zdGF0ZSk7CiAKIAlpZiAoSU5URUxf R0VOKGRldl9wcml2KSA+PSA5KQogCQlza2xfdXBkYXRlX3BsYW5lc19vbl9jcnRjKHN0YXRlLCBj cnRjKTsKIAllbHNlCiAJCWk5eHhfdXBkYXRlX3BsYW5lc19vbl9jcnRjKHN0YXRlLCBjcnRjKTsK IAotCWludGVsX2ZpbmlzaF9jcnRjX2NvbW1pdChzdGF0ZSwgY3J0Yyk7CisJaW50ZWxfcGlwZV91 cGRhdGVfZW5kKG5ld19jcnRjX3N0YXRlKTsKKworCWlmIChuZXdfY3J0Y19zdGF0ZS0+dXBkYXRl X3BpcGUgJiYgIW1vZGVzZXQgJiYKKwkgICAgb2xkX2NydGNfc3RhdGUtPmh3Lm1vZGUucHJpdmF0 ZV9mbGFncyAmIEk5MTVfTU9ERV9GTEFHX0lOSEVSSVRFRCkKKwkJaW50ZWxfY3J0Y19hcm1fZmlm b191bmRlcnJ1bihjcnRjLCBuZXdfY3J0Y19zdGF0ZSk7CiB9CiAKIHN0YXRpYyB2b2lkIGludGVs X3VwZGF0ZV9jcnRjcyhzdHJ1Y3QgaW50ZWxfYXRvbWljX3N0YXRlICpzdGF0ZSkKQEAgLTE0NTI1 LDcyICsxNDU3MSw2IEBAIHNrbF9tYXhfc2NhbGUoY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3Rh dGUgKmNydGNfc3RhdGUsCiAJcmV0dXJuIG1heF9zY2FsZTsKIH0KIAotc3RhdGljIHZvaWQgaW50 ZWxfYmVnaW5fY3J0Y19jb21taXQoc3RydWN0IGludGVsX2F0b21pY19zdGF0ZSAqc3RhdGUsCi0J CQkJICAgIHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQotewotCXN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoY3J0Yy0+YmFzZS5kZXYpOwotCXN0cnVjdCBpbnRlbF9j cnRjX3N0YXRlICpvbGRfY3J0Y19zdGF0ZSA9Ci0JCWludGVsX2F0b21pY19nZXRfb2xkX2NydGNf c3RhdGUoc3RhdGUsIGNydGMpOwotCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpuZXdfY3J0Y19z dGF0ZSA9Ci0JCWludGVsX2F0b21pY19nZXRfbmV3X2NydGNfc3RhdGUoc3RhdGUsIGNydGMpOwot CWJvb2wgbW9kZXNldCA9IG5lZWRzX21vZGVzZXQobmV3X2NydGNfc3RhdGUpOwotCi0JLyogUGVy Zm9ybSB2YmxhbmsgZXZhc2lvbiBhcm91bmQgY29tbWl0IG9wZXJhdGlvbiAqLwotCWludGVsX3Bp cGVfdXBkYXRlX3N0YXJ0KG5ld19jcnRjX3N0YXRlKTsKLQotCWlmIChtb2Rlc2V0KQotCQlnb3Rv IG91dDsKLQotCWlmIChuZXdfY3J0Y19zdGF0ZS0+dWFwaS5jb2xvcl9tZ210X2NoYW5nZWQgfHwK LQkgICAgbmV3X2NydGNfc3RhdGUtPnVwZGF0ZV9waXBlKQotCQlpbnRlbF9jb2xvcl9jb21taXQo bmV3X2NydGNfc3RhdGUpOwotCi0JaWYgKG5ld19jcnRjX3N0YXRlLT51cGRhdGVfcGlwZSkKLQkJ aW50ZWxfdXBkYXRlX3BpcGVfY29uZmlnKG9sZF9jcnRjX3N0YXRlLCBuZXdfY3J0Y19zdGF0ZSk7 Ci0JZWxzZSBpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA5KQotCQlza2xfZGV0YWNoX3NjYWxl cnMobmV3X2NydGNfc3RhdGUpOwotCi0JaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gOSB8fCBJ U19CUk9BRFdFTEwoZGV2X3ByaXYpKQotCQliZHdfc2V0X3BpcGVtaXNjKG5ld19jcnRjX3N0YXRl KTsKLQotb3V0OgotCWlmIChkZXZfcHJpdi0+ZGlzcGxheS5hdG9taWNfdXBkYXRlX3dhdGVybWFy a3MpCi0JCWRldl9wcml2LT5kaXNwbGF5LmF0b21pY191cGRhdGVfd2F0ZXJtYXJrcyhzdGF0ZSwK LQkJCQkJCQkgICBuZXdfY3J0Y19zdGF0ZSk7Ci19Ci0KLXZvaWQgaW50ZWxfY3J0Y19hcm1fZmlm b191bmRlcnJ1bihzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywKLQkJCQkgIHN0cnVjdCBpbnRlbF9j cnRjX3N0YXRlICpjcnRjX3N0YXRlKQotewotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdiA9IHRvX2k5MTUoY3J0Yy0+YmFzZS5kZXYpOwotCi0JaWYgKCFJU19HRU4oZGV2X3ByaXYs IDIpKQotCQlpbnRlbF9zZXRfY3B1X2ZpZm9fdW5kZXJydW5fcmVwb3J0aW5nKGRldl9wcml2LCBj cnRjLT5waXBlLCB0cnVlKTsKLQotCWlmIChjcnRjX3N0YXRlLT5oYXNfcGNoX2VuY29kZXIpIHsK LQkJZW51bSBwaXBlIHBjaF90cmFuc2NvZGVyID0KLQkJCWludGVsX2NydGNfcGNoX3RyYW5zY29k ZXIoY3J0Yyk7Ci0KLQkJaW50ZWxfc2V0X3BjaF9maWZvX3VuZGVycnVuX3JlcG9ydGluZyhkZXZf cHJpdiwgcGNoX3RyYW5zY29kZXIsIHRydWUpOwotCX0KLX0KLQotc3RhdGljIHZvaWQgaW50ZWxf ZmluaXNoX2NydGNfY29tbWl0KHN0cnVjdCBpbnRlbF9hdG9taWNfc3RhdGUgKnN0YXRlLAotCQkJ CSAgICAgc3RydWN0IGludGVsX2NydGMgKmNydGMpCi17Ci0Jc3RydWN0IGludGVsX2NydGNfc3Rh dGUgKm9sZF9jcnRjX3N0YXRlID0KLQkJaW50ZWxfYXRvbWljX2dldF9vbGRfY3J0Y19zdGF0ZShz dGF0ZSwgY3J0Yyk7Ci0Jc3RydWN0IGludGVsX2NydGNfc3RhdGUgKm5ld19jcnRjX3N0YXRlID0K LQkJaW50ZWxfYXRvbWljX2dldF9uZXdfY3J0Y19zdGF0ZShzdGF0ZSwgY3J0Yyk7Ci0KLQlpbnRl bF9waXBlX3VwZGF0ZV9lbmQobmV3X2NydGNfc3RhdGUpOwotCi0JaWYgKG5ld19jcnRjX3N0YXRl LT51cGRhdGVfcGlwZSAmJgotCSAgICAhbmVlZHNfbW9kZXNldChuZXdfY3J0Y19zdGF0ZSkgJiYK LQkgICAgb2xkX2NydGNfc3RhdGUtPmh3Lm1vZGUucHJpdmF0ZV9mbGFncyAmIEk5MTVfTU9ERV9G TEFHX0lOSEVSSVRFRCkKLQkJaW50ZWxfY3J0Y19hcm1fZmlmb191bmRlcnJ1bihjcnRjLCBuZXdf Y3J0Y19zdGF0ZSk7Ci19Ci0KIC8qKgogICogaW50ZWxfcGxhbmVfZGVzdHJveSAtIGRlc3Ryb3kg YSBwbGFuZQogICogQHBsYW5lOiBwbGFuZSB0byBkZXN0cm95Ci0tIAoyLjIwLjEKCl9fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5n IGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVk ZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeA==