From: Maarten Lankhorst Subject: [PATCH 1/2] drm/i915: Remove some post-commit members from intel_crtc->atomic, v3. Date: Wed, 9 Mar 2016 10:35:44 +0100 Message-ID: <1457516145-32117-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 EC8A96E884 for ; Wed, 9 Mar 2016 09:35:49 +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 ZmJfYml0cyBpcyB1c2VmdWwgdG8gaGF2ZSBpbiB0aGUgY3J0Y19zdGF0ZSBmb3IgY3MgZmxpcHMg d2hlbgp0aGUgY29kZSBpcyB1cGRhdGVkIHRvIHVzZSBpbnRlbF9mcm9udGJ1ZmZlcl9mbGlwX3By ZXBhcmUvY29tcGxldGUuClNvIGNhbGN1bGF0ZSBpdCBpbiBhZHZhbmNlIGFuZCBtb3ZlIGl0IHRv IGNydGNfc3RhdGUuIFRoZSBvdGhlciBzdHVmZgpjYW4gYmUgY2FsY3VsYXRlZCBpbiBwb3N0X3Bs YW5lX3VwZGF0ZSwgYW5kIGFyZW4ndCB1c2VmdWwgZWxzZXdoZXJlLgoKQ2hhbmdlcyBzaW5jZSB2 MToKLSBDaGFuZ2luZyB3b3JkaW5nLCByZW1vdmUgY29tbWVudCBhYm91dCBsb29wLgpDaGFuZ2Vz IHNpbmNlIHYyOgotIFJlYmFzZS4KClNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxt YWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+ClJldmlld2VkLWJ5OiBBbmRlciBDb25z ZWx2YW4gZGUgT2xpdmVpcmEgPGNvbnNlbHZhbjJAZ21haWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2F0b21pYy5jICB8ICAxICsKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rpc3BsYXkuYyB8IDI5ICsrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCAgICAgfCAgNSArLS0tLQogMyBmaWxlcyBjaGFuZ2Vk LCAyMyBpbnNlcnRpb25zKCspLCAxMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9taWMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2F0b21pYy5jCmluZGV4IDZhNjYxZTc5NjMyOC4uZTIzZTFlYzZkZjg5IDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9taWMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9hdG9taWMuYwpAQCAtOTksNiArOTksNyBAQCBpbnRlbF9jcnRjX2R1cGxpY2F0 ZV9zdGF0ZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAJY3J0Y19zdGF0ZS0+d21fY2hhbmdlZCA9 IGZhbHNlOwogCWNydGNfc3RhdGUtPmZiX2NoYW5nZWQgPSBmYWxzZTsKIAljcnRjX3N0YXRlLT53 bS5uZWVkX3Bvc3R2YmxfdXBkYXRlID0gZmFsc2U7CisJY3J0Y19zdGF0ZS0+ZmJfYml0cyA9IDA7 CiAKIAlyZXR1cm4gJmNydGNfc3RhdGUtPmJhc2U7CiB9CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k aXNwbGF5LmMKaW5kZXggNjJkMzZhN2IzMzk4Li4yZDMxNzU1NjA4Y2UgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTQ5MDgsMTQgKzQ5MDgsMjAgQEAgaW50ZWxfcHJlX2Rp c2FibGVfcHJpbWFyeShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAJaHN3X2Rpc2FibGVfaXBzKGlu dGVsX2NydGMpOwogfQogCi1zdGF0aWMgdm9pZCBpbnRlbF9wb3N0X3BsYW5lX3VwZGF0ZShzdHJ1 Y3QgaW50ZWxfY3J0YyAqY3J0YykKK3N0YXRpYyB2b2lkIGludGVsX3Bvc3RfcGxhbmVfdXBkYXRl KHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpvbGRfY3J0Y19zdGF0ZSkKIHsKKwlzdHJ1Y3QgaW50 ZWxfY3J0YyAqY3J0YyA9IHRvX2ludGVsX2NydGMob2xkX2NydGNfc3RhdGUtPmJhc2UuY3J0Yyk7 CisJc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKm9sZF9zdGF0ZSA9IG9sZF9jcnRjX3N0YXRlLT5i YXNlLnN0YXRlOwogCXN0cnVjdCBpbnRlbF9jcnRjX2F0b21pY19jb21taXQgKmF0b21pYyA9ICZj cnRjLT5hdG9taWM7CiAJc3RydWN0IGludGVsX2NydGNfc3RhdGUgKnBpcGVfY29uZmlnID0KIAkJ dG9faW50ZWxfY3J0Y19zdGF0ZShjcnRjLT5iYXNlLnN0YXRlKTsKIAlzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2ID0gY3J0Yy0+YmFzZS5kZXY7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKKwlzdHJ1Y3QgZHJtX3BsYW5lICpwcmltYXJ5ID0gY3J0 Yy0+YmFzZS5wcmltYXJ5OworCXN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgKm9sZF9wcmlfc3RhdGUg PQorCQlkcm1fYXRvbWljX2dldF9leGlzdGluZ19wbGFuZV9zdGF0ZShvbGRfc3RhdGUsIHByaW1h cnkpOwogCi0JaW50ZWxfZnJvbnRidWZmZXJfZmxpcChkZXYsIGF0b21pYy0+ZmJfYml0cyk7CisJ aW50ZWxfZnJvbnRidWZmZXJfZmxpcChkZXYsIHBpcGVfY29uZmlnLT5mYl9iaXRzKTsKIAogCWNy dGMtPndtLmN4c3JfYWxsb3dlZCA9IHRydWU7CiAKQEAgLTQ5MjUsOCArNDkzMSwxNyBAQCBzdGF0 aWMgdm9pZCBpbnRlbF9wb3N0X3BsYW5lX3VwZGF0ZShzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykK IAlpZiAoYXRvbWljLT51cGRhdGVfZmJjKQogCQlpbnRlbF9mYmNfcG9zdF91cGRhdGUoY3J0Yyk7 CiAKLQlpZiAoYXRvbWljLT5wb3N0X2VuYWJsZV9wcmltYXJ5KQotCQlpbnRlbF9wb3N0X2VuYWJs ZV9wcmltYXJ5KCZjcnRjLT5iYXNlKTsKKwlpZiAob2xkX3ByaV9zdGF0ZSkgeworCQlzdHJ1Y3Qg aW50ZWxfcGxhbmVfc3RhdGUgKnByaW1hcnlfc3RhdGUgPQorCQkJdG9faW50ZWxfcGxhbmVfc3Rh dGUocHJpbWFyeS0+c3RhdGUpOworCQlzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKm9sZF9wcmlt YXJ5X3N0YXRlID0KKwkJCXRvX2ludGVsX3BsYW5lX3N0YXRlKG9sZF9wcmlfc3RhdGUpOworCisJ CWlmIChwcmltYXJ5X3N0YXRlLT52aXNpYmxlICYmCisJCSAgICAobmVlZHNfbW9kZXNldCgmcGlw ZV9jb25maWctPmJhc2UpIHx8CisJCSAgICAgIW9sZF9wcmltYXJ5X3N0YXRlLT52aXNpYmxlKSkK KwkJCWludGVsX3Bvc3RfZW5hYmxlX3ByaW1hcnkoJmNydGMtPmJhc2UpOworCX0KIAogCW1lbXNl dChhdG9taWMsIDAsIHNpemVvZigqYXRvbWljKSk7CiB9CkBAIC0xMjAxMCwxMiArMTIwMjUsMTAg QEAgaW50IGludGVsX3BsYW5lX2F0b21pY19jYWxjX2NoYW5nZXMoc3RydWN0IGRybV9jcnRjX3N0 YXRlICpjcnRjX3N0YXRlLAogCQl0b19pbnRlbF9jcnRjX3N0YXRlKGNydGNfc3RhdGUpLT53bS5u ZWVkX3Bvc3R2YmxfdXBkYXRlID0gdHJ1ZTsKIAogCWlmICh2aXNpYmxlIHx8IHdhc192aXNpYmxl KQotCQlpbnRlbF9jcnRjLT5hdG9taWMuZmJfYml0cyB8PQotCQkJdG9faW50ZWxfcGxhbmUocGxh bmUpLT5mcm9udGJ1ZmZlcl9iaXQ7CisJCXBpcGVfY29uZmlnLT5mYl9iaXRzIHw9IHRvX2ludGVs X3BsYW5lKHBsYW5lKS0+ZnJvbnRidWZmZXJfYml0OwogCiAJc3dpdGNoIChwbGFuZS0+dHlwZSkg ewogCWNhc2UgRFJNX1BMQU5FX1RZUEVfUFJJTUFSWToKLQkJaW50ZWxfY3J0Yy0+YXRvbWljLnBv c3RfZW5hYmxlX3ByaW1hcnkgPSB0dXJuX29uOwogCQlpbnRlbF9jcnRjLT5hdG9taWMudXBkYXRl X2ZiYyA9IHRydWU7CiAKIAkJYnJlYWs7CkBAIC0xMzc5MCw3ICsxMzgwMyw3IEBAIHN0YXRpYyBp bnQgaW50ZWxfYXRvbWljX2NvbW1pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQlpbnRlbF9h dG9taWNfd2FpdF9mb3JfdmJsYW5rcyhkZXYsIGRldl9wcml2LCBjcnRjX3ZibGFua19tYXNrKTsK IAogCWZvcl9lYWNoX2NydGNfaW5fc3RhdGUoc3RhdGUsIGNydGMsIGNydGNfc3RhdGUsIGkpIHsK LQkJaW50ZWxfcG9zdF9wbGFuZV91cGRhdGUodG9faW50ZWxfY3J0YyhjcnRjKSk7CisJCWludGVs X3Bvc3RfcGxhbmVfdXBkYXRlKHRvX2ludGVsX2NydGNfc3RhdGUoY3J0Y19zdGF0ZSkpOwogCiAJ CWlmIChwdXRfZG9tYWluc1tpXSkKIAkJCW1vZGVzZXRfcHV0X3Bvd2VyX2RvbWFpbnMoZGV2X3By aXYsIHB1dF9kb21haW5zW2ldKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKaW5kZXggN2IyZDY2 ZDhkZDdmLi42Mzg1ZGJiMDFhY2UgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCkBAIC00MTgs NiArNDE4LDcgQEAgc3RydWN0IGludGVsX2NydGNfc3RhdGUgewogI2RlZmluZSBQSVBFX0NPTkZJ R19RVUlSS19NT0RFX1NZTkNfRkxBR1MJKDE8PDApIC8qIHVucmVsaWFibGUgc3luYyBtb2RlLmZs YWdzICovCiAJdW5zaWduZWQgbG9uZyBxdWlya3M7CiAKKwl1bnNpZ25lZCBmYl9iaXRzOyAvKiBm cmFtZWJ1ZmZlcnMgdG8gZmxpcCAqLwogCWJvb2wgdXBkYXRlX3BpcGU7IC8qIGNhbiBhIGZhc3Qg bW9kZXNldCBiZSBwZXJmb3JtZWQ/ICovCiAJYm9vbCBkaXNhYmxlX2N4c3I7CiAJYm9vbCB3bV9j aGFuZ2VkOyAvKiB3YXRlcm1hcmtzIGFyZSB1cGRhdGVkICovCkBAIC02MDUsMTAgKzYwNiw2IEBA IHN0cnVjdCBpbnRlbF9jcnRjX2F0b21pY19jb21taXQgewogCS8qIFNsZWVwYWJsZSBvcGVyYXRp b25zIHRvIHBlcmZvcm0gYmVmb3JlIGNvbW1pdCAqLwogCiAJLyogU2xlZXBhYmxlIG9wZXJhdGlv bnMgdG8gcGVyZm9ybSBhZnRlciBjb21taXQgKi8KLQl1bnNpZ25lZCBmYl9iaXRzOwotCWJvb2wg cG9zdF9lbmFibGVfcHJpbWFyeTsKLQotCS8qIFNsZWVwYWJsZSBvcGVyYXRpb25zIHRvIHBlcmZv cm0gYmVmb3JlIGFuZCBhZnRlciBjb21taXQgKi8KIAlib29sIHVwZGF0ZV9mYmM7CiB9OwogCi0t IAoyLjEuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K SW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0 dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==