From: Matt Roper Subject: [PATCH v2 03/16] drm/i915/gen9: Cache plane data rates in CRTC state Date: Tue, 19 Apr 2016 19:26:10 -0700 Message-ID: <1461119183-14267-4-git-send-email-matthew.d.roper@intel.com> References: <1461119183-14267-1-git-send-email-matthew.d.roper@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTP id D3BE96E8B1 for ; Wed, 20 Apr 2016 02:26:44 +0000 (UTC) In-Reply-To: <1461119183-14267-1-git-send-email-matthew.d.roper@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 VGhpcyB3aWxsIGJlIGltcG9ydGFudCB3aGVuIHdlIHN0YXJ0IGNhbGN1bGF0aW5nIENSVEMgZGF0 YSByYXRlcyBmb3IKaW4tZmxpZ2h0IENSVEMgc3RhdGVzIHNpbmNlIGl0IHdpbGwgYWxsb3cgdXMg dG8gY2FsY3VsYXRlIHRoZSB0b3RhbCBkYXRhCnJhdGUgd2l0aG91dCBuZWVkaW5nIHRvIGdyYWIg dGhlIHBsYW5lIHN0YXRlIGZvciBhbnkgcGxhbmVzIHRoYXQgYXJlbid0CnVwZGF0ZWQgYnkgdGhl IHRyYW5zYWN0aW9uLgoKU2lnbmVkLW9mZi1ieTogTWF0dCBSb3BlciA8bWF0dGhldy5kLnJvcGVy QGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCB8ICA0ICsr CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jICB8IDkyICsrKysrKysrKysrKysrKysr KysrKysrKysrLS0tLS0tLS0tLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgNjMgaW5zZXJ0aW9ucygr KSwgMzMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAppbmRleCBhOTRkNjUx YS4uZTY3NDM4ZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKQEAgLTQyNiw2ICs0MjYsMTAg QEAgc3RydWN0IGludGVsX2NydGNfd21fc3RhdGUgewogCQlzdHJ1Y3QgewogCQkJLyogZ2VuOSsg b25seSBuZWVkcyAxLXN0ZXAgd20gcHJvZ3JhbW1pbmcgKi8KIAkJCXN0cnVjdCBza2xfcGlwZV93 bSBvcHRpbWFsOworCisJCQkvKiBjYWNoZWQgcGxhbmUgZGF0YSByYXRlICovCisJCQl1bnNpZ25l ZCBwbGFuZV9kYXRhX3JhdGVbSTkxNV9NQVhfUExBTkVTXTsKKwkJCXVuc2lnbmVkIHBsYW5lX3lf ZGF0YV9yYXRlW0k5MTVfTUFYX1BMQU5FU107CiAJCX0gc2tsOwogCX07CiAKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9wbS5jCmluZGV4IDdhNGRjOWQuLjdlNGIxNDkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3BtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0u YwpAQCAtMjk0MCw2ICsyOTQwLDE0IEBAIHNrbF9wbGFuZV9yZWxhdGl2ZV9kYXRhX3JhdGUoY29u c3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSwKIAlzdHJ1Y3QgaW50ZWxfcGxhbmVf c3RhdGUgKmludGVsX3BzdGF0ZSA9IHRvX2ludGVsX3BsYW5lX3N0YXRlKHBzdGF0ZSk7CiAJc3Ry dWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIgPSBwc3RhdGUtPmZiOwogCXVpbnQzMl90IHdpZHRoID0g MCwgaGVpZ2h0ID0gMDsKKwl1bnNpZ25lZCBmb3JtYXQgPSBmYiA/IGZiLT5waXhlbF9mb3JtYXQg OiBEUk1fRk9STUFUX1hSR0I4ODg4OworCisJaWYgKCFpbnRlbF9wc3RhdGUtPnZpc2libGUpCisJ CXJldHVybiAwOworCWlmIChwc3RhdGUtPnBsYW5lLT50eXBlID09IERSTV9QTEFORV9UWVBFX0NV UlNPUikKKwkJcmV0dXJuIDA7CisJaWYgKHkgJiYgZm9ybWF0ICE9IERSTV9GT1JNQVRfTlYxMikK KwkJcmV0dXJuIDA7CiAKIAl3aWR0aCA9IGRybV9yZWN0X3dpZHRoKCZpbnRlbF9wc3RhdGUtPnNy YykgPj4gMTY7CiAJaGVpZ2h0ID0gZHJtX3JlY3RfaGVpZ2h0KCZpbnRlbF9wc3RhdGUtPnNyYykg Pj4gMTY7CkBAIC0yOTQ4LDE3ICsyOTU2LDE3IEBAIHNrbF9wbGFuZV9yZWxhdGl2ZV9kYXRhX3Jh dGUoY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSwKIAkJc3dhcCh3aWR0aCwg aGVpZ2h0KTsKIAogCS8qIGZvciBwbGFuYXIgZm9ybWF0ICovCi0JaWYgKGZiLT5waXhlbF9mb3Jt YXQgPT0gRFJNX0ZPUk1BVF9OVjEyKSB7CisJaWYgKGZvcm1hdCA9PSBEUk1fRk9STUFUX05WMTIp IHsKIAkJaWYgKHkpICAvKiB5LXBsYW5lIGRhdGEgcmF0ZSAqLwogCQkJcmV0dXJuIHdpZHRoICog aGVpZ2h0ICoKLQkJCQlkcm1fZm9ybWF0X3BsYW5lX2NwcChmYi0+cGl4ZWxfZm9ybWF0LCAwKTsK KwkJCQlkcm1fZm9ybWF0X3BsYW5lX2NwcChmb3JtYXQsIDApOwogCQllbHNlICAgIC8qIHV2LXBs YW5lIGRhdGEgcmF0ZSAqLwogCQkJcmV0dXJuICh3aWR0aCAvIDIpICogKGhlaWdodCAvIDIpICoK LQkJCQlkcm1fZm9ybWF0X3BsYW5lX2NwcChmYi0+cGl4ZWxfZm9ybWF0LCAxKTsKKwkJCQlkcm1f Zm9ybWF0X3BsYW5lX2NwcChmb3JtYXQsIDEpOwogCX0KIAogCS8qIGZvciBwYWNrZWQgZm9ybWF0 cyAqLwotCXJldHVybiB3aWR0aCAqIGhlaWdodCAqIGRybV9mb3JtYXRfcGxhbmVfY3BwKGZiLT5w aXhlbF9mb3JtYXQsIDApOworCXJldHVybiB3aWR0aCAqIGhlaWdodCAqIGRybV9mb3JtYXRfcGxh bmVfY3BwKGZvcm1hdCwgMCk7CiB9CiAKIC8qCkBAIC0yOTY3LDMyICsyOTc1LDM0IEBAIHNrbF9w bGFuZV9yZWxhdGl2ZV9kYXRhX3JhdGUoY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNz dGF0ZSwKICAqICAgMyAqIDQwOTYgKiA4MTkyICAqIDQgPCAyXjMyCiAgKi8KIHN0YXRpYyB1bnNp Z25lZCBpbnQKLXNrbF9nZXRfdG90YWxfcmVsYXRpdmVfZGF0YV9yYXRlKGNvbnN0IHN0cnVjdCBp bnRlbF9jcnRjX3N0YXRlICpjc3RhdGUpCitza2xfZ2V0X3RvdGFsX3JlbGF0aXZlX2RhdGFfcmF0 ZShzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlKQogewogCXN0cnVjdCBpbnRlbF9jcnRj ICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0Yyhjc3RhdGUtPmJhc2UuY3J0Yyk7CiAJc3RydWN0 IGRybV9kZXZpY2UgKmRldiA9IGludGVsX2NydGMtPmJhc2UuZGV2OwogCWNvbnN0IHN0cnVjdCBp bnRlbF9wbGFuZSAqaW50ZWxfcGxhbmU7Ci0JdW5zaWduZWQgaW50IHRvdGFsX2RhdGFfcmF0ZSA9 IDA7CisJdW5zaWduZWQgaW50IHJhdGUsIHRvdGFsX2RhdGFfcmF0ZSA9IDA7CiAKKwkvKiBDYWxj dWxhdGUgYW5kIGNhY2hlIGRhdGEgcmF0ZSBmb3IgZWFjaCBwbGFuZSAqLwogCWZvcl9lYWNoX2lu dGVsX3BsYW5lX29uX2NydGMoZGV2LCBpbnRlbF9jcnRjLCBpbnRlbF9wbGFuZSkgewogCQljb25z dCBzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpwc3RhdGUgPSBpbnRlbF9wbGFuZS0+YmFzZS5zdGF0 ZTsKKwkJaW50IGlkID0gc2tsX3dtX3BsYW5lX2lkKGludGVsX3BsYW5lKTsKIAotCQlpZiAocHN0 YXRlLT5mYiA9PSBOVUxMKQotCQkJY29udGludWU7CisJCS8qIHBhY2tlZC91diAqLworCQlyYXRl ID0gc2tsX3BsYW5lX3JlbGF0aXZlX2RhdGFfcmF0ZShjc3RhdGUsIHBzdGF0ZSwgMCk7CisJCWNz dGF0ZS0+d20uc2tsLnBsYW5lX2RhdGFfcmF0ZVtpZF0gPSByYXRlOwogCi0JCWlmIChpbnRlbF9w bGFuZS0+YmFzZS50eXBlID09IERSTV9QTEFORV9UWVBFX0NVUlNPUikKLQkJCWNvbnRpbnVlOwor CQkvKiB5LXBsYW5lICovCisJCXJhdGUgPSBza2xfcGxhbmVfcmVsYXRpdmVfZGF0YV9yYXRlKGNz dGF0ZSwgcHN0YXRlLCAxKTsKKwkJY3N0YXRlLT53bS5za2wucGxhbmVfeV9kYXRhX3JhdGVbaWRd ID0gcmF0ZTsKKwl9CiAKLQkJLyogcGFja2VkL3V2ICovCi0JCXRvdGFsX2RhdGFfcmF0ZSArPSBz a2xfcGxhbmVfcmVsYXRpdmVfZGF0YV9yYXRlKGNzdGF0ZSwKLQkJCQkJCQkJcHN0YXRlLAotCQkJ CQkJCQkwKTsKKwkvKiBDYWxjdWxhdGUgQ1JUQydzIHRvdGFsIGRhdGEgcmF0ZSBmcm9tIGNhY2hl ZCB2YWx1ZXMgKi8KKwlmb3JfZWFjaF9pbnRlbF9wbGFuZV9vbl9jcnRjKGRldiwgaW50ZWxfY3J0 YywgaW50ZWxfcGxhbmUpIHsKKwkJaW50IGlkID0gc2tsX3dtX3BsYW5lX2lkKGludGVsX3BsYW5l KTsKIAotCQlpZiAocHN0YXRlLT5mYi0+cGl4ZWxfZm9ybWF0ID09IERSTV9GT1JNQVRfTlYxMikK LQkJCS8qIHktcGxhbmUgKi8KLQkJCXRvdGFsX2RhdGFfcmF0ZSArPSBza2xfcGxhbmVfcmVsYXRp dmVfZGF0YV9yYXRlKGNzdGF0ZSwKLQkJCQkJCQkJCXBzdGF0ZSwKLQkJCQkJCQkJCTEpOworCQkv KiBwYWNrZWQvdXYgKi8KKwkJdG90YWxfZGF0YV9yYXRlICs9IGNzdGF0ZS0+d20uc2tsLnBsYW5l X2RhdGFfcmF0ZVtpZF07CisJCXRvdGFsX2RhdGFfcmF0ZSArPSBjc3RhdGUtPndtLnNrbC5wbGFu ZV95X2RhdGFfcmF0ZVtpZF07CiAJfQogCiAJcmV0dXJuIHRvdGFsX2RhdGFfcmF0ZTsKQEAgLTMw NTYsNiArMzA2Niw4IEBAIHNrbF9hbGxvY2F0ZV9waXBlX2RkYihzdHJ1Y3QgaW50ZWxfY3J0Y19z dGF0ZSAqY3N0YXRlLAogCSAqIEZJWE1FOiB3ZSBtYXkgbm90IGFsbG9jYXRlIGV2ZXJ5IHNpbmds ZSBibG9jayBoZXJlLgogCSAqLwogCXRvdGFsX2RhdGFfcmF0ZSA9IHNrbF9nZXRfdG90YWxfcmVs YXRpdmVfZGF0YV9yYXRlKGNzdGF0ZSk7CisJaWYgKHRvdGFsX2RhdGFfcmF0ZSA9PSAwKQorCQly ZXR1cm47CiAKIAlzdGFydCA9IGFsbG9jLT5zdGFydDsKIAlmb3JfZWFjaF9pbnRlbF9wbGFuZV9v bl9jcnRjKGRldiwgaW50ZWxfY3J0YywgaW50ZWxfcGxhbmUpIHsKQEAgLTMwNzAsNyArMzA4Miw3 IEBAIHNrbF9hbGxvY2F0ZV9waXBlX2RkYihzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRl LAogCQlpZiAocGxhbmUtPnR5cGUgPT0gRFJNX1BMQU5FX1RZUEVfQ1VSU09SKQogCQkJY29udGlu dWU7CiAKLQkJZGF0YV9yYXRlID0gc2tsX3BsYW5lX3JlbGF0aXZlX2RhdGFfcmF0ZShjc3RhdGUs IHBzdGF0ZSwgMCk7CisJCWRhdGFfcmF0ZSA9IGNzdGF0ZS0+d20uc2tsLnBsYW5lX2RhdGFfcmF0 ZVtpZF07CiAKIAkJLyoKIAkJICogYWxsb2NhdGlvbiBmb3IgKHBhY2tlZCBmb3JtYXRzKSBvciAo dXYtcGxhbmUgcGFydCBvZiBwbGFuYXIgZm9ybWF0KToKQEAgLTMwODksMjAgKzMxMDEsMTYgQEAg c2tsX2FsbG9jYXRlX3BpcGVfZGRiKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjc3RhdGUsCiAJ CS8qCiAJCSAqIGFsbG9jYXRpb24gZm9yIHlfcGxhbmUgcGFydCBvZiBwbGFuYXIgZm9ybWF0Ogog CQkgKi8KLQkJaWYgKHBzdGF0ZS0+ZmItPnBpeGVsX2Zvcm1hdCA9PSBEUk1fRk9STUFUX05WMTIp IHsKLQkJCXlfZGF0YV9yYXRlID0gc2tsX3BsYW5lX3JlbGF0aXZlX2RhdGFfcmF0ZShjc3RhdGUs Ci0JCQkJCQkJCSAgIHBzdGF0ZSwKLQkJCQkJCQkJICAgMSk7Ci0JCQl5X3BsYW5lX2Jsb2NrcyA9 IHlfbWluaW11bVtpZF07Ci0JCQl5X3BsYW5lX2Jsb2NrcyArPSBkaXZfdTY0KCh1aW50NjRfdClh bGxvY19zaXplICogeV9kYXRhX3JhdGUsCi0JCQkJCQl0b3RhbF9kYXRhX3JhdGUpOwotCi0JCQlk ZGItPnlfcGxhbmVbcGlwZV1baWRdLnN0YXJ0ID0gc3RhcnQ7Ci0JCQlkZGItPnlfcGxhbmVbcGlw ZV1baWRdLmVuZCA9IHN0YXJ0ICsgeV9wbGFuZV9ibG9ja3M7Ci0KLQkJCXN0YXJ0ICs9IHlfcGxh bmVfYmxvY2tzOwotCQl9CisJCXlfZGF0YV9yYXRlID0gY3N0YXRlLT53bS5za2wucGxhbmVfeV9k YXRhX3JhdGVbaWRdOworCisJCXlfcGxhbmVfYmxvY2tzID0geV9taW5pbXVtW2lkXTsKKwkJeV9w bGFuZV9ibG9ja3MgKz0gZGl2X3U2NCgodWludDY0X3QpYWxsb2Nfc2l6ZSAqIHlfZGF0YV9yYXRl LAorCQkJCQl0b3RhbF9kYXRhX3JhdGUpOwogCisJCWRkYi0+eV9wbGFuZVtwaXBlXVtpZF0uc3Rh cnQgPSBzdGFydDsKKwkJZGRiLT55X3BsYW5lW3BpcGVdW2lkXS5lbmQgPSBzdGFydCArIHlfcGxh bmVfYmxvY2tzOworCisJCXN0YXJ0ICs9IHlfcGxhbmVfYmxvY2tzOwogCX0KIAogfQpAQCAtMzg3 OSwxMCArMzg4NywyOCBAQCB2b2lkIHNrbF93bV9nZXRfaHdfc3RhdGUoc3RydWN0IGRybV9kZXZp Y2UgKmRldikKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9w cml2YXRlOwogCXN0cnVjdCBza2xfZGRiX2FsbG9jYXRpb24gKmRkYiA9ICZkZXZfcHJpdi0+d20u c2tsX2h3LmRkYjsKIAlzdHJ1Y3QgZHJtX2NydGMgKmNydGM7CisJc3RydWN0IGludGVsX2NydGMg KmludGVsX2NydGM7CiAKIAlza2xfZGRiX2dldF9od19zdGF0ZShkZXZfcHJpdiwgZGRiKTsKIAls aXN0X2Zvcl9lYWNoX2VudHJ5KGNydGMsICZkZXYtPm1vZGVfY29uZmlnLmNydGNfbGlzdCwgaGVh ZCkKIAkJc2tsX3BpcGVfd21fZ2V0X2h3X3N0YXRlKGNydGMpOworCisJLyogQ2FsY3VsYXRlIHBs YW5lIGRhdGEgcmF0ZXMgKi8KKwlmb3JfZWFjaF9pbnRlbF9jcnRjKGRldiwgaW50ZWxfY3J0Yykg eworCQlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlID0gaW50ZWxfY3J0Yy0+Y29uZmln OworCQlzdHJ1Y3QgaW50ZWxfcGxhbmUgKmludGVsX3BsYW5lOworCisJCWZvcl9lYWNoX2ludGVs X3BsYW5lX29uX2NydGMoZGV2LCBpbnRlbF9jcnRjLCBpbnRlbF9wbGFuZSkgeworCQkJY29uc3Qg c3RydWN0IGRybV9wbGFuZV9zdGF0ZSAqcHN0YXRlID0KKwkJCQlpbnRlbF9wbGFuZS0+YmFzZS5z dGF0ZTsKKwkJCWludCBpZCA9IHNrbF93bV9wbGFuZV9pZChpbnRlbF9wbGFuZSk7CisKKwkJCWNz dGF0ZS0+d20uc2tsLnBsYW5lX2RhdGFfcmF0ZVtpZF0gPQorCQkJCXNrbF9wbGFuZV9yZWxhdGl2 ZV9kYXRhX3JhdGUoY3N0YXRlLCBwc3RhdGUsIDApOworCQkJY3N0YXRlLT53bS5za2wucGxhbmVf eV9kYXRhX3JhdGVbaWRdID0KKwkJCQlza2xfcGxhbmVfcmVsYXRpdmVfZGF0YV9yYXRlKGNzdGF0 ZSwgcHN0YXRlLCAxKTsKKwkJfQorCX0KIH0KIAogc3RhdGljIHZvaWQgaWxrX3BpcGVfd21fZ2V0 X2h3X3N0YXRlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKLS0gCjIuMS40CgpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0 CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3Rv cC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK