From: Maarten Lankhorst Subject: [PATCH 2/2] drm/i915: Nuke fbc members from intel_crtc->atomic, v4. Date: Wed, 9 Mar 2016 10:35:45 +0100 Message-ID: <1457516145-32117-2-git-send-email-maarten.lankhorst@linux.intel.com> References: <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 [IPv6:2a02:2308::216:3eff:fe92:dfa3]) by gabe.freedesktop.org (Postfix) with ESMTPS id EB7476E883 for ; Wed, 9 Mar 2016 09:35:49 +0000 (UTC) In-Reply-To: <1457516145-32117-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 V2hlbmV2ZXIgdGhlcmUncyBhbiB1cGRhdGUgdG8gdGhlIHByaW1hcnkgcGxhbmUsCmZiY19wcmVf dXBkYXRlIGFuZCBmYmNfcG9zdF91cGRhdGUgYXJlIGNhbGxlZC4gS2lsbCBvZmYKaW50ZWxfY3J0 Yy0+YXRvbWljLnVwZGF0ZV9mYmMgYW5kIG5vdyB0aGF0IGludGVsX2NydGMtPmF0b21pYwppcyBl bXB0eSwga2lsbCBpdCBvZmYgdG9vLgoKQ2hhbmdlcyBzaW5jZSB2MToKLSBBZGQgYSBpbnRlbF9m YmNfc3VwcG9ydHNfcm90YXRpb24gaGVscGVyLgpDaGFuZ2VzIHNpbmNlIHYyOgotIFJlbW92ZSBp bnRlbF9mYmNfc3VwcG9ydHNfcm90YXRpb25faGVscGVyLgotIFJlbW92ZSB1bnJlbGF0ZWQgY2hh bmdlcy4KQ2hhbmdlcyBzaW5jZSB2MzoKLSBSZWJhc2UKClNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4g TGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgNTEgKysrKysrKysrKystLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCAgICAgfCAx NSAtLS0tLS0tLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCAxNiBpbnNlcnRpb25zKCspLCA1MCBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5 LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggMmQzMTc1NTYw OGNlLi42ZTZkOGIzNDI1MTcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAg LTQ5MTIsMTEgKzQ5MTIsOSBAQCBzdGF0aWMgdm9pZCBpbnRlbF9wb3N0X3BsYW5lX3VwZGF0ZShz dHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqb2xkX2NydGNfc3RhdGUpCiB7CiAJc3RydWN0IGludGVs X2NydGMgKmNydGMgPSB0b19pbnRlbF9jcnRjKG9sZF9jcnRjX3N0YXRlLT5iYXNlLmNydGMpOwog CXN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpvbGRfc3RhdGUgPSBvbGRfY3J0Y19zdGF0ZS0+YmFz ZS5zdGF0ZTsKLQlzdHJ1Y3QgaW50ZWxfY3J0Y19hdG9taWNfY29tbWl0ICphdG9taWMgPSAmY3J0 Yy0+YXRvbWljOwogCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpwaXBlX2NvbmZpZyA9CiAJCXRv X2ludGVsX2NydGNfc3RhdGUoY3J0Yy0+YmFzZS5zdGF0ZSk7CiAJc3RydWN0IGRybV9kZXZpY2Ug KmRldiA9IGNydGMtPmJhc2UuZGV2OwotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp diA9IGRldi0+ZGV2X3ByaXZhdGU7CiAJc3RydWN0IGRybV9wbGFuZSAqcHJpbWFyeSA9IGNydGMt PmJhc2UucHJpbWFyeTsKIAlzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpvbGRfcHJpX3N0YXRlID0K IAkJZHJtX2F0b21pY19nZXRfZXhpc3RpbmdfcGxhbmVfc3RhdGUob2xkX3N0YXRlLCBwcmltYXJ5 KTsKQEAgLTQ5MjgsMjIgKzQ5MjYsMTkgQEAgc3RhdGljIHZvaWQgaW50ZWxfcG9zdF9wbGFuZV91 cGRhdGUoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKm9sZF9jcnRjX3N0YXRlKQogCWlmIChwaXBl X2NvbmZpZy0+d21fY2hhbmdlZCAmJiBwaXBlX2NvbmZpZy0+YmFzZS5hY3RpdmUpCiAJCWludGVs X3VwZGF0ZV93YXRlcm1hcmtzKCZjcnRjLT5iYXNlKTsKIAotCWlmIChhdG9taWMtPnVwZGF0ZV9m YmMpCi0JCWludGVsX2ZiY19wb3N0X3VwZGF0ZShjcnRjKTsKLQogCWlmIChvbGRfcHJpX3N0YXRl KSB7CiAJCXN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqcHJpbWFyeV9zdGF0ZSA9CiAJCQl0b19p bnRlbF9wbGFuZV9zdGF0ZShwcmltYXJ5LT5zdGF0ZSk7CiAJCXN0cnVjdCBpbnRlbF9wbGFuZV9z dGF0ZSAqb2xkX3ByaW1hcnlfc3RhdGUgPQogCQkJdG9faW50ZWxfcGxhbmVfc3RhdGUob2xkX3By aV9zdGF0ZSk7CiAKKwkJaW50ZWxfZmJjX3Bvc3RfdXBkYXRlKGNydGMpOworCiAJCWlmIChwcmlt YXJ5X3N0YXRlLT52aXNpYmxlICYmCiAJCSAgICAobmVlZHNfbW9kZXNldCgmcGlwZV9jb25maWct PmJhc2UpIHx8CiAJCSAgICAgIW9sZF9wcmltYXJ5X3N0YXRlLT52aXNpYmxlKSkKIAkJCWludGVs X3Bvc3RfZW5hYmxlX3ByaW1hcnkoJmNydGMtPmJhc2UpOwogCX0KLQotCW1lbXNldChhdG9taWMs IDAsIHNpemVvZigqYXRvbWljKSk7CiB9CiAKIHN0YXRpYyB2b2lkIGludGVsX3ByZV9wbGFuZV91 cGRhdGUoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKm9sZF9jcnRjX3N0YXRlKQpAQCAtNDk1MSw3 ICs0OTQ2LDYgQEAgc3RhdGljIHZvaWQgaW50ZWxfcHJlX3BsYW5lX3VwZGF0ZShzdHJ1Y3QgaW50 ZWxfY3J0Y19zdGF0ZSAqb2xkX2NydGNfc3RhdGUpCiAJc3RydWN0IGludGVsX2NydGMgKmNydGMg PSB0b19pbnRlbF9jcnRjKG9sZF9jcnRjX3N0YXRlLT5iYXNlLmNydGMpOwogCXN0cnVjdCBkcm1f ZGV2aWNlICpkZXYgPSBjcnRjLT5iYXNlLmRldjsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwotCXN0cnVjdCBpbnRlbF9jcnRjX2F0b21pY19j b21taXQgKmF0b21pYyA9ICZjcnRjLT5hdG9taWM7CiAJc3RydWN0IGludGVsX2NydGNfc3RhdGUg KnBpcGVfY29uZmlnID0KIAkJdG9faW50ZWxfY3J0Y19zdGF0ZShjcnRjLT5iYXNlLnN0YXRlKTsK IAlzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqb2xkX3N0YXRlID0gb2xkX2NydGNfc3RhdGUtPmJh c2Uuc3RhdGU7CkBAIC00OTYwLDE1ICs0OTU0LDE0IEBAIHN0YXRpYyB2b2lkIGludGVsX3ByZV9w bGFuZV91cGRhdGUoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKm9sZF9jcnRjX3N0YXRlKQogCQlk cm1fYXRvbWljX2dldF9leGlzdGluZ19wbGFuZV9zdGF0ZShvbGRfc3RhdGUsIHByaW1hcnkpOwog CWJvb2wgbW9kZXNldCA9IG5lZWRzX21vZGVzZXQoJnBpcGVfY29uZmlnLT5iYXNlKTsKIAotCWlm IChhdG9taWMtPnVwZGF0ZV9mYmMpCi0JCWludGVsX2ZiY19wcmVfdXBkYXRlKGNydGMpOwotCiAJ aWYgKG9sZF9wcmlfc3RhdGUpIHsKIAkJc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpwcmltYXJ5 X3N0YXRlID0KIAkJCXRvX2ludGVsX3BsYW5lX3N0YXRlKHByaW1hcnktPnN0YXRlKTsKIAkJc3Ry dWN0IGludGVsX3BsYW5lX3N0YXRlICpvbGRfcHJpbWFyeV9zdGF0ZSA9CiAJCQl0b19pbnRlbF9w bGFuZV9zdGF0ZShvbGRfcHJpX3N0YXRlKTsKIAorCQlpbnRlbF9mYmNfcHJlX3VwZGF0ZShjcnRj KTsKKwogCQlpZiAob2xkX3ByaW1hcnlfc3RhdGUtPnZpc2libGUgJiYKIAkJICAgIChtb2Rlc2V0 IHx8ICFwcmltYXJ5X3N0YXRlLT52aXNpYmxlKSkKIAkJCWludGVsX3ByZV9kaXNhYmxlX3ByaW1h cnkoJmNydGMtPmJhc2UpOwpAQCAtMTIwMjcsMjcgKzEyMDIwLDE3IEBAIGludCBpbnRlbF9wbGFu ZV9hdG9taWNfY2FsY19jaGFuZ2VzKHN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwK IAlpZiAodmlzaWJsZSB8fCB3YXNfdmlzaWJsZSkKIAkJcGlwZV9jb25maWctPmZiX2JpdHMgfD0g dG9faW50ZWxfcGxhbmUocGxhbmUpLT5mcm9udGJ1ZmZlcl9iaXQ7CiAKLQlzd2l0Y2ggKHBsYW5l LT50eXBlKSB7Ci0JY2FzZSBEUk1fUExBTkVfVFlQRV9QUklNQVJZOgotCQlpbnRlbF9jcnRjLT5h dG9taWMudXBkYXRlX2ZiYyA9IHRydWU7Ci0KLQkJYnJlYWs7Ci0JY2FzZSBEUk1fUExBTkVfVFlQ RV9DVVJTT1I6Ci0JCWJyZWFrOwotCWNhc2UgRFJNX1BMQU5FX1RZUEVfT1ZFUkxBWToKLQkJLyoK LQkJICogV2FDeFNSRGlzYWJsZWRGb3JTcHJpdGVTY2FsaW5nOml2YgotCQkgKgotCQkgKiBjc3Rh dGUtPnVwZGF0ZV93bSB3YXMgYWxyZWFkeSBzZXQgYWJvdmUsIHNvIHRoaXMgZmxhZyB3aWxsCi0J CSAqIHRha2UgZWZmZWN0IHdoZW4gd2UgY29tbWl0IGFuZCBwcm9ncmFtIHdhdGVybWFya3MuCi0J CSAqLwotCQlpZiAoSVNfSVZZQlJJREdFKGRldikgJiYKLQkJICAgIG5lZWRzX3NjYWxpbmcodG9f aW50ZWxfcGxhbmVfc3RhdGUocGxhbmVfc3RhdGUpKSAmJgotCQkgICAgIW5lZWRzX3NjYWxpbmco b2xkX3BsYW5lX3N0YXRlKSkKLQkJCXBpcGVfY29uZmlnLT5kaXNhYmxlX2xwX3dtID0gdHJ1ZTsK KwkvKgorCSAqIFdhQ3hTUkRpc2FibGVkRm9yU3ByaXRlU2NhbGluZzppdmIKKwkgKgorCSAqIGNz dGF0ZS0+dXBkYXRlX3dtIHdhcyBhbHJlYWR5IHNldCBhYm92ZSwgc28gdGhpcyBmbGFnIHdpbGwK KwkgKiB0YWtlIGVmZmVjdCB3aGVuIHdlIGNvbW1pdCBhbmQgcHJvZ3JhbSB3YXRlcm1hcmtzLgor CSAqLworCWlmIChwbGFuZS0+dHlwZSA9PSBEUk1fUExBTkVfVFlQRV9PVkVSTEFZICYmIElTX0lW WUJSSURHRShkZXYpICYmCisJICAgIG5lZWRzX3NjYWxpbmcodG9faW50ZWxfcGxhbmVfc3RhdGUo cGxhbmVfc3RhdGUpKSAmJgorCSAgICAhbmVlZHNfc2NhbGluZyhvbGRfcGxhbmVfc3RhdGUpKQor CQlwaXBlX2NvbmZpZy0+ZGlzYWJsZV9scF93bSA9IHRydWU7CiAKLQkJYnJlYWs7Ci0JfQogCXJl dHVybiAwOwogfQogCkBAIC0xMzQ3NSw5ICsxMzQ1OCw2IEBAIHN0YXRpYyBpbnQgaW50ZWxfYXRv bWljX2NoZWNrKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCXN0cnVjdCBpbnRlbF9jcnRjX3N0 YXRlICpwaXBlX2NvbmZpZyA9CiAJCQl0b19pbnRlbF9jcnRjX3N0YXRlKGNydGNfc3RhdGUpOwog Ci0JCW1lbXNldCgmdG9faW50ZWxfY3J0YyhjcnRjKS0+YXRvbWljLCAwLAotCQkgICAgICAgc2l6 ZW9mKHN0cnVjdCBpbnRlbF9jcnRjX2F0b21pY19jb21taXQpKTsKLQogCQkvKiBDYXRjaCBJOTE1 X01PREVfRkxBR19JTkhFUklURUQgKi8KIAkJaWYgKGNydGNfc3RhdGUtPm1vZGUucHJpdmF0ZV9m bGFncyAhPSBjcnRjLT5zdGF0ZS0+bW9kZS5wcml2YXRlX2ZsYWdzKQogCQkJY3J0Y19zdGF0ZS0+ bW9kZV9jaGFuZ2VkID0gdHJ1ZTsKQEAgLTEzNzg2LDcgKzEzNzY2LDggQEAgc3RhdGljIGludCBp bnRlbF9hdG9taWNfY29tbWl0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCWlmICghbW9kZXNl dCkKIAkJCWludGVsX3ByZV9wbGFuZV91cGRhdGUodG9faW50ZWxfY3J0Y19zdGF0ZShjcnRjX3N0 YXRlKSk7CiAKLQkJaWYgKGNydGMtPnN0YXRlLT5hY3RpdmUgJiYgaW50ZWxfY3J0Yy0+YXRvbWlj LnVwZGF0ZV9mYmMpCisJCWlmIChjcnRjLT5zdGF0ZS0+YWN0aXZlICYmCisJCSAgICBkcm1fYXRv bWljX2dldF9leGlzdGluZ19wbGFuZV9zdGF0ZShzdGF0ZSwgY3J0Yy0+cHJpbWFyeSkpCiAJCQlp bnRlbF9mYmNfZW5hYmxlKGludGVsX2NydGMpOwogCiAJCWlmIChjcnRjLT5zdGF0ZS0+YWN0aXZl ICYmCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCmluZGV4IDYzODVkYmIwMWFjZS4uZGFlMDRjM2Y4 Y2RhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAorKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaApAQCAtNTk2LDE5ICs1OTYsNiBAQCBzdHJ1 Y3QgaW50ZWxfbW1pb19mbGlwIHsKIAl1bnNpZ25lZCBpbnQgcm90YXRpb247CiB9OwogCi0vKgot ICogVHJhY2tpbmcgb2Ygb3BlcmF0aW9ucyB0aGF0IG5lZWQgdG8gYmUgcGVyZm9ybWVkIGF0IHRo ZSBiZWdpbm5pbmcvZW5kIG9mIGFuCi0gKiBhdG9taWMgY29tbWl0LCBvdXRzaWRlIHRoZSBhdG9t aWMgc2VjdGlvbiB3aGVyZSBpbnRlcnJ1cHRzIGFyZSBkaXNhYmxlZC4KLSAqIFRoZXNlIGFyZSBn ZW5lcmFsbHkgb3BlcmF0aW9ucyB0aGF0IGdyYWIgbXV0ZXhlcyBvciBtaWdodCBvdGhlcndpc2Ug c2xlZXAKLSAqIGFuZCB0aHVzIGNhbid0IGJlIHJ1biB3aXRoIGludGVycnVwdHMgZGlzYWJsZWQu Ci0gKi8KLXN0cnVjdCBpbnRlbF9jcnRjX2F0b21pY19jb21taXQgewotCS8qIFNsZWVwYWJsZSBv cGVyYXRpb25zIHRvIHBlcmZvcm0gYmVmb3JlIGNvbW1pdCAqLwotCi0JLyogU2xlZXBhYmxlIG9w ZXJhdGlvbnMgdG8gcGVyZm9ybSBhZnRlciBjb21taXQgKi8KLQlib29sIHVwZGF0ZV9mYmM7Ci19 OwotCiBzdHJ1Y3QgaW50ZWxfY3J0YyB7CiAJc3RydWN0IGRybV9jcnRjIGJhc2U7CiAJZW51bSBw aXBlIHBpcGU7CkBAIC02NjksOCArNjU2LDYgQEAgc3RydWN0IGludGVsX2NydGMgewogCQlpbnQg c2NhbmxpbmVfc3RhcnQ7CiAJfSBkZWJ1ZzsKIAotCXN0cnVjdCBpbnRlbF9jcnRjX2F0b21pY19j b21taXQgYXRvbWljOwotCiAJLyogc2NhbGVycyBhdmFpbGFibGUgb24gdGhpcyBjcnRjICovCiAJ aW50IG51bV9zY2FsZXJzOwogCi0tIAoyLjEuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlz dHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4v bGlzdGluZm8vaW50ZWwtZ2Z4Cg==