From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH 07/11] drm/i915: Remove some post-commit members from intel_crtc->atomic. Date: Thu, 22 Oct 2015 13:56:32 +0200 Message-ID: <1445514996-18733-8-git-send-email-maarten.lankhorst@linux.intel.com> References: <1445514996-18733-1-git-send-email-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 E4DD26E43E for ; Thu, 22 Oct 2015 04:56:42 -0700 (PDT) In-Reply-To: <1445514996-18733-1-git-send-email-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 ZmJfYml0cyBpcyB1c2VmdWwgdG8gaGF2ZSBpbiB0aGUgY3J0Y19zdGF0ZSBmb3IgY3MgZmxpcHMg bGF0ZXIgb24sCnNvIGtlZXAgaXQgYWxpdmUgdGhlcmUuIFRoZSBvdGhlciBzdHVmZiBjYW4gYmUg Y2FsY3VsYXRlZCBpbgpwb3N0X3BsYW5lX3VwZGF0ZSwgYW5kIGFyZW4ndCB1c2VmdWwgZWxzZXdo ZXJlLgoKQ3VycmVudGx5IHRoZXJlJ3MgYSBsb29wIGluIHBvc3RfcGxhbmVfdXBkYXRlLCB0aGlz IHNob3VsZCBkaXNhcHBlYXIKd2l0aCB0aGUgY2hhbmdlcyB0byBhdG9taWMgd20ncy4gQXQgdGhh dCBwb2ludCBvbmx5IHVwZGF0ZXMgdG8gdGhlCnByaW1hcnkgcGxhbmUgYXJlIGltcG9ydGFudC4K ClNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51 eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljLmMgIHwg IDEgKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgNTQgKysrKysrKysr KysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k cnYuaCAgICAgfCAgNCArLS0KIDMgZmlsZXMgY2hhbmdlZCwgMzggaW5zZXJ0aW9ucygrKSwgMjEg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRv bWljLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9taWMuYwppbmRleCA5ZDY5Y2Yy NWQ3YzUuLjA1NDU2ZDkwZDZjNyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfYXRvbWljLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljLmMKQEAg LTk2LDYgKzk2LDcgQEAgaW50ZWxfY3J0Y19kdXBsaWNhdGVfc3RhdGUoc3RydWN0IGRybV9jcnRj ICpjcnRjKQogCWNydGNfc3RhdGUtPnVwZGF0ZV9waXBlID0gZmFsc2U7CiAJY3J0Y19zdGF0ZS0+ dmlzaWJsZV9jaGFuZ2VkID0gZmFsc2U7CiAJY3J0Y19zdGF0ZS0+d21fY2hhbmdlZCA9IGZhbHNl OworCWNydGNfc3RhdGUtPmZiX2JpdHMgPSAwOwogCiAJcmV0dXJuICZjcnRjX3N0YXRlLT5iYXNl OwogfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IDMxN2ZmNDA1YWNhOS4u MWNkNzlkOWIzZGExIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNw bGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC00NzQ1 LDE2ICs0NzQ1LDIwIEBAIGludGVsX3ByZV9kaXNhYmxlX3ByaW1hcnkoc3RydWN0IGRybV9jcnRj ICpjcnRjKQogCWhzd19kaXNhYmxlX2lwcyhpbnRlbF9jcnRjKTsKIH0KIAotc3RhdGljIHZvaWQg aW50ZWxfcG9zdF9wbGFuZV91cGRhdGUoc3RydWN0IGludGVsX2NydGMgKmNydGMpCitzdGF0aWMg dm9pZCBpbnRlbF9wb3N0X3BsYW5lX3VwZGF0ZShzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqb2xk X2NydGNfc3RhdGUpCiB7CisJc3RydWN0IGludGVsX2NydGMgKmNydGMgPSB0b19pbnRlbF9jcnRj KG9sZF9jcnRjX3N0YXRlLT5iYXNlLmNydGMpOworCXN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpv bGRfc3RhdGUgPSBvbGRfY3J0Y19zdGF0ZS0+YmFzZS5zdGF0ZTsKIAlzdHJ1Y3QgaW50ZWxfY3J0 Y19hdG9taWNfY29tbWl0ICphdG9taWMgPSAmY3J0Yy0+YXRvbWljOwogCXN0cnVjdCBpbnRlbF9j cnRjX3N0YXRlICpwaXBlX2NvbmZpZyA9CiAJCXRvX2ludGVsX2NydGNfc3RhdGUoY3J0Yy0+YmFz ZS5zdGF0ZSk7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMtPmJhc2UuZGV2OwogCXN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CisJc3Ry dWN0IGRybV9wbGFuZV9zdGF0ZSAqb2xkX3BsYW5lX3N0YXRlOwogCXN0cnVjdCBkcm1fcGxhbmUg KnBsYW5lOworCWludCBpOwogCi0JaW50ZWxfZnJvbnRidWZmZXJfZmxpcChkZXYsIGF0b21pYy0+ ZmJfYml0cyk7CisJaW50ZWxfZnJvbnRidWZmZXJfZmxpcChkZXYsIHBpcGVfY29uZmlnLT5mYl9i aXRzKTsKIAogCWNydGMtPndtLmN4c3JfYWxsb3dlZCA9IHRydWU7CiAKQEAgLTQ3NjQsMTIgKzQ3 NjgsMzQgQEAgc3RhdGljIHZvaWQgaW50ZWxfcG9zdF9wbGFuZV91cGRhdGUoc3RydWN0IGludGVs X2NydGMgKmNydGMpCiAJaWYgKGF0b21pYy0+dXBkYXRlX2ZiYykKIAkJaW50ZWxfZmJjX3VwZGF0 ZShkZXZfcHJpdik7CiAKLQlpZiAoYXRvbWljLT5wb3N0X2VuYWJsZV9wcmltYXJ5KQotCQlpbnRl bF9wb3N0X2VuYWJsZV9wcmltYXJ5KCZjcnRjLT5iYXNlKTsKKwlmb3JfZWFjaF9wbGFuZV9pbl9z dGF0ZShvbGRfc3RhdGUsIHBsYW5lLCBvbGRfcGxhbmVfc3RhdGUsIGkpIHsKKwkJc3RydWN0IGlu dGVsX3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0ZSA9CisJCQl0b19pbnRlbF9wbGFuZV9zdGF0ZShw bGFuZS0+c3RhdGUpOworCisJCWlmIChvbGRfcGxhbmVfc3RhdGUtPmNydGMgIT0gJmNydGMtPmJh c2UgJiYKKwkJICAgIHBsYW5lX3N0YXRlLT5iYXNlLmNydGMgIT0gJmNydGMtPmJhc2UpCisJCQlj b250aW51ZTsKKworCQlzd2l0Y2ggKHBsYW5lLT50eXBlKSB7CisJCWNhc2UgRFJNX1BMQU5FX1RZ UEVfUFJJTUFSWToKKwkJCWlmIChwbGFuZV9zdGF0ZS0+dmlzaWJsZSAmJgorCQkJICAgIChuZWVk c19tb2Rlc2V0KCZwaXBlX2NvbmZpZy0+YmFzZSkgfHwKKwkJCSAgICAgIXRvX2ludGVsX3BsYW5l X3N0YXRlKG9sZF9wbGFuZV9zdGF0ZSktPnZpc2libGUpKQorCQkJCWludGVsX3Bvc3RfZW5hYmxl X3ByaW1hcnkoJmNydGMtPmJhc2UpOworCQkJYnJlYWs7CisKKwkJY2FzZSBEUk1fUExBTkVfVFlQ RV9DVVJTT1I6CisJCQlicmVhazsKIAotCWRybV9mb3JfZWFjaF9wbGFuZV9tYXNrKHBsYW5lLCBk ZXYsIGF0b21pYy0+dXBkYXRlX3Nwcml0ZV93YXRlcm1hcmtzKQotCQlpbnRlbF91cGRhdGVfc3By aXRlX3dhdGVybWFya3MocGxhbmUsICZjcnRjLT5iYXNlLAotCQkJCQkgICAgICAgMCwgMCwgMCwg ZmFsc2UsIGZhbHNlKTsKKwkJY2FzZSBEUk1fUExBTkVfVFlQRV9PVkVSTEFZOgorCQkJaWYgKHRv X2ludGVsX3BsYW5lX3N0YXRlKG9sZF9wbGFuZV9zdGF0ZSktPnZpc2libGUgJiYKKwkJCSAgICAh bmVlZHNfbW9kZXNldCgmcGlwZV9jb25maWctPmJhc2UpICYmCisJCQkgICAgIXBsYW5lX3N0YXRl LT52aXNpYmxlKQorCQkJCWludGVsX3VwZGF0ZV9zcHJpdGVfd2F0ZXJtYXJrcyhwbGFuZSwgJmNy dGMtPmJhc2UsCisJCQkJCQkJICAgICAgIDAsIDAsIDAsIGZhbHNlLCBmYWxzZSk7CisJCQlicmVh azsKKwkJfQorCX0KIAogCW1lbXNldChhdG9taWMsIDAsIHNpemVvZigqYXRvbWljKSk7CiB9CkBA IC0xMTYyMyw3ICsxMTY0OSw2IEBAIGludCBpbnRlbF9wbGFuZV9hdG9taWNfY2FsY19jaGFuZ2Vz KHN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKIAlzdHJ1Y3QgaW50ZWxfcGxhbmVf c3RhdGUgKm9sZF9wbGFuZV9zdGF0ZSA9CiAJCXRvX2ludGVsX3BsYW5lX3N0YXRlKHBsYW5lLT5z dGF0ZSk7CiAJaW50IGlkeCA9IGludGVsX2NydGMtPmJhc2UuYmFzZS5pZCwgcmV0OwotCWludCBp ID0gZHJtX3BsYW5lX2luZGV4KHBsYW5lKTsKIAlib29sIG1vZGVfY2hhbmdlZCA9IG5lZWRzX21v ZGVzZXQoY3J0Y19zdGF0ZSk7CiAJYm9vbCB3YXNfY3J0Y19lbmFibGVkID0gY3J0Yy0+c3RhdGUt PmFjdGl2ZTsKIAlib29sIGlzX2NydGNfZW5hYmxlZCA9IGNydGNfc3RhdGUtPmFjdGl2ZTsKQEAg LTExNjc0LDEzICsxMTY5OSwxMCBAQCBpbnQgaW50ZWxfcGxhbmVfYXRvbWljX2NhbGNfY2hhbmdl cyhzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNydGNfc3RhdGUsCiAJCQkgdHVybl9vZmYsIHR1cm5f b24sIG1vZGVfY2hhbmdlZCk7CiAKIAlpZiAodmlzaWJsZSB8fCB3YXNfdmlzaWJsZSkKLQkJaW50 ZWxfY3J0Yy0+YXRvbWljLmZiX2JpdHMgfD0KLQkJCXRvX2ludGVsX3BsYW5lKHBsYW5lKS0+ZnJv bnRidWZmZXJfYml0OworCQlwaXBlX2NvbmZpZy0+ZmJfYml0cyB8PSB0b19pbnRlbF9wbGFuZShw bGFuZSktPmZyb250YnVmZmVyX2JpdDsKIAogCXN3aXRjaCAocGxhbmUtPnR5cGUpIHsKIAljYXNl IERSTV9QTEFORV9UWVBFX1BSSU1BUlk6Ci0JCWludGVsX2NydGMtPmF0b21pYy5wb3N0X2VuYWJs ZV9wcmltYXJ5ID0gdHVybl9vbjsKLQogCQlpZiAodHVybl9vZmYpCiAJCQlpbnRlbF9jcnRjLT5h dG9taWMuZGlzYWJsZV9mYmMgPSB0cnVlOwogCkBAIC0xMTcwNCwxMiArMTE3MjYsOCBAQCBpbnQg aW50ZWxfcGxhbmVfYXRvbWljX2NhbGNfY2hhbmdlcyhzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNy dGNfc3RhdGUsCiAJCWludGVsX2NydGMtPmF0b21pYy51cGRhdGVfZmJjIHw9IHZpc2libGUgfHwg bW9kZV9jaGFuZ2VkOwogCQlicmVhazsKIAljYXNlIERSTV9QTEFORV9UWVBFX0NVUlNPUjoKLQkJ YnJlYWs7CiAJY2FzZSBEUk1fUExBTkVfVFlQRV9PVkVSTEFZOgotCQlpZiAodHVybl9vZmYgJiYg IW1vZGVfY2hhbmdlZCkgewotCQkJaW50ZWxfY3J0Yy0+YXRvbWljLnVwZGF0ZV9zcHJpdGVfd2F0 ZXJtYXJrcyB8PQotCQkJCTEgPDwgaTsKLQkJfQorCQlicmVhazsKIAl9CiAJcmV0dXJuIDA7CiB9 CkBAIC0xMzI1Myw3ICsxMzI3MSw3IEBAIHN0YXRpYyBpbnQgaW50ZWxfYXRvbWljX2NvbW1pdChz dHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCWRybV9hdG9taWNfaGVscGVyX3dhaXRfZm9yX3ZibGFu a3MoZGV2LCBzdGF0ZSk7CiAKIAlmb3JfZWFjaF9jcnRjX2luX3N0YXRlKHN0YXRlLCBjcnRjLCBj cnRjX3N0YXRlLCBpKQotCQlpbnRlbF9wb3N0X3BsYW5lX3VwZGF0ZSh0b19pbnRlbF9jcnRjKGNy dGMpKTsKKwkJaW50ZWxfcG9zdF9wbGFuZV91cGRhdGUodG9faW50ZWxfY3J0Y19zdGF0ZShjcnRj X3N0YXRlKSk7CiAKIAltdXRleF9sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7CiAJZHJtX2F0b21p Y19oZWxwZXJfY2xlYW51cF9wbGFuZXMoZGV2LCBzdGF0ZSk7CmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Ry di5oCmluZGV4IGU5ZTQ4NTMzNmM5MC4uNzVjZmQ4YzdiOTgxIDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kcnYuaApAQCAtMzUyLDYgKzM1Miw3IEBAIHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlIHsKICNk ZWZpbmUgUElQRV9DT05GSUdfUVVJUktfTU9ERV9TWU5DX0ZMQUdTCSgxPDwwKSAvKiB1bnJlbGlh YmxlIHN5bmMgbW9kZS5mbGFncyAqLwogCXVuc2lnbmVkIGxvbmcgcXVpcmtzOwogCisJdW5zaWdu ZWQgZmJfYml0czsgLyogZnJhbWVidWZmZXJzIHRvIGZsaXAgKi8KIAlib29sIHVwZGF0ZV9waXBl OyAvKiBjYW4gYSBmYXN0IG1vZGVzZXQgYmUgcGVyZm9ybWVkPyAqLwogCWJvb2wgdmlzaWJsZV9j aGFuZ2VkOyAvKiBwbGFuZSB2aXNpYmlsaXR5IGNoYW5nZWQgKi8KIAlib29sIHdtX2NoYW5nZWQ7 IC8qIHdtIGNoYW5nZWQgKi8KQEAgLTUxOSwxMCArNTIwLDcgQEAgc3RydWN0IGludGVsX2NydGNf YXRvbWljX2NvbW1pdCB7CiAJYm9vbCBkaXNhYmxlX2ZiYzsKIAogCS8qIFNsZWVwYWJsZSBvcGVy YXRpb25zIHRvIHBlcmZvcm0gYWZ0ZXIgY29tbWl0ICovCi0JdW5zaWduZWQgZmJfYml0czsKIAli b29sIHVwZGF0ZV9mYmM7Ci0JYm9vbCBwb3N0X2VuYWJsZV9wcmltYXJ5OwotCXVuc2lnbmVkIHVw ZGF0ZV9zcHJpdGVfd2F0ZXJtYXJrczsKIH07CiAKIHN0cnVjdCBpbnRlbF9jcnRjIHsKLS0gCjIu MS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRl bC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDov L2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=