From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH 08/11] drm/i915: Nuke fbc members from intel_crtc->atomic. Date: Thu, 22 Oct 2015 13:56:33 +0200 Message-ID: <1445514996-18733-9-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 D6B786E3F6 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 VGhpcyBsZWF2ZXMgaW50ZWxfY3J0Yy0+YXRvbWljIGVtcHR5LCBzbyB6YXAgaXQgYXMgd2VsbC4K ClNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51 eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwg NjMgKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kcnYuaCAgICAgfCAxNiAtLS0tLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgMjMg aW5zZXJ0aW9ucygrKSwgNTYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlz cGxheS5jCmluZGV4IDFjZDc5ZDliM2RhMS4uNmY5MmNjZjI0NjFjIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZGlzcGxheS5jCkBAIC00NzQ5LDcgKzQ3NDksNiBAQCBzdGF0aWMgdm9pZCBpbnRl bF9wb3N0X3BsYW5lX3VwZGF0ZShzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqb2xkX2NydGNfc3Rh dGUpCiB7CiAJc3RydWN0IGludGVsX2NydGMgKmNydGMgPSB0b19pbnRlbF9jcnRjKG9sZF9jcnRj X3N0YXRlLT5iYXNlLmNydGMpOwogCXN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpvbGRfc3RhdGUg PSBvbGRfY3J0Y19zdGF0ZS0+YmFzZS5zdGF0ZTsKLQlzdHJ1Y3QgaW50ZWxfY3J0Y19hdG9taWNf Y29tbWl0ICphdG9taWMgPSAmY3J0Yy0+YXRvbWljOwogCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRl ICpwaXBlX2NvbmZpZyA9CiAJCXRvX2ludGVsX2NydGNfc3RhdGUoY3J0Yy0+YmFzZS5zdGF0ZSk7 CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMtPmJhc2UuZGV2OwpAQCAtNDc2NSw5ICs0 NzY0LDYgQEAgc3RhdGljIHZvaWQgaW50ZWxfcG9zdF9wbGFuZV91cGRhdGUoc3RydWN0IGludGVs X2NydGNfc3RhdGUgKm9sZF9jcnRjX3N0YXRlKQogCWlmIChwaXBlX2NvbmZpZy0+d21fY2hhbmdl ZCkKIAkJaW50ZWxfdXBkYXRlX3dhdGVybWFya3MoJmNydGMtPmJhc2UpOwogCi0JaWYgKGF0b21p Yy0+dXBkYXRlX2ZiYykKLQkJaW50ZWxfZmJjX3VwZGF0ZShkZXZfcHJpdik7Ci0KIAlmb3JfZWFj aF9wbGFuZV9pbl9zdGF0ZShvbGRfc3RhdGUsIHBsYW5lLCBvbGRfcGxhbmVfc3RhdGUsIGkpIHsK IAkJc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0ZSA9CiAJCQl0b19pbnRlbF9w bGFuZV9zdGF0ZShwbGFuZS0+c3RhdGUpOwpAQCAtNDc4Miw2ICs0Nzc4LDkgQEAgc3RhdGljIHZv aWQgaW50ZWxfcG9zdF9wbGFuZV91cGRhdGUoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKm9sZF9j cnRjX3N0YXRlKQogCQkJICAgIChuZWVkc19tb2Rlc2V0KCZwaXBlX2NvbmZpZy0+YmFzZSkgfHwK IAkJCSAgICAgIXRvX2ludGVsX3BsYW5lX3N0YXRlKG9sZF9wbGFuZV9zdGF0ZSktPnZpc2libGUp KQogCQkJCWludGVsX3Bvc3RfZW5hYmxlX3ByaW1hcnkoJmNydGMtPmJhc2UpOworCisJCQlpZiAo cGxhbmVfc3RhdGUtPnZpc2libGUpCisJCQkJaW50ZWxfZmJjX3VwZGF0ZShkZXZfcHJpdik7CiAJ CQlicmVhazsKIAogCQljYXNlIERSTV9QTEFORV9UWVBFX0NVUlNPUjoKQEAgLTQ3OTYsOCArNDc5 NSw2IEBAIHN0YXRpYyB2b2lkIGludGVsX3Bvc3RfcGxhbmVfdXBkYXRlKHN0cnVjdCBpbnRlbF9j cnRjX3N0YXRlICpvbGRfY3J0Y19zdGF0ZSkKIAkJCWJyZWFrOwogCQl9CiAJfQotCi0JbWVtc2V0 KGF0b21pYywgMCwgc2l6ZW9mKCphdG9taWMpKTsKIH0KIAogc3RhdGljIHZvaWQgaW50ZWxfcHJl X3BsYW5lX3VwZGF0ZShzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqb2xkX2NydGNfc3RhdGUpCkBA IC00ODA1LDcgKzQ4MDIsNiBAQCBzdGF0aWMgdm9pZCBpbnRlbF9wcmVfcGxhbmVfdXBkYXRlKHN0 cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpvbGRfY3J0Y19zdGF0ZSkKIAlzdHJ1Y3QgaW50ZWxfY3J0 YyAqY3J0YyA9IHRvX2ludGVsX2NydGMob2xkX2NydGNfc3RhdGUtPmJhc2UuY3J0Yyk7CiAJc3Ry dWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMtPmJhc2UuZGV2OwogCXN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7Ci0Jc3RydWN0IGludGVsX2NydGNf YXRvbWljX2NvbW1pdCAqYXRvbWljID0gJmNydGMtPmF0b21pYzsKIAlzdHJ1Y3QgaW50ZWxfY3J0 Y19zdGF0ZSAqcGlwZV9jb25maWcgPQogCQl0b19pbnRlbF9jcnRjX3N0YXRlKGNydGMtPmJhc2Uu c3RhdGUpOwogCXN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpvbGRfc3RhdGUgPSBvbGRfY3J0Y19z dGF0ZS0+YmFzZS5zdGF0ZTsKQEAgLTQ4MTQsOSArNDgxMCw2IEBAIHN0YXRpYyB2b2lkIGludGVs X3ByZV9wbGFuZV91cGRhdGUoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKm9sZF9jcnRjX3N0YXRl KQogCQlkcm1fYXRvbWljX2dldF9leGlzdGluZ19wbGFuZV9zdGF0ZShvbGRfc3RhdGUsIHByaW1h cnkpOwogCWJvb2wgbW9kZXNldCA9IG5lZWRzX21vZGVzZXQoJnBpcGVfY29uZmlnLT5iYXNlKTsK IAotCWlmIChhdG9taWMtPmRpc2FibGVfZmJjKQotCQlpbnRlbF9mYmNfZGlzYWJsZV9jcnRjKGNy dGMpOwotCiAJaWYgKG9sZF9wcmlfc3RhdGUpIHsKIAkJc3RydWN0IGludGVsX3BsYW5lX3N0YXRl ICpwcmltYXJ5X3N0YXRlID0KIAkJCXRvX2ludGVsX3BsYW5lX3N0YXRlKHByaW1hcnktPnN0YXRl KTsKQEAgLTQ4MjQsOCArNDgxNywyNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9wcmVfcGxhbmVfdXBk YXRlKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpvbGRfY3J0Y19zdGF0ZSkKIAkJCXRvX2ludGVs X3BsYW5lX3N0YXRlKG9sZF9wcmlfc3RhdGUpOwogCiAJCWlmIChvbGRfcHJpbWFyeV9zdGF0ZS0+ dmlzaWJsZSAmJgotCQkgICAgKG1vZGVzZXQgfHwgIXByaW1hcnlfc3RhdGUtPnZpc2libGUpKQor CQkgICAgKG1vZGVzZXQgfHwgIXByaW1hcnlfc3RhdGUtPnZpc2libGUpKSB7CisJCQlpbnRlbF9m YmNfZGlzYWJsZV9jcnRjKGNydGMpOworCiAJCQlpbnRlbF9wcmVfZGlzYWJsZV9wcmltYXJ5KCZj cnRjLT5iYXNlKTsKKwkJfSBlbHNlIGlmIChwcmltYXJ5X3N0YXRlLT52aXNpYmxlICYmCisJCQkg SU5URUxfSU5GTyhkZXZfcHJpdiktPmdlbiA8PSA0ICYmICFJU19HNFgoZGV2X3ByaXYpICYmCisJ CQkgZGV2X3ByaXYtPmZiYy5jcnRjID09IGNydGMgJiYKKwkJCSBwcmltYXJ5X3N0YXRlLT5iYXNl LnJvdGF0aW9uICE9IEJJVChEUk1fUk9UQVRFXzApKSB7CisJCQkvKgorCQkJICogRkJDIGRvZXMg bm90IHdvcmsgb24gc29tZSBwbGF0Zm9ybXMgZm9yIHJvdGF0ZWQKKwkJCSAqIHBsYW5lcywgc28g ZGlzYWJsZSBpdCB3aGVuIHJvdGF0aW9uIGlzIG5vdCAwIGFuZAorCQkJICogdXBkYXRlIGl0IHdo ZW4gcm90YXRpb24gaXMgc2V0IGJhY2sgdG8gMC4KKwkJCSAqCisJCQkgKiBGSVhNRTogVGhpcyBp cyByZWR1bmRhbnQgd2l0aCB0aGUgZmJjIHVwZGF0ZSBkb25lIGluCisJCQkgKiB0aGUgcHJpbWFy eSBwbGFuZSBlbmFibGUgZnVuY3Rpb24gZXhjZXB0IHRoYXQgdGhhdAorCQkJICogb25lIGlzIGRv bmUgdG9vIGxhdGUuIFdlIGV2ZW50dWFsbHkgbmVlZCB0byB1bmlmeQorCQkJICogdGhpcy4KKwkJ CSAqLworCisJCQlpbnRlbF9mYmNfZGlzYWJsZV9jcnRjKGNydGMpOworCQl9CiAJfQogCiAJaWYg KHBpcGVfY29uZmlnLT52aXNpYmxlX2NoYW5nZWQpIHsKQEAgLTExNjQ1LDcgKzExNjU3LDYgQEAg aW50IGludGVsX3BsYW5lX2F0b21pY19jYWxjX2NoYW5nZXMoc3RydWN0IGRybV9jcnRjX3N0YXRl ICpjcnRjX3N0YXRlLAogCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxf Y3J0YyhjcnRjKTsKIAlzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSA9IHBsYW5lX3N0YXRlLT5wbGFu ZTsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+ZGV2OwotCXN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CiAJc3RydWN0IGludGVsX3Bs YW5lX3N0YXRlICpvbGRfcGxhbmVfc3RhdGUgPQogCQl0b19pbnRlbF9wbGFuZV9zdGF0ZShwbGFu ZS0+c3RhdGUpOwogCWludCBpZHggPSBpbnRlbF9jcnRjLT5iYXNlLmJhc2UuaWQsIHJldDsKQEAg LTExNzAxLDM0ICsxMTcxMiw2IEBAIGludCBpbnRlbF9wbGFuZV9hdG9taWNfY2FsY19jaGFuZ2Vz KHN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKIAlpZiAodmlzaWJsZSB8fCB3YXNf dmlzaWJsZSkKIAkJcGlwZV9jb25maWctPmZiX2JpdHMgfD0gdG9faW50ZWxfcGxhbmUocGxhbmUp LT5mcm9udGJ1ZmZlcl9iaXQ7CiAKLQlzd2l0Y2ggKHBsYW5lLT50eXBlKSB7Ci0JY2FzZSBEUk1f UExBTkVfVFlQRV9QUklNQVJZOgotCQlpZiAodHVybl9vZmYpCi0JCQlpbnRlbF9jcnRjLT5hdG9t aWMuZGlzYWJsZV9mYmMgPSB0cnVlOwotCi0JCS8qCi0JCSAqIEZCQyBkb2VzIG5vdCB3b3JrIG9u IHNvbWUgcGxhdGZvcm1zIGZvciByb3RhdGVkCi0JCSAqIHBsYW5lcywgc28gZGlzYWJsZSBpdCB3 aGVuIHJvdGF0aW9uIGlzIG5vdCAwIGFuZAotCQkgKiB1cGRhdGUgaXQgd2hlbiByb3RhdGlvbiBp cyBzZXQgYmFjayB0byAwLgotCQkgKgotCQkgKiBGSVhNRTogVGhpcyBpcyByZWR1bmRhbnQgd2l0 aCB0aGUgZmJjIHVwZGF0ZSBkb25lIGluCi0JCSAqIHRoZSBwcmltYXJ5IHBsYW5lIGVuYWJsZSBm dW5jdGlvbiBleGNlcHQgdGhhdCB0aGF0Ci0JCSAqIG9uZSBpcyBkb25lIHRvbyBsYXRlLiBXZSBl dmVudHVhbGx5IG5lZWQgdG8gdW5pZnkKLQkJICogdGhpcy4KLQkJICovCi0KLQkJaWYgKHZpc2li bGUgJiYKLQkJICAgIElOVEVMX0lORk8oZGV2KS0+Z2VuIDw9IDQgJiYgIUlTX0c0WChkZXYpICYm Ci0JCSAgICBkZXZfcHJpdi0+ZmJjLmNydGMgPT0gaW50ZWxfY3J0YyAmJgotCQkgICAgcGxhbmVf c3RhdGUtPnJvdGF0aW9uICE9IEJJVChEUk1fUk9UQVRFXzApKQotCQkJaW50ZWxfY3J0Yy0+YXRv bWljLmRpc2FibGVfZmJjID0gdHJ1ZTsKLQotCQlpbnRlbF9jcnRjLT5hdG9taWMudXBkYXRlX2Zi YyB8PSB2aXNpYmxlIHx8IG1vZGVfY2hhbmdlZDsKLQkJYnJlYWs7Ci0JY2FzZSBEUk1fUExBTkVf VFlQRV9DVVJTT1I6Ci0JY2FzZSBEUk1fUExBTkVfVFlQRV9PVkVSTEFZOgotCQlicmVhazsKLQl9 CiAJcmV0dXJuIDA7CiB9CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKaW5kZXggNzVjZmQ4Yzdi OTgxLi40MDAxMWY2Mzc5ODAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCkBAIC01MDksMjAg KzUwOSw2IEBAIHN0cnVjdCBza2xfcGlwZV93bSB7CiAJdWludDMyX3QgbGluZXRpbWU7CiB9Owog Ci0vKgotICogVHJhY2tpbmcgb2Ygb3BlcmF0aW9ucyB0aGF0IG5lZWQgdG8gYmUgcGVyZm9ybWVk IGF0IHRoZSBiZWdpbm5pbmcvZW5kIG9mIGFuCi0gKiBhdG9taWMgY29tbWl0LCBvdXRzaWRlIHRo ZSBhdG9taWMgc2VjdGlvbiB3aGVyZSBpbnRlcnJ1cHRzIGFyZSBkaXNhYmxlZC4KLSAqIFRoZXNl IGFyZSBnZW5lcmFsbHkgb3BlcmF0aW9ucyB0aGF0IGdyYWIgbXV0ZXhlcyBvciBtaWdodCBvdGhl cndpc2Ugc2xlZXAKLSAqIGFuZCB0aHVzIGNhbid0IGJlIHJ1biB3aXRoIGludGVycnVwdHMgZGlz YWJsZWQuCi0gKi8KLXN0cnVjdCBpbnRlbF9jcnRjX2F0b21pY19jb21taXQgewotCS8qIFNsZWVw YWJsZSBvcGVyYXRpb25zIHRvIHBlcmZvcm0gYmVmb3JlIGNvbW1pdCAqLwotCWJvb2wgZGlzYWJs ZV9mYmM7Ci0KLQkvKiBTbGVlcGFibGUgb3BlcmF0aW9ucyB0byBwZXJmb3JtIGFmdGVyIGNvbW1p dCAqLwotCWJvb2wgdXBkYXRlX2ZiYzsKLX07Ci0KIHN0cnVjdCBpbnRlbF9jcnRjIHsKIAlzdHJ1 Y3QgZHJtX2NydGMgYmFzZTsKIAllbnVtIHBpcGUgcGlwZTsKQEAgLTU5MCw4ICs1NzYsNiBAQCBz dHJ1Y3QgaW50ZWxfY3J0YyB7CiAJCWludCBzY2FubGluZV9zdGFydDsKIAl9IGRlYnVnOwogCi0J c3RydWN0IGludGVsX2NydGNfYXRvbWljX2NvbW1pdCBhdG9taWM7Ci0KIAkvKiBzY2FsZXJzIGF2 YWlsYWJsZSBvbiB0aGlzIGNydGMgKi8KIAlpbnQgbnVtX3NjYWxlcnM7CiAKLS0gCjIuMS4wCgpf X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZngg bWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3Rz LmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=