From: Manasi Navare Subject: [PATCH v2] drm/i915: Nuke drm_crtc_state and use intel_atomic_state instead Date: Fri, 12 Apr 2019 14:22:32 -0700 Message-ID: <20190412212232.13539-1-manasi.d.navare@intel.com> References: <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 mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0C9F689996 for ; Fri, 12 Apr 2019 21:20:18 +0000 (UTC) In-Reply-To: <20190411230254.6357-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 List-Id: intel-gfx@lists.freedesktop.org VGhpcyBpcyBvbmUgb2YgdGhlIHBhdGNoZXMgdG8gc3RhcnQgcmVwbGFjaW5nIGRybSBwb2ludGVy cwphbmQgdXNlIHRoZSBpbnRlbF9hdG9taWNfc3RhdGUgYW5kIGludGVsX2NydGMgdG8gZGVyaXZl CnRoZSBuZWNlc3NhcnkgaW50ZWwgc3RhdGUgdmFyaWFibGVzIHJlcXVpcmVkIGZvciB0aGUgaW50 ZWwKbW9kZXNldCBmdW5jdGlvbnMuCgp2MjoKKiBGbGlwIHRoZSBmdW5jdGlvbiBhcmd1bWVudHMg KFZpbGxlKQoqIFJlbW92ZSBzb21lIHJlbWFpbmluZyBpbnN0YW5jZXMgb2YgZHJtIHBvaW50ZXJz IChWaWxsZSkKKiBVc2Ugb2xkX2NydGNfc3RhdGUgYW5kIG5ld19jcnRjX3N0YXRlIChWaWxsZSkK ClN1Z2dlc3RlZC1ieTogVmlsbGUgU3lyamFsYSA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5j b20+CkNjOiBWaWxsZSBTeXJqYWxhIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KU2ln bmVkLW9mZi1ieTogTWFuYXNpIE5hdmFyZSA8bWFuYXNpLmQubmF2YXJlQGludGVsLmNvbT4KLS0t CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCA2MiArKysrKysrKysrKysr LS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMjkgaW5zZXJ0aW9ucygrKSwgMzMgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxh eS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IGYyOWEzNDhl OGQ3MS4uYWE4NGY1N2NkNjVkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBA IC0xMjUsOCArMTI1LDggQEAgc3RhdGljIHZvaWQgdmx2X3ByZXBhcmVfcGxsKHN0cnVjdCBpbnRl bF9jcnRjICpjcnRjLAogCQkJICAgIGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpwaXBl X2NvbmZpZyk7CiBzdGF0aWMgdm9pZCBjaHZfcHJlcGFyZV9wbGwoc3RydWN0IGludGVsX2NydGMg KmNydGMsCiAJCQkgICAgY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKnBpcGVfY29uZmln KTsKLXN0YXRpYyB2b2lkIGludGVsX2JlZ2luX2NydGNfY29tbWl0KHN0cnVjdCBkcm1fY3J0YyAq LCBzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKik7Ci1zdGF0aWMgdm9pZCBpbnRlbF9maW5pc2hfY3J0 Y19jb21taXQoc3RydWN0IGRybV9jcnRjICosIHN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqKTsKK3N0 YXRpYyB2b2lkIGludGVsX2JlZ2luX2NydGNfY29tbWl0KHN0cnVjdCBpbnRlbF9hdG9taWNfc3Rh dGUgKiwgc3RydWN0IGludGVsX2NydGMgKik7CitzdGF0aWMgdm9pZCBpbnRlbF9maW5pc2hfY3J0 Y19jb21taXQoc3RydWN0IGludGVsX2F0b21pY19zdGF0ZSAqLCBzdHJ1Y3QgaW50ZWxfY3J0YyAq KTsKIHN0YXRpYyB2b2lkIGludGVsX2NydGNfaW5pdF9zY2FsZXJzKHN0cnVjdCBpbnRlbF9jcnRj ICpjcnRjLAogCQkJCSAgICBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSk7CiBz dGF0aWMgdm9pZCBza3lsYWtlX3BmaXRfZW5hYmxlKGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0 YXRlICpjcnRjX3N0YXRlKTsKQEAgLTEzMjczLDE0ICsxMzI3MywxNCBAQCBzdGF0aWMgdm9pZCBp bnRlbF91cGRhdGVfY3J0YyhzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJZWxzZSBpZiAobmV3X3Bs YW5lX3N0YXRlKQogCQlpbnRlbF9mYmNfZW5hYmxlKGludGVsX2NydGMsIHBpcGVfY29uZmlnLCBu ZXdfcGxhbmVfc3RhdGUpOwogCi0JaW50ZWxfYmVnaW5fY3J0Y19jb21taXQoY3J0Yywgb2xkX2Ny dGNfc3RhdGUpOworCWludGVsX2JlZ2luX2NydGNfY29tbWl0KHRvX2ludGVsX2F0b21pY19zdGF0 ZShzdGF0ZSksIGludGVsX2NydGMpOwogCiAJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gOSkK IAkJc2tsX3VwZGF0ZV9wbGFuZXNfb25fY3J0Yyh0b19pbnRlbF9hdG9taWNfc3RhdGUoc3RhdGUp LCBpbnRlbF9jcnRjKTsKIAllbHNlCiAJCWk5eHhfdXBkYXRlX3BsYW5lc19vbl9jcnRjKHRvX2lu dGVsX2F0b21pY19zdGF0ZShzdGF0ZSksIGludGVsX2NydGMpOwogCi0JaW50ZWxfZmluaXNoX2Ny dGNfY29tbWl0KGNydGMsIG9sZF9jcnRjX3N0YXRlKTsKKwlpbnRlbF9maW5pc2hfY3J0Y19jb21t aXQodG9faW50ZWxfYXRvbWljX3N0YXRlKHN0YXRlKSwgaW50ZWxfY3J0Yyk7CiB9CiAKIHN0YXRp YyB2b2lkIGludGVsX3VwZGF0ZV9jcnRjcyhzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUp CkBAIC0xNDA3MCwzOSArMTQwNzAsMzYgQEAgc2tsX21heF9zY2FsZShjb25zdCBzdHJ1Y3QgaW50 ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKIAlyZXR1cm4gbWF4X3NjYWxlOwogfQogCi1zdGF0 aWMgdm9pZCBpbnRlbF9iZWdpbl9jcnRjX2NvbW1pdChzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCi0J CQkJICAgIHN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqb2xkX2NydGNfc3RhdGUpCitzdGF0aWMgdm9p ZCBpbnRlbF9iZWdpbl9jcnRjX2NvbW1pdChzdHJ1Y3QgaW50ZWxfYXRvbWljX3N0YXRlICpzdGF0 ZSwKKwkJCQkgICAgc3RydWN0IGludGVsX2NydGMgKmNydGMpCiB7Ci0Jc3RydWN0IGRybV9kZXZp Y2UgKmRldiA9IGNydGMtPmRldjsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYg PSB0b19pOTE1KGRldik7Ci0Jc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0b19pbnRl bF9jcnRjKGNydGMpOwotCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpvbGRfaW50ZWxfY3N0YXRl ID0KLQkJdG9faW50ZWxfY3J0Y19zdGF0ZShvbGRfY3J0Y19zdGF0ZSk7Ci0Jc3RydWN0IGludGVs X2F0b21pY19zdGF0ZSAqb2xkX2ludGVsX3N0YXRlID0KLQkJdG9faW50ZWxfYXRvbWljX3N0YXRl KG9sZF9jcnRjX3N0YXRlLT5zdGF0ZSk7Ci0Jc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmludGVs X2NzdGF0ZSA9Ci0JCWludGVsX2F0b21pY19nZXRfbmV3X2NydGNfc3RhdGUob2xkX2ludGVsX3N0 YXRlLCBpbnRlbF9jcnRjKTsKLQlib29sIG1vZGVzZXQgPSBuZWVkc19tb2Rlc2V0KCZpbnRlbF9j c3RhdGUtPmJhc2UpOworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5 MTUoY3J0Yy0+YmFzZS5kZXYpOworCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpvbGRfY3J0Y19z dGF0ZSA9CisJCWludGVsX2F0b21pY19nZXRfb2xkX2NydGNfc3RhdGUoc3RhdGUsCisJCQkJCQlj cnRjKTsKKwlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqbmV3X2NydGNfc3RhdGUgPQorCQlpbnRl bF9hdG9taWNfZ2V0X25ld19jcnRjX3N0YXRlKHN0YXRlLCBjcnRjKTsKKwlib29sIG1vZGVzZXQg PSBuZWVkc19tb2Rlc2V0KCZuZXdfY3J0Y19zdGF0ZS0+YmFzZSk7CiAKIAkvKiBQZXJmb3JtIHZi bGFuayBldmFzaW9uIGFyb3VuZCBjb21taXQgb3BlcmF0aW9uICovCi0JaW50ZWxfcGlwZV91cGRh dGVfc3RhcnQoaW50ZWxfY3N0YXRlKTsKKwlpbnRlbF9waXBlX3VwZGF0ZV9zdGFydChuZXdfY3J0 Y19zdGF0ZSk7CiAKIAlpZiAobW9kZXNldCkKIAkJZ290byBvdXQ7CiAKLQlpZiAoaW50ZWxfY3N0 YXRlLT5iYXNlLmNvbG9yX21nbXRfY2hhbmdlZCB8fAotCSAgICBpbnRlbF9jc3RhdGUtPnVwZGF0 ZV9waXBlKQotCQlpbnRlbF9jb2xvcl9jb21taXQoaW50ZWxfY3N0YXRlKTsKKwlpZiAobmV3X2Ny dGNfc3RhdGUtPmJhc2UuY29sb3JfbWdtdF9jaGFuZ2VkIHx8CisJICAgIG5ld19jcnRjX3N0YXRl LT51cGRhdGVfcGlwZSkKKwkJaW50ZWxfY29sb3JfY29tbWl0KG5ld19jcnRjX3N0YXRlKTsKIAot CWlmIChpbnRlbF9jc3RhdGUtPnVwZGF0ZV9waXBlKQotCQlpbnRlbF91cGRhdGVfcGlwZV9jb25m aWcob2xkX2ludGVsX2NzdGF0ZSwgaW50ZWxfY3N0YXRlKTsKKwlpZiAobmV3X2NydGNfc3RhdGUt PnVwZGF0ZV9waXBlKQorCQlpbnRlbF91cGRhdGVfcGlwZV9jb25maWcob2xkX2NydGNfc3RhdGUs IG5ld19jcnRjX3N0YXRlKTsKIAllbHNlIGlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDkpCi0J CXNrbF9kZXRhY2hfc2NhbGVycyhpbnRlbF9jc3RhdGUpOworCQlza2xfZGV0YWNoX3NjYWxlcnMo bmV3X2NydGNfc3RhdGUpOwogCiBvdXQ6CiAJaWYgKGRldl9wcml2LT5kaXNwbGF5LmF0b21pY191 cGRhdGVfd2F0ZXJtYXJrcykKLQkJZGV2X3ByaXYtPmRpc3BsYXkuYXRvbWljX3VwZGF0ZV93YXRl cm1hcmtzKG9sZF9pbnRlbF9zdGF0ZSwKLQkJCQkJCQkgICBpbnRlbF9jc3RhdGUpOworCQlkZXZf cHJpdi0+ZGlzcGxheS5hdG9taWNfdXBkYXRlX3dhdGVybWFya3Moc3RhdGUsCisJCQkJCQkJICAg bmV3X2NydGNfc3RhdGUpOwogfQogCiB2b2lkIGludGVsX2NydGNfYXJtX2ZpZm9fdW5kZXJydW4o c3RydWN0IGludGVsX2NydGMgKmNydGMsCkBAIC0xNDEyMSwyMSArMTQxMTgsMjAgQEAgdm9pZCBp bnRlbF9jcnRjX2FybV9maWZvX3VuZGVycnVuKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAogCX0K IH0KIAotc3RhdGljIHZvaWQgaW50ZWxfZmluaXNoX2NydGNfY29tbWl0KHN0cnVjdCBkcm1fY3J0 YyAqY3J0YywKLQkJCQkgICAgIHN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqb2xkX2NydGNfc3RhdGUp CitzdGF0aWMgdm9pZCBpbnRlbF9maW5pc2hfY3J0Y19jb21taXQoc3RydWN0IGludGVsX2F0b21p Y19zdGF0ZSAqc3RhdGUsCisJCQkJICAgICBzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKIHsKLQlz dHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7Ci0Jc3Ry dWN0IGludGVsX2F0b21pY19zdGF0ZSAqb2xkX2ludGVsX3N0YXRlID0KLQkJdG9faW50ZWxfYXRv bWljX3N0YXRlKG9sZF9jcnRjX3N0YXRlLT5zdGF0ZSk7CisJc3RydWN0IGludGVsX2NydGNfc3Rh dGUgKm9sZF9jcnRjX3N0YXRlID0KKwkJaW50ZWxfYXRvbWljX2dldF9vbGRfY3J0Y19zdGF0ZShz dGF0ZSwgY3J0Yyk7CiAJc3RydWN0IGludGVsX2NydGNfc3RhdGUgKm5ld19jcnRjX3N0YXRlID0K LQkJaW50ZWxfYXRvbWljX2dldF9uZXdfY3J0Y19zdGF0ZShvbGRfaW50ZWxfc3RhdGUsIGludGVs X2NydGMpOworCQlpbnRlbF9hdG9taWNfZ2V0X25ld19jcnRjX3N0YXRlKHN0YXRlLCBjcnRjKTsK IAogCWludGVsX3BpcGVfdXBkYXRlX2VuZChuZXdfY3J0Y19zdGF0ZSk7CiAKIAlpZiAobmV3X2Ny dGNfc3RhdGUtPnVwZGF0ZV9waXBlICYmCiAJICAgICFuZWVkc19tb2Rlc2V0KCZuZXdfY3J0Y19z dGF0ZS0+YmFzZSkgJiYKLQkgICAgb2xkX2NydGNfc3RhdGUtPm1vZGUucHJpdmF0ZV9mbGFncyAm IEk5MTVfTU9ERV9GTEFHX0lOSEVSSVRFRCkKLQkJaW50ZWxfY3J0Y19hcm1fZmlmb191bmRlcnJ1 bihpbnRlbF9jcnRjLCBuZXdfY3J0Y19zdGF0ZSk7CisJICAgIG9sZF9jcnRjX3N0YXRlLT5iYXNl Lm1vZGUucHJpdmF0ZV9mbGFncyAmIEk5MTVfTU9ERV9GTEFHX0lOSEVSSVRFRCkKKwkJaW50ZWxf Y3J0Y19hcm1fZmlmb191bmRlcnJ1bihjcnRjLCBuZXdfY3J0Y19zdGF0ZSk7CiB9CiAKIC8qKgot LSAKMi4xOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcK aHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZng=