From: Ville Syrjala Subject: [PATCH 7/9] drm/i915: Switch fbc over to for_each_new_intel_plane_in_state() Date: Wed, 11 Oct 2017 19:04:53 +0300 Message-ID: <20171011160455.1874-8-ville.syrjala@linux.intel.com> References: <20171011160455.1874-1-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id A13786E6E8 for ; Wed, 11 Oct 2017 16:05:20 +0000 (UTC) In-Reply-To: <20171011160455.1874-1-ville.syrjala@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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClN0 b3AgdXNpbmcgdGhlIG9sZCBmb3JfZWFjaF9pbnRlbF9wbGFuZV9pbl9zdGF0ZSgpIHR5cGUgaXRl cmF0aW9uCm1hY3JvIGFuZCByZXBsYWNlIGl0IHdpdGggZm9yX2VhY2hfbmV3X2ludGVsX3BsYW5l X2luX3N0YXRlKCkuCkFuZCBzaW1pbGFybHkgcmVwbGFjZSBkcm1fYXRvbWljX2dldF9leGlzdGlu Z19jcnRjX3N0YXRlKCkgd2l0aAppbnRlbF9hdG9taWNfZ2V0X25ld19jcnRjX3N0YXRlKCkuIFN3 aXRjaCBvdmVyIHRvIGludGVsXyB0eXBlcwphcyB3ZWxsIHRvIG1ha2UgdGhlIGNvZGUgbGVzcyBj bHV0dGVyZWQuCgpDYzogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4 LmludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxh QGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oICAg ICAgfCAgNyArKystLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCAg MiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggICAgIHwgIDIgKy0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2ZiYy5jICAgICB8IDIzICsrKysrKysrKystLS0tLS0tLS0t LS0tCiA0IGZpbGVzIGNoYW5nZWQsIDE1IGluc2VydGlvbnMoKyksIDE5IGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IGRmMTIwYTM4YWU0Mi4uOWM0NzM1ZGEyMTY5IDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTU2MSwxMyArNTYxLDEzIEBAIHN0cnVjdCBpOTE1 X2hvdHBsdWcgewogCWZvcl9lYWNoX3Bvd2VyX3dlbGxfcmV2KF9fZGV2X3ByaXYsIF9fcG93ZXJf d2VsbCkJCSAgICAgICAgXAogCQlmb3JfZWFjaF9pZiAoKF9fcG93ZXJfd2VsbCktPmRvbWFpbnMg JiAoX19kb21haW5fbWFzaykpCiAKLSNkZWZpbmUgZm9yX2VhY2hfaW50ZWxfcGxhbmVfaW5fc3Rh dGUoX19zdGF0ZSwgcGxhbmUsIHBsYW5lX3N0YXRlLCBfX2kpIFwKKyNkZWZpbmUgZm9yX2VhY2hf bmV3X2ludGVsX3BsYW5lX2luX3N0YXRlKF9fc3RhdGUsIHBsYW5lLCBuZXdfcGxhbmVfc3RhdGUs IF9faSkgXAogCWZvciAoKF9faSkgPSAwOyBcCiAJICAgICAoX19pKSA8IChfX3N0YXRlKS0+YmFz ZS5kZXYtPm1vZGVfY29uZmlnLm51bV90b3RhbF9wbGFuZSAmJiBcCiAJCSAgICAgKChwbGFuZSkg PSB0b19pbnRlbF9wbGFuZSgoX19zdGF0ZSktPmJhc2UucGxhbmVzW19faV0ucHRyKSwgXAotCQkg ICAgICAocGxhbmVfc3RhdGUpID0gdG9faW50ZWxfcGxhbmVfc3RhdGUoKF9fc3RhdGUpLT5iYXNl LnBsYW5lc1tfX2ldLnN0YXRlKSwgMSk7IFwKKwkJICAgICAgKG5ld19wbGFuZV9zdGF0ZSkgPSB0 b19pbnRlbF9wbGFuZV9zdGF0ZSgoX19zdGF0ZSktPmJhc2UucGxhbmVzW19faV0ubmV3X3N0YXRl KSwgMSk7IFwKIAkgICAgIChfX2kpKyspIFwKLQkJZm9yX2VhY2hfaWYgKHBsYW5lX3N0YXRlKQor CQlmb3JfZWFjaF9pZiAocGxhbmUpCiAKICNkZWZpbmUgZm9yX2VhY2hfbmV3X2ludGVsX2NydGNf aW5fc3RhdGUoX19zdGF0ZSwgY3J0YywgbmV3X2NydGNfc3RhdGUsIF9faSkgXAogCWZvciAoKF9f aSkgPSAwOyBcCkBAIC01NzcsNyArNTc3LDYgQEAgc3RydWN0IGk5MTVfaG90cGx1ZyB7CiAJICAg ICAoX19pKSsrKSBcCiAJCWZvcl9lYWNoX2lmIChjcnRjKQogCi0KICNkZWZpbmUgZm9yX2VhY2hf b2xkbmV3X2ludGVsX3BsYW5lX2luX3N0YXRlKF9fc3RhdGUsIHBsYW5lLCBvbGRfcGxhbmVfc3Rh dGUsIG5ld19wbGFuZV9zdGF0ZSwgX19pKSBcCiAJZm9yICgoX19pKSA9IDA7IFwKIAkgICAgIChf X2kpIDwgKF9fc3RhdGUpLT5iYXNlLmRldi0+bW9kZV9jb25maWcubnVtX3RvdGFsX3BsYW5lICYm IFwKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCA4MmJlMjM0MmQxYzYuLmNj ZGZkOTIyZmU1YiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxh eS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtMTIwMjUs NyArMTIwMjUsNyBAQCBzdGF0aWMgaW50IGludGVsX2F0b21pY19jaGVjayhzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2LAogCWlmIChyZXQpCiAJCXJldHVybiByZXQ7CiAKLQlpbnRlbF9mYmNfY2hvb3Nl X2NydGMoZGV2X3ByaXYsIHN0YXRlKTsKKwlpbnRlbF9mYmNfY2hvb3NlX2NydGMoZGV2X3ByaXYs IGludGVsX3N0YXRlKTsKIAlyZXR1cm4gY2FsY193YXRlcm1hcmtfZGF0YShzdGF0ZSk7CiB9CiAK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKaW5kZXggMDgzMTgyNjA0NTNiLi4wODUyYjMzNzEyYjEg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCkBAIC0xNjQ1LDcgKzE2NDUsNyBAQCBzdGF0aWMg aW5saW5lIHZvaWQgaW50ZWxfZmJkZXZfcmVzdG9yZV9tb2RlKHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYpCiAKIC8qIGludGVsX2ZiYy5jICovCiB2b2lkIGludGVsX2ZiY19jaG9vc2VfY3J0YyhzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCi0JCQkgICBzdHJ1Y3QgZHJtX2F0b21pY19z dGF0ZSAqc3RhdGUpOworCQkJICAgc3RydWN0IGludGVsX2F0b21pY19zdGF0ZSAqc3RhdGUpOwog Ym9vbCBpbnRlbF9mYmNfaXNfYWN0aXZlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp dik7CiB2b2lkIGludGVsX2ZiY19wcmVfdXBkYXRlKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAog CQkJICBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2ZiYy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZmJjLmMKaW5kZXggOGUzYTA1NTA1ZjQ5Li4wYjQwYjg5ZjhlMmIgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2ZiYy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2ZiYy5jCkBAIC0xMDUxLDExICsxMDUxLDExIEBAIHZvaWQgaW50ZWxfZmJjX2ZsdXNo KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKICAqIGVuYWJsZSBGQkMgZm9yIHRo ZSBjaG9zZW4gQ1JUQy4gSWYgaXQgZG9lcywgaXQgd2lsbCBzZXQgZGV2X3ByaXYtPmZiYy5jcnRj LgogICovCiB2b2lkIGludGVsX2ZiY19jaG9vc2VfY3J0YyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYsCi0JCQkgICBzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUpCisJCQkg ICBzdHJ1Y3QgaW50ZWxfYXRvbWljX3N0YXRlICpzdGF0ZSkKIHsKIAlzdHJ1Y3QgaW50ZWxfZmJj ICpmYmMgPSAmZGV2X3ByaXYtPmZiYzsKLQlzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZTsKLQlzdHJ1 Y3QgZHJtX3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0ZTsKKwlzdHJ1Y3QgaW50ZWxfcGxhbmUgKnBs YW5lOworCXN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqcGxhbmVfc3RhdGU7CiAJYm9vbCBjcnRj X2Nob3NlbiA9IGZhbHNlOwogCWludCBpOwogCkBAIC0xMDYzLDcgKzEwNjMsNyBAQCB2b2lkIGlu dGVsX2ZiY19jaG9vc2VfY3J0YyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAK IAkvKiBEb2VzIHRoaXMgYXRvbWljIGNvbW1pdCBpbnZvbHZlIHRoZSBDUlRDIGN1cnJlbnRseSB0 aWVkIHRvIEZCQz8gKi8KIAlpZiAoZmJjLT5jcnRjICYmCi0JICAgICFkcm1fYXRvbWljX2dldF9l eGlzdGluZ19jcnRjX3N0YXRlKHN0YXRlLCAmZmJjLT5jcnRjLT5iYXNlKSkKKwkgICAgIWludGVs X2F0b21pY19nZXRfbmV3X2NydGNfc3RhdGUoc3RhdGUsIGZiYy0+Y3J0YykpCiAJCWdvdG8gb3V0 OwogCiAJaWYgKCFpbnRlbF9mYmNfY2FuX2VuYWJsZShkZXZfcHJpdikpCkBAIC0xMDczLDEzICsx MDczLDExIEBAIHZvaWQgaW50ZWxfZmJjX2Nob29zZV9jcnRjKHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdiwKIAkgKiBwbGFuZS4gV2UgY291bGQgZ28gZm9yIGZhbmNpZXIgc2NoZW1l cyBzdWNoIGFzIGNoZWNraW5nIHRoZSBwbGFuZQogCSAqIHNpemUsIGJ1dCB0aGlzIHdvdWxkIGp1 c3QgYWZmZWN0IHRoZSBmZXcgcGxhdGZvcm1zIHRoYXQgZG9uJ3QgdGllIEZCQwogCSAqIHRvIHBp cGUgb3IgcGxhbmUgQS4gKi8KLQlmb3JfZWFjaF9uZXdfcGxhbmVfaW5fc3RhdGUoc3RhdGUsIHBs YW5lLCBwbGFuZV9zdGF0ZSwgaSkgewotCQlzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKmludGVs X3BsYW5lX3N0YXRlID0KLQkJCXRvX2ludGVsX3BsYW5lX3N0YXRlKHBsYW5lX3N0YXRlKTsKLQkJ c3RydWN0IGludGVsX2NydGNfc3RhdGUgKmludGVsX2NydGNfc3RhdGU7Ci0JCXN0cnVjdCBpbnRl bF9jcnRjICpjcnRjID0gdG9faW50ZWxfY3J0YyhwbGFuZV9zdGF0ZS0+Y3J0Yyk7CisJZm9yX2Vh Y2hfbmV3X2ludGVsX3BsYW5lX2luX3N0YXRlKHN0YXRlLCBwbGFuZSwgcGxhbmVfc3RhdGUsIGkp IHsKKwkJc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGU7CisJCXN0cnVjdCBpbnRl bF9jcnRjICpjcnRjID0gdG9faW50ZWxfY3J0YyhwbGFuZV9zdGF0ZS0+YmFzZS5jcnRjKTsKIAot CQlpZiAoIWludGVsX3BsYW5lX3N0YXRlLT5iYXNlLnZpc2libGUpCisJCWlmICghcGxhbmVfc3Rh dGUtPmJhc2UudmlzaWJsZSkKIAkJCWNvbnRpbnVlOwogCiAJCWlmIChmYmNfb25fcGlwZV9hX29u bHkoZGV2X3ByaXYpICYmIGNydGMtPnBpcGUgIT0gUElQRV9BKQpAQCAtMTA4OCwxMCArMTA4Niw5 IEBAIHZvaWQgaW50ZWxfZmJjX2Nob29zZV9jcnRjKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdiwKIAkJaWYgKGZiY19vbl9wbGFuZV9hX29ubHkoZGV2X3ByaXYpICYmIGNydGMtPnBs YW5lICE9IFBMQU5FX0EpCiAJCQljb250aW51ZTsKIAotCQlpbnRlbF9jcnRjX3N0YXRlID0gdG9f aW50ZWxfY3J0Y19zdGF0ZSgKLQkJCWRybV9hdG9taWNfZ2V0X2V4aXN0aW5nX2NydGNfc3RhdGUo c3RhdGUsICZjcnRjLT5iYXNlKSk7CisJCWNydGNfc3RhdGUgPSBpbnRlbF9hdG9taWNfZ2V0X25l d19jcnRjX3N0YXRlKHN0YXRlLCBjcnRjKTsKIAotCQlpbnRlbF9jcnRjX3N0YXRlLT5lbmFibGVf ZmJjID0gdHJ1ZTsKKwkJY3J0Y19zdGF0ZS0+ZW5hYmxlX2ZiYyA9IHRydWU7CiAJCWNydGNfY2hv c2VuID0gdHJ1ZTsKIAkJYnJlYWs7CiAJfQotLSAKMi4xMy42CgpfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVs LWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcv bWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK