From: Manasi Navare Subject: [PATCH] drm/i915: Nuke drm_crtc_state and use intel_atomic_state instead Date: Thu, 11 Apr 2019 16:02:54 -0700 Message-ID: <20190411230254.6357-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 mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id A05198991C for ; Thu, 11 Apr 2019 23:00:45 +0000 (UTC) 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 VGhpcyBpcyBvbmUgb2YgdGhlIHBhdGNoZXMgdG8gc3RhcnQgcmVwbGFjaW5nIGRybSBwb2ludGVy cwphbmQgdXNlIHRoZSBpbnRlbF9hdG9taWNfc3RhdGUgYW5kIGludGVsX2NydGMgdG8gZGVyaXZl CnRoZSBuZWNlc3NhcnkgaW50ZWwgc3RhdGUgdmFyaWFibGVzIHJlcXVpcmVkIGZvciB0aGUgaW50 ZWwKbW9kZXNldCBmdW5jdGlvbnMuCgpTdWdnZXN0ZWQtYnk6IFZpbGxlIFN5cmphbGEgPHZpbGxl LnN5cmphbGFAbGludXguaW50ZWwuY29tPgpDYzogVmlsbGUgU3lyamFsYSA8dmlsbGUuc3lyamFs YUBsaW51eC5pbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IE1hbmFzaSBOYXZhcmUgPG1hbmFzaS5k Lm5hdmFyZUBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxh eS5jIHwgMzggKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDE4 IGluc2VydGlvbnMoKyksIDIwIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rp c3BsYXkuYwppbmRleCBmMjlhMzQ4ZThkNzEuLjA2MmI5ZTg2YTk4NyAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtMTI1LDggKzEyNSw4IEBAIHN0YXRpYyB2b2lkIHZsdl9w cmVwYXJlX3BsbChzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywKIAkJCSAgICBjb25zdCBzdHJ1Y3Qg aW50ZWxfY3J0Y19zdGF0ZSAqcGlwZV9jb25maWcpOwogc3RhdGljIHZvaWQgY2h2X3ByZXBhcmVf cGxsKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAogCQkJICAgIGNvbnN0IHN0cnVjdCBpbnRlbF9j cnRjX3N0YXRlICpwaXBlX2NvbmZpZyk7Ci1zdGF0aWMgdm9pZCBpbnRlbF9iZWdpbl9jcnRjX2Nv bW1pdChzdHJ1Y3QgZHJtX2NydGMgKiwgc3RydWN0IGRybV9jcnRjX3N0YXRlICopOwotc3RhdGlj IHZvaWQgaW50ZWxfZmluaXNoX2NydGNfY29tbWl0KHN0cnVjdCBkcm1fY3J0YyAqLCBzdHJ1Y3Qg ZHJtX2NydGNfc3RhdGUgKik7CitzdGF0aWMgdm9pZCBpbnRlbF9iZWdpbl9jcnRjX2NvbW1pdChz dHJ1Y3QgaW50ZWxfY3J0YyAqLCBzdHJ1Y3QgaW50ZWxfYXRvbWljX3N0YXRlICopOworc3RhdGlj IHZvaWQgaW50ZWxfZmluaXNoX2NydGNfY29tbWl0KHN0cnVjdCBpbnRlbF9jcnRjICosIHN0cnVj dCBpbnRlbF9hdG9taWNfc3RhdGUgKik7CiBzdGF0aWMgdm9pZCBpbnRlbF9jcnRjX2luaXRfc2Nh bGVycyhzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywKIAkJCQkgICAgc3RydWN0IGludGVsX2NydGNf c3RhdGUgKmNydGNfc3RhdGUpOwogc3RhdGljIHZvaWQgc2t5bGFrZV9wZml0X2VuYWJsZShjb25z dCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSk7CkBAIC0xMzI3MywxNCArMTMy NzMsMTQgQEAgc3RhdGljIHZvaWQgaW50ZWxfdXBkYXRlX2NydGMoc3RydWN0IGRybV9jcnRjICpj cnRjLAogCWVsc2UgaWYgKG5ld19wbGFuZV9zdGF0ZSkKIAkJaW50ZWxfZmJjX2VuYWJsZShpbnRl bF9jcnRjLCBwaXBlX2NvbmZpZywgbmV3X3BsYW5lX3N0YXRlKTsKIAotCWludGVsX2JlZ2luX2Ny dGNfY29tbWl0KGNydGMsIG9sZF9jcnRjX3N0YXRlKTsKKwlpbnRlbF9iZWdpbl9jcnRjX2NvbW1p dChpbnRlbF9jcnRjLCB0b19pbnRlbF9hdG9taWNfc3RhdGUoc3RhdGUpKTsKIAogCWlmIChJTlRF TF9HRU4oZGV2X3ByaXYpID49IDkpCiAJCXNrbF91cGRhdGVfcGxhbmVzX29uX2NydGModG9faW50 ZWxfYXRvbWljX3N0YXRlKHN0YXRlKSwgaW50ZWxfY3J0Yyk7CiAJZWxzZQogCQlpOXh4X3VwZGF0 ZV9wbGFuZXNfb25fY3J0Yyh0b19pbnRlbF9hdG9taWNfc3RhdGUoc3RhdGUpLCBpbnRlbF9jcnRj KTsKIAotCWludGVsX2ZpbmlzaF9jcnRjX2NvbW1pdChjcnRjLCBvbGRfY3J0Y19zdGF0ZSk7CisJ aW50ZWxfZmluaXNoX2NydGNfY29tbWl0KGludGVsX2NydGMsIHRvX2ludGVsX2F0b21pY19zdGF0 ZShzdGF0ZSkpOwogfQogCiBzdGF0aWMgdm9pZCBpbnRlbF91cGRhdGVfY3J0Y3Moc3RydWN0IGRy bV9hdG9taWNfc3RhdGUgKnN0YXRlKQpAQCAtMTQwNzAsMTggKzE0MDcwLDE2IEBAIHNrbF9tYXhf c2NhbGUoY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUsCiAJcmV0dXJu IG1heF9zY2FsZTsKIH0KIAotc3RhdGljIHZvaWQgaW50ZWxfYmVnaW5fY3J0Y19jb21taXQoc3Ry dWN0IGRybV9jcnRjICpjcnRjLAotCQkJCSAgICBzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKm9sZF9j cnRjX3N0YXRlKQorc3RhdGljIHZvaWQgaW50ZWxfYmVnaW5fY3J0Y19jb21taXQoc3RydWN0IGlu dGVsX2NydGMgKmNydGMsCisJCQkJICAgIHN0cnVjdCBpbnRlbF9hdG9taWNfc3RhdGUgKnN0YXRl KQogewotCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBjcnRjLT5kZXY7CisJc3RydWN0IGRybV9k ZXZpY2UgKmRldiA9IGNydGMtPmJhc2UuZGV2OwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKLQlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9 IHRvX2ludGVsX2NydGMoY3J0Yyk7CiAJc3RydWN0IGludGVsX2NydGNfc3RhdGUgKm9sZF9pbnRl bF9jc3RhdGUgPQotCQl0b19pbnRlbF9jcnRjX3N0YXRlKG9sZF9jcnRjX3N0YXRlKTsKLQlzdHJ1 Y3QgaW50ZWxfYXRvbWljX3N0YXRlICpvbGRfaW50ZWxfc3RhdGUgPQotCQl0b19pbnRlbF9hdG9t aWNfc3RhdGUob2xkX2NydGNfc3RhdGUtPnN0YXRlKTsKKwkJaW50ZWxfYXRvbWljX2dldF9vbGRf Y3J0Y19zdGF0ZShzdGF0ZSwKKwkJCQkJCWNydGMpOwogCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRl ICppbnRlbF9jc3RhdGUgPQotCQlpbnRlbF9hdG9taWNfZ2V0X25ld19jcnRjX3N0YXRlKG9sZF9p bnRlbF9zdGF0ZSwgaW50ZWxfY3J0Yyk7CisJCWludGVsX2F0b21pY19nZXRfbmV3X2NydGNfc3Rh dGUoc3RhdGUsIGNydGMpOwogCWJvb2wgbW9kZXNldCA9IG5lZWRzX21vZGVzZXQoJmludGVsX2Nz dGF0ZS0+YmFzZSk7CiAKIAkvKiBQZXJmb3JtIHZibGFuayBldmFzaW9uIGFyb3VuZCBjb21taXQg b3BlcmF0aW9uICovCkBAIC0xNDEwMSw3ICsxNDA5OSw3IEBAIHN0YXRpYyB2b2lkIGludGVsX2Jl Z2luX2NydGNfY29tbWl0KHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAogb3V0OgogCWlmIChkZXZf cHJpdi0+ZGlzcGxheS5hdG9taWNfdXBkYXRlX3dhdGVybWFya3MpCi0JCWRldl9wcml2LT5kaXNw bGF5LmF0b21pY191cGRhdGVfd2F0ZXJtYXJrcyhvbGRfaW50ZWxfc3RhdGUsCisJCWRldl9wcml2 LT5kaXNwbGF5LmF0b21pY191cGRhdGVfd2F0ZXJtYXJrcyhzdGF0ZSwKIAkJCQkJCQkgICBpbnRl bF9jc3RhdGUpOwogfQogCkBAIC0xNDEyMSwyMSArMTQxMTksMjEgQEAgdm9pZCBpbnRlbF9jcnRj X2FybV9maWZvX3VuZGVycnVuKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAogCX0KIH0KIAotc3Rh dGljIHZvaWQgaW50ZWxfZmluaXNoX2NydGNfY29tbWl0KHN0cnVjdCBkcm1fY3J0YyAqY3J0YywK LQkJCQkgICAgIHN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqb2xkX2NydGNfc3RhdGUpCitzdGF0aWMg dm9pZCBpbnRlbF9maW5pc2hfY3J0Y19jb21taXQoc3RydWN0IGludGVsX2NydGMgKmNydGMsCisJ CQkJICAgICBzdHJ1Y3QgaW50ZWxfYXRvbWljX3N0YXRlICpzdGF0ZSkKIHsKLQlzdHJ1Y3QgaW50 ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7Ci0Jc3RydWN0IGludGVs X2F0b21pY19zdGF0ZSAqb2xkX2ludGVsX3N0YXRlID0KLQkJdG9faW50ZWxfYXRvbWljX3N0YXRl KG9sZF9jcnRjX3N0YXRlLT5zdGF0ZSk7CisJc3RydWN0IGRybV9jcnRjX3N0YXRlICpvbGRfY3J0 Y19zdGF0ZSA9CisJCSZpbnRlbF9hdG9taWNfZ2V0X29sZF9jcnRjX3N0YXRlKHN0YXRlLAorCQkJ CQkJY3J0YyktPmJhc2U7CiAJc3RydWN0IGludGVsX2NydGNfc3RhdGUgKm5ld19jcnRjX3N0YXRl ID0KLQkJaW50ZWxfYXRvbWljX2dldF9uZXdfY3J0Y19zdGF0ZShvbGRfaW50ZWxfc3RhdGUsIGlu dGVsX2NydGMpOworCQlpbnRlbF9hdG9taWNfZ2V0X25ld19jcnRjX3N0YXRlKHN0YXRlLCBjcnRj KTsKIAogCWludGVsX3BpcGVfdXBkYXRlX2VuZChuZXdfY3J0Y19zdGF0ZSk7CiAKIAlpZiAobmV3 X2NydGNfc3RhdGUtPnVwZGF0ZV9waXBlICYmCiAJICAgICFuZWVkc19tb2Rlc2V0KCZuZXdfY3J0 Y19zdGF0ZS0+YmFzZSkgJiYKIAkgICAgb2xkX2NydGNfc3RhdGUtPm1vZGUucHJpdmF0ZV9mbGFn cyAmIEk5MTVfTU9ERV9GTEFHX0lOSEVSSVRFRCkKLQkJaW50ZWxfY3J0Y19hcm1fZmlmb191bmRl cnJ1bihpbnRlbF9jcnRjLCBuZXdfY3J0Y19zdGF0ZSk7CisJCWludGVsX2NydGNfYXJtX2ZpZm9f dW5kZXJydW4oY3J0YywgbmV3X2NydGNfc3RhdGUpOwogfQogCiAvKioKLS0gCjIuMTkuMQoKX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1h aWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMu ZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4