From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH 09/12] drm/i915: Remove some post-commit members from intel_crtc->atomic, v2. Date: Thu, 19 Nov 2015 16:07:22 +0100 Message-ID: <1447945645-32005-10-git-send-email-maarten.lankhorst@linux.intel.com> References: <1447945645-32005-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 533E56E98D for ; Thu, 19 Nov 2015 07:07:38 -0800 (PST) In-Reply-To: <1447945645-32005-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 d2hlbgp0aGUgY29kZSBpcyB1cGRhdGVkIHRvIHVzZSBpbnRlbF9mcm9udGJ1ZmZlcl9mbGlwX3By ZXBhcmUvY29tcGxldGUuClNvIGNhbGN1bGF0ZSBpdCBpbiBhZHZhbmNlIGFuZCBtb3ZlIGl0IHRv IGNydGNfc3RhdGUuIFRoZSBvdGhlciBzdHVmZgpjYW4gYmUgY2FsY3VsYXRlZCBpbiBwb3N0X3Bs YW5lX3VwZGF0ZSwgYW5kIGFyZW4ndCB1c2VmdWwgZWxzZXdoZXJlLgoKQ2hhbmdlcyBzaW5jZSB2 MToKLSBDaGFuZ2luZyB3b3JkaW5nLCByZW1vdmUgY29tbWVudCBhYm91dCBsb29wLgoKU2lnbmVk LW9mZi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVs LmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9taWMuYyAgfCAgMSArCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCAyOSArKysrKysrKysrKysrKysr KysrKy0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggICAgIHwgIDMg Ky0tCiAzIGZpbGVzIGNoYW5nZWQsIDIyIGluc2VydGlvbnMoKyksIDExIGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2F0b21pYy5jIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljLmMKaW5kZXggOGU1NzlhODUwNWFjLi45YTQ1Y2Zm MjY3NjcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2F0b21pYy5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2F0b21pYy5jCkBAIC05OCw2ICs5OCw3IEBA IGludGVsX2NydGNfZHVwbGljYXRlX3N0YXRlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAljcnRj X3N0YXRlLT5kaXNhYmxlX2N4c3IgPSBmYWxzZTsKIAljcnRjX3N0YXRlLT53bV9jaGFuZ2VkID0g ZmFsc2U7CiAJY3J0Y19zdGF0ZS0+ZmJfY2hhbmdlZCA9IGZhbHNlOworCWNydGNfc3RhdGUtPmZi X2JpdHMgPSAwOwogCiAJcmV0dXJuICZjcnRjX3N0YXRlLT5iYXNlOwogfQpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IGQ1Mzk3MDNkZTM2Ny4uOTU1MDFhYmE3ZDIzIDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC00NzMwLDE1ICs0NzMwLDIwIEBAIGlu dGVsX3ByZV9kaXNhYmxlX3ByaW1hcnkoc3RydWN0IGRybV9jcnRjICpjcnRjKQogCWhzd19kaXNh YmxlX2lwcyhpbnRlbF9jcnRjKTsKIH0KIAotc3RhdGljIHZvaWQgaW50ZWxfcG9zdF9wbGFuZV91 cGRhdGUoc3RydWN0IGludGVsX2NydGMgKmNydGMpCitzdGF0aWMgdm9pZCBpbnRlbF9wb3N0X3Bs YW5lX3VwZGF0ZShzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqb2xkX2NydGNfc3RhdGUpCiB7CisJ c3RydWN0IGludGVsX2NydGMgKmNydGMgPSB0b19pbnRlbF9jcnRjKG9sZF9jcnRjX3N0YXRlLT5i YXNlLmNydGMpOworCXN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpvbGRfc3RhdGUgPSBvbGRfY3J0 Y19zdGF0ZS0+YmFzZS5zdGF0ZTsKIAlzdHJ1Y3QgaW50ZWxfY3J0Y19hdG9taWNfY29tbWl0ICph dG9taWMgPSAmY3J0Yy0+YXRvbWljOwogCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpwaXBlX2Nv bmZpZyA9CiAJCXRvX2ludGVsX2NydGNfc3RhdGUoY3J0Yy0+YmFzZS5zdGF0ZSk7CiAJc3RydWN0 IGRybV9kZXZpY2UgKmRldiA9IGNydGMtPmJhc2UuZGV2OwogCXN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CisJc3RydWN0IGRybV9wbGFuZSAqcHJp bWFyeSA9IGNydGMtPmJhc2UucHJpbWFyeTsKKwlzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpvbGRf cHJpX3N0YXRlID0KKwkJZHJtX2F0b21pY19nZXRfZXhpc3RpbmdfcGxhbmVfc3RhdGUob2xkX3N0 YXRlLCBwcmltYXJ5KTsKIAotCWludGVsX2Zyb250YnVmZmVyX2ZsaXAoZGV2LCBhdG9taWMtPmZi X2JpdHMpOworCWludGVsX2Zyb250YnVmZmVyX2ZsaXAoZGV2LCBwaXBlX2NvbmZpZy0+ZmJfYml0 cyk7CiAKIAljcnRjLT53bS5jeHNyX2FsbG93ZWQgPSB0cnVlOwogCkBAIC00NzQ4LDggKzQ3NTMs MTcgQEAgc3RhdGljIHZvaWQgaW50ZWxfcG9zdF9wbGFuZV91cGRhdGUoc3RydWN0IGludGVsX2Ny dGMgKmNydGMpCiAJaWYgKGF0b21pYy0+dXBkYXRlX2ZiYykKIAkJaW50ZWxfZmJjX3VwZGF0ZShk ZXZfcHJpdik7CiAKLQlpZiAoYXRvbWljLT5wb3N0X2VuYWJsZV9wcmltYXJ5KQotCQlpbnRlbF9w b3N0X2VuYWJsZV9wcmltYXJ5KCZjcnRjLT5iYXNlKTsKKwlpZiAob2xkX3ByaV9zdGF0ZSkgewor CQlzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnByaW1hcnlfc3RhdGUgPQorCQkJdG9faW50ZWxf cGxhbmVfc3RhdGUocHJpbWFyeS0+c3RhdGUpOworCQlzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUg Km9sZF9wcmltYXJ5X3N0YXRlID0KKwkJCXRvX2ludGVsX3BsYW5lX3N0YXRlKG9sZF9wcmlfc3Rh dGUpOworCisJCWlmIChwcmltYXJ5X3N0YXRlLT52aXNpYmxlICYmCisJCSAgICAobmVlZHNfbW9k ZXNldCgmcGlwZV9jb25maWctPmJhc2UpIHx8CisJCSAgICAgIW9sZF9wcmltYXJ5X3N0YXRlLT52 aXNpYmxlKSkKKwkJCWludGVsX3Bvc3RfZW5hYmxlX3ByaW1hcnkoJmNydGMtPmJhc2UpOworCX0K IAogCWlmIChuZWVkc19tb2Rlc2V0KCZwaXBlX2NvbmZpZy0+YmFzZSkpCiAJCWludGVsX2Rpc3Bs YXlfcG93ZXJfcHV0KGRldl9wcml2LCBQT1dFUl9ET01BSU5fTU9ERVNFVCk7CkBAIC0xMTcyOSwx MyArMTE3NDMsMTAgQEAgaW50IGludGVsX3BsYW5lX2F0b21pY19jYWxjX2NoYW5nZXMoc3RydWN0 IGRybV9jcnRjX3N0YXRlICpjcnRjX3N0YXRlLAogCX0KIAogCWlmICh2aXNpYmxlIHx8IHdhc192 aXNpYmxlKQotCQlpbnRlbF9jcnRjLT5hdG9taWMuZmJfYml0cyB8PQotCQkJdG9faW50ZWxfcGxh bmUocGxhbmUpLT5mcm9udGJ1ZmZlcl9iaXQ7CisJCXBpcGVfY29uZmlnLT5mYl9iaXRzIHw9IHRv X2ludGVsX3BsYW5lKHBsYW5lKS0+ZnJvbnRidWZmZXJfYml0OwogCiAJc3dpdGNoIChwbGFuZS0+ dHlwZSkgewogCWNhc2UgRFJNX1BMQU5FX1RZUEVfUFJJTUFSWToKLQkJaW50ZWxfY3J0Yy0+YXRv bWljLnBvc3RfZW5hYmxlX3ByaW1hcnkgPSB0dXJuX29uOwotCiAJCWlmICh0dXJuX29mZikKIAkJ CWludGVsX2NydGMtPmF0b21pYy5kaXNhYmxlX2ZiYyA9IHRydWU7CiAKQEAgLTEzNDQ0LDcgKzEz NDU1LDcgQEAgc3RhdGljIGludCBpbnRlbF9hdG9taWNfY29tbWl0KHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYsCiAJaW50ZWxfYXRvbWljX3dhaXRfZm9yX3ZibGFua3MoZGV2LCBkZXZfcHJpdiwgY3J0 Y192YmxhbmtfbWFzayk7CiAKIAlmb3JfZWFjaF9jcnRjX2luX3N0YXRlKHN0YXRlLCBjcnRjLCBj cnRjX3N0YXRlLCBpKQotCQlpbnRlbF9wb3N0X3BsYW5lX3VwZGF0ZSh0b19pbnRlbF9jcnRjKGNy dGMpKTsKKwkJaW50ZWxfcG9zdF9wbGFuZV91cGRhdGUodG9faW50ZWxfY3J0Y19zdGF0ZShjcnRj X3N0YXRlKSk7CiAKIAltdXRleF9sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7CiAJZHJtX2F0b21p Y19oZWxwZXJfY2xlYW51cF9wbGFuZXMoZGV2LCBzdGF0ZSk7CmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Ry di5oCmluZGV4IGU0YWU2MjllNzAwOS4uMzVhZTgyN2FiOTIzIDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kcnYuaApAQCAtMzcwLDYgKzM3MCw3IEBAIHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlIHsKICNk ZWZpbmUgUElQRV9DT05GSUdfUVVJUktfTU9ERV9TWU5DX0ZMQUdTCSgxPDwwKSAvKiB1bnJlbGlh YmxlIHN5bmMgbW9kZS5mbGFncyAqLwogCXVuc2lnbmVkIGxvbmcgcXVpcmtzOwogCisJdW5zaWdu ZWQgZmJfYml0czsgLyogZnJhbWVidWZmZXJzIHRvIGZsaXAgKi8KIAlib29sIHVwZGF0ZV9waXBl OyAvKiBjYW4gYSBmYXN0IG1vZGVzZXQgYmUgcGVyZm9ybWVkPyAqLwogCWJvb2wgZGlzYWJsZV9j eHNyOwogCWJvb2wgd21fY2hhbmdlZDsgLyogd2F0ZXJtYXJrcyBhcmUgdXBkYXRlZCAqLwpAQCAt NTM3LDkgKzUzOCw3IEBAIHN0cnVjdCBpbnRlbF9jcnRjX2F0b21pY19jb21taXQgewogCWJvb2wg ZGlzYWJsZV9mYmM7CiAKIAkvKiBTbGVlcGFibGUgb3BlcmF0aW9ucyB0byBwZXJmb3JtIGFmdGVy IGNvbW1pdCAqLwotCXVuc2lnbmVkIGZiX2JpdHM7CiAJYm9vbCB1cGRhdGVfZmJjOwotCWJvb2wg cG9zdF9lbmFibGVfcHJpbWFyeTsKIH07CiAKIHN0cnVjdCBpbnRlbF9jcnRjIHsKLS0gCjIuMS4w CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1n ZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xp c3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=