From: ville.syrjala@linux.intel.com Subject: [PATCH 09/18] drm/i915: Compute proper intermediate wms for vlv/cvh Date: Thu, 16 Feb 2017 20:07:42 +0200 Message-ID: <20170216180751.3097-10-ville.syrjala@linux.intel.com> References: <20170216180751.3097-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 mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7FBEF6EC08 for ; Thu, 16 Feb 2017 18:08:21 +0000 (UTC) In-Reply-To: <20170216180751.3097-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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClNp bmNlIHRoZSB3YXRlcm1hcmsgcmVnaXN0ZXJzIGFyZW50IGRvdWJsZSBidWZmZXJlZCBvbiBWTFYv Q0hWLCB3ZSdsbApuZWVkIHRvIHBsYXkgYXJvdW5kIHdpdGggaW50ZXJtZWRpYXRlIHdhdGVybWFy a3Mgc2FtZSB3YXMgYXMgd2UgZG8gb24KSUxLLUJEVy4KClRoZSB3YXRlcm1hcmsgcmVnaXN0ZXJz IG9uIFZMVi9DSFYgY29udGFpbiBpbnZlcnRlZCB2YWx1ZXMsIHNvIHRvIGZpbmQKdGhlIGludGVy bWVkaWF0ZSB3YXRlcm1hcmsgdmFsdWUgd2UganVzdCB0YWtlIHRoZSBtaW5pbXVtIG9mIHRoZQph Y3RpdmUgYW5kIG9wdGltYWwgdmFsdWVzLiBUaGlzIGFsc28gbWVhbnMgdGhhdCwgdW5saWtlIElM Sy1CRFcsCnRoZXJlJ3Mgbm8gY2hhbmNlIHRoYXQgd2UnZCBmYWlsIHRvIGZpbmQgYSB3b3JraW5n IGludGVybWVkaWF0ZQp3YXRlcm1hcmtzLiBBcyBsb25nIGFzIGJvdGggdGhlIGFjdGl2ZSBhbmQg b3B0aW1hbCB3YXRlcm1hcmtzIGFyZSB2YWxpZAp0aGUgaW50ZXJtZWRpYXRlIHdhdGVybWFya3Mg d2lsbCBjb21lIG91dCB2YWxpZCBhcyB3ZWxsLgoKU2lnbmVkLW9mZi1ieTogVmlsbGUgU3lyasOk bMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kcnYuaCB8ICAzICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5j ICB8IDU5ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0KIDIgZmlsZXMg Y2hhbmdlZCwgNjAgaW5zZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rydi5oCmluZGV4IGQ3YjlkZGYyMmIzZS4uMWMzMTEwMDQ4MmVmIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kcnYuaApAQCAtNTM1LDcgKzUzNSw4IEBAIHN0cnVjdCBpbnRlbF9jcnRjX3dtX3N0 YXRlIHsKIAkJCS8qIG5vbi1pbnZlcnRlZCBvcHRpbWFsIHdhdGVybWFya3MgKi8KIAkJCXN0cnVj dCB2bHZfcGlwZV93bSBub25pbnZlcnRlZFtOVU1fVkxWX1dNX0xFVkVMU107CiAJCQlzdHJ1Y3Qg dmx2X2ZpZm9fc3RhdGUgZmlmb19zdGF0ZTsKLQkJCS8qIGludmVydGVkIG9wdGltYWwgd2F0ZXJt YXJrcyAqLworCQkJLyogaW52ZXJ0ZWQgaW50ZXJtZWRpYXRlIGFuZCBvcHRpbWFsIHdhdGVybWFy a3MgKi8KKwkJCXN0cnVjdCB2bHZfd21fc3RhdGUgaW50ZXJtZWRpYXRlOwogCQkJc3RydWN0IHZs dl93bV9zdGF0ZSBvcHRpbWFsOwogCQl9IHZsdjsKIAl9OwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfcG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMK aW5kZXggNmVjYWQ5Zjk0OWM3Li5lYzM4NGQ1NTlhYWUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3BtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0u YwpAQCAtMTM5MSw2ICsxMzkxLDQ1IEBAIHN0YXRpYyB2b2lkIHZsdl9hdG9taWNfdXBkYXRlX2Zp Zm8oc3RydWN0IGludGVsX2F0b21pY19zdGF0ZSAqc3RhdGUsCiAKICN1bmRlZiBWTFZfRklGTwog CitzdGF0aWMgaW50IHZsdl9jb21wdXRlX2ludGVybWVkaWF0ZV93bShzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2LAorCQkJCSAgICAgICBzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywKKwkJCQkgICAgICAg c3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpCit7CisJc3RydWN0IHZsdl93bV9z dGF0ZSAqaW50ZXJtZWRpYXRlID0gJmNydGNfc3RhdGUtPndtLnZsdi5pbnRlcm1lZGlhdGU7CisJ Y29uc3Qgc3RydWN0IHZsdl93bV9zdGF0ZSAqb3B0aW1hbCA9ICZjcnRjX3N0YXRlLT53bS52bHYu b3B0aW1hbDsKKwljb25zdCBzdHJ1Y3Qgdmx2X3dtX3N0YXRlICphY3RpdmUgPSAmY3J0Yy0+d20u YWN0aXZlLnZsdjsKKwlpbnQgbGV2ZWw7CisKKwlpbnRlcm1lZGlhdGUtPm51bV9sZXZlbHMgPSBt aW4ob3B0aW1hbC0+bnVtX2xldmVscywgYWN0aXZlLT5udW1fbGV2ZWxzKTsKKwlpbnRlcm1lZGlh dGUtPmN4c3IgPSBvcHRpbWFsLT5jeHNyICYgYWN0aXZlLT5jeHNyOworCisJZm9yIChsZXZlbCA9 IDA7IGxldmVsIDwgaW50ZXJtZWRpYXRlLT5udW1fbGV2ZWxzOyBsZXZlbCsrKSB7CisJCWVudW0g cGxhbmVfaWQgcGxhbmVfaWQ7CisKKwkJZm9yX2VhY2hfcGxhbmVfaWRfb25fY3J0YyhjcnRjLCBw bGFuZV9pZCkgeworCQkJaW50ZXJtZWRpYXRlLT53bVtsZXZlbF0ucGxhbmVbcGxhbmVfaWRdID0K KwkJCQltaW4ob3B0aW1hbC0+d21bbGV2ZWxdLnBsYW5lW3BsYW5lX2lkXSwKKwkJCQkgICAgYWN0 aXZlLT53bVtsZXZlbF0ucGxhbmVbcGxhbmVfaWRdKTsKKwkJfQorCisJCWludGVybWVkaWF0ZS0+ c3JbbGV2ZWxdLnBsYW5lID0gbWluKG9wdGltYWwtPnNyW2xldmVsXS5wbGFuZSwKKwkJCQkJCSAg ICBhY3RpdmUtPnNyW2xldmVsXS5wbGFuZSk7CisJCWludGVybWVkaWF0ZS0+c3JbbGV2ZWxdLmN1 cnNvciA9IG1pbihvcHRpbWFsLT5zcltsZXZlbF0uY3Vyc29yLAorCQkJCQkJICAgICBhY3RpdmUt PnNyW2xldmVsXS5jdXJzb3IpOworCX0KKworCXZsdl9pbnZhbGlkYXRlX3dtcyhjcnRjLCBpbnRl cm1lZGlhdGUsIGxldmVsKTsKKworCS8qCisJICogSWYgb3VyIGludGVybWVkaWF0ZSBXTSBhcmUg aWRlbnRpY2FsIHRvIHRoZSBmaW5hbCBXTSwgdGhlbiB3ZSBjYW4KKwkgKiBvbWl0IHRoZSBwb3N0 LXZibGFuayBwcm9ncmFtbWluZzsgb25seSB1cGRhdGUgaWYgaXQncyBkaWZmZXJlbnQuCisJICov CisJaWYgKG1lbWNtcChpbnRlcm1lZGlhdGUsIG9wdGltYWwsIHNpemVvZigqaW50ZXJtZWRpYXRl KSkgPT0gMCkKKwkJY3J0Y19zdGF0ZS0+d20ubmVlZF9wb3N0dmJsX3VwZGF0ZSA9IGZhbHNlOwor CisJcmV0dXJuIDA7Cit9CisKIHN0YXRpYyB2b2lkIHZsdl9tZXJnZV93bShzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCQkgc3RydWN0IHZsdl93bV92YWx1ZXMgKndtKQogewpA QCAtMTQ4NCw3ICsxNTIzLDIyIEBAIHN0YXRpYyB2b2lkIHZsdl9pbml0aWFsX3dhdGVybWFya3Mo c3RydWN0IGludGVsX2F0b21pY19zdGF0ZSAqc3RhdGUsCiAJc3RydWN0IGludGVsX2NydGMgKmNy dGMgPSB0b19pbnRlbF9jcnRjKGNydGNfc3RhdGUtPmJhc2UuY3J0Yyk7CiAKIAltdXRleF9sb2Nr KCZkZXZfcHJpdi0+d20ud21fbXV0ZXgpOwotCWNydGMtPndtLmFjdGl2ZS52bHYgPSBjcnRjX3N0 YXRlLT53bS52bHYub3B0aW1hbDsKKwljcnRjLT53bS5hY3RpdmUudmx2ID0gY3J0Y19zdGF0ZS0+ d20udmx2LmludGVybWVkaWF0ZTsKKwl2bHZfcHJvZ3JhbV93YXRlcm1hcmtzKGRldl9wcml2KTsK KwltdXRleF91bmxvY2soJmRldl9wcml2LT53bS53bV9tdXRleCk7Cit9CisKK3N0YXRpYyB2b2lk IHZsdl9vcHRpbWl6ZV93YXRlcm1hcmtzKHN0cnVjdCBpbnRlbF9hdG9taWNfc3RhdGUgKnN0YXRl LAorCQkJCSAgICBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSkKK3sKKwlzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGNydGNfc3RhdGUtPmJhc2Uu Y3J0Yy0+ZGV2KTsKKwlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2Ny dGMoY3J0Y19zdGF0ZS0+YmFzZS5jcnRjKTsKKworCWlmICghY3J0Y19zdGF0ZS0+d20ubmVlZF9w b3N0dmJsX3VwZGF0ZSkKKwkJcmV0dXJuOworCisJbXV0ZXhfbG9jaygmZGV2X3ByaXYtPndtLndt X211dGV4KTsKKwlpbnRlbF9jcnRjLT53bS5hY3RpdmUudmx2ID0gY3J0Y19zdGF0ZS0+d20udmx2 Lm9wdGltYWw7CiAJdmx2X3Byb2dyYW1fd2F0ZXJtYXJrcyhkZXZfcHJpdik7CiAJbXV0ZXhfdW5s b2NrKCZkZXZfcHJpdi0+d20ud21fbXV0ZXgpOwogfQpAQCAtNDY4MSw2ICs0NzM1LDcgQEAgdm9p ZCB2bHZfd21fZ2V0X2h3X3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCXZsdl9pbnZh bGlkYXRlX3dtcyhjcnRjLCBhY3RpdmUsIGxldmVsKTsKIAogCQljcnRjX3N0YXRlLT53bS52bHYu b3B0aW1hbCA9ICphY3RpdmU7CisJCWNydGNfc3RhdGUtPndtLnZsdi5pbnRlcm1lZGlhdGUgPSAq YWN0aXZlOwogCiAJCURSTV9ERUJVR19LTVMoIkluaXRpYWwgd2F0ZXJtYXJrczogcGlwZSAlYywg cGxhbmU9JWQsIGN1cnNvcj0lZCwgc3ByaXRlMD0lZCwgc3ByaXRlMT0lZFxuIiwKIAkJCSAgICAg IHBpcGVfbmFtZShwaXBlKSwKQEAgLTc4NDEsNyArNzg5Niw5IEBAIHZvaWQgaW50ZWxfaW5pdF9w bShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJfSBlbHNlIGlmIChJU19WQUxM RVlWSUVXKGRldl9wcml2KSB8fCBJU19DSEVSUllWSUVXKGRldl9wcml2KSkgewogCQl2bHZfc2V0 dXBfd21fbGF0ZW5jeShkZXZfcHJpdik7CiAJCWRldl9wcml2LT5kaXNwbGF5LmNvbXB1dGVfcGlw ZV93bSA9IHZsdl9jb21wdXRlX3BpcGVfd207CisJCWRldl9wcml2LT5kaXNwbGF5LmNvbXB1dGVf aW50ZXJtZWRpYXRlX3dtID0gdmx2X2NvbXB1dGVfaW50ZXJtZWRpYXRlX3dtOwogCQlkZXZfcHJp di0+ZGlzcGxheS5pbml0aWFsX3dhdGVybWFya3MgPSB2bHZfaW5pdGlhbF93YXRlcm1hcmtzOwor CQlkZXZfcHJpdi0+ZGlzcGxheS5vcHRpbWl6ZV93YXRlcm1hcmtzID0gdmx2X29wdGltaXplX3dh dGVybWFya3M7CiAJCWRldl9wcml2LT5kaXNwbGF5LmF0b21pY191cGRhdGVfd2F0ZXJtYXJrcyA9 IHZsdl9hdG9taWNfdXBkYXRlX2ZpZm87CiAJfSBlbHNlIGlmIChJU19QSU5FVklFVyhkZXZfcHJp dikpIHsKIAkJaWYgKCFpbnRlbF9nZXRfY3hzcl9sYXRlbmN5KElTX1BJTkVWSUVXX0coZGV2X3By aXYpLAotLSAKMi4xMC4yCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRl bC1nZngK