From: Maarten Lankhorst Subject: [PATCH v2 4/4] drm/i915: Calculate vlv/chv intermediate watermarks correctly, v2. Date: Mon, 1 May 2017 15:34:34 +0200 Message-ID: <20170501133434.5683-5-maarten.lankhorst@linux.intel.com> References: <20170501133434.5683-1-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 AB7C389F0B for ; Mon, 1 May 2017 13:34:38 +0000 (UTC) In-Reply-To: <20170501133434.5683-1-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 VGhlIHdhdGVybWFya3MgaXQgc2hvdWxkIGNhbGN1bGF0ZSBhZ2FpbnN0IGFyZSB0aGUgb2xkIG9w dGltYWwgd2F0ZXJtYXJrcy4KVGhlIGN1cnJlbnRseSBhY3RpdmUgY3J0YyB3YXRlcm1hcmtzIGFy ZSBwdXJlIGZpY3Rpb24sIGFuZCBhcmUgaW52YWxpZCBpbgpjYXNlIG9mIGEgbm9uYmxvY2tpbmcg bW9kZXNldCwgcGFnZSBmbGlwIGVuYWJsaW5nL2Rpc2FibGluZyBwbGFuZXMgb3IgYW55Cm90aGVy IHJlYXNvbi4KCldoZW4gdGhlIGNydGMgaXMgZGlzYWJsZWQgb3IgZHVyaW5nIGEgbW9kZXNldCB0 aGUgaW50ZXJtZWRpYXRlIHdhdGVybWFya3MKZG9uJ3QgbmVlZCB0byBiZSBwcm9ncmFtbWVkIHNl cGFyYXRlbHksIGFuZCBjb3VsZCBiZSBkaXJlY3RseSBhc3NpZ25lZAp0byB0aGUgb3B0aW1hbCB3 YXRlcm1hcmtzLgoKQWxzbyByZW5hbWUgY3J0Y19zdGF0ZSB0byBuZXdfY3J0Y19zdGF0ZSwgdG8g ZGlzdGluZ3Vpc2ggaXQgZnJvbSB0aGUgb2xkIHN0YXRlLgoKQ2hhbmdlcyBzaW5jZSB2MToKLSBV c2UgaW50ZWxfYXRvbWljX2dldF9vbGRfY3J0Y19zdGF0ZS4gKHZpbGxlKQoKU2lnbmVkLW9mZi1i eTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4K LS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jIHwgMjAgKysrKysrKysrKysrKyst LS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxNCBpbnNlcnRpb25zKCspLCA2IGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9wbS5jCmluZGV4IDBmMzQ0YjFmZmY0NS4uYTA5Mzk2ZWUxZjNkIDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3BtLmMKQEAgLTE0NTgsMTYgKzE0NTgsMjQgQEAgc3RhdGljIHZv aWQgdmx2X2F0b21pY191cGRhdGVfZmlmbyhzdHJ1Y3QgaW50ZWxfYXRvbWljX3N0YXRlICpzdGF0 ZSwKIAogc3RhdGljIGludCB2bHZfY29tcHV0ZV9pbnRlcm1lZGlhdGVfd20oc3RydWN0IGRybV9k ZXZpY2UgKmRldiwKIAkJCQkgICAgICAgc3RydWN0IGludGVsX2NydGMgKmNydGMsCi0JCQkJICAg ICAgIHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlKQorCQkJCSAgICAgICBzdHJ1 Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqbmV3X2NydGNfc3RhdGUpCiB7Ci0Jc3RydWN0IHZsdl93bV9z dGF0ZSAqaW50ZXJtZWRpYXRlID0gJmNydGNfc3RhdGUtPndtLnZsdi5pbnRlcm1lZGlhdGU7Ci0J Y29uc3Qgc3RydWN0IHZsdl93bV9zdGF0ZSAqb3B0aW1hbCA9ICZjcnRjX3N0YXRlLT53bS52bHYu b3B0aW1hbDsKLQljb25zdCBzdHJ1Y3Qgdmx2X3dtX3N0YXRlICphY3RpdmUgPSAmY3J0Yy0+d20u YWN0aXZlLnZsdjsKKwlzdHJ1Y3Qgdmx2X3dtX3N0YXRlICppbnRlcm1lZGlhdGUgPSAmbmV3X2Ny dGNfc3RhdGUtPndtLnZsdi5pbnRlcm1lZGlhdGU7CisJY29uc3Qgc3RydWN0IHZsdl93bV9zdGF0 ZSAqb3B0aW1hbCA9ICZuZXdfY3J0Y19zdGF0ZS0+d20udmx2Lm9wdGltYWw7CisJY29uc3Qgc3Ry dWN0IGludGVsX2NydGNfc3RhdGUgKm9sZF9jcnRjX3N0YXRlID0KKwkJaW50ZWxfYXRvbWljX2dl dF9vbGRfY3J0Y19zdGF0ZShuZXdfY3J0Y19zdGF0ZS0+YmFzZS5zdGF0ZSwgY3J0Yyk7CisJY29u c3Qgc3RydWN0IHZsdl93bV9zdGF0ZSAqYWN0aXZlID0gJm9sZF9jcnRjX3N0YXRlLT53bS52bHYu b3B0aW1hbDsKIAlpbnQgbGV2ZWw7CiAKKwlpZiAoIW5ld19jcnRjX3N0YXRlLT5iYXNlLmFjdGl2 ZSB8fCBkcm1fYXRvbWljX2NydGNfbmVlZHNfbW9kZXNldCgmbmV3X2NydGNfc3RhdGUtPmJhc2Up KSB7CisJCSppbnRlcm1lZGlhdGUgPSAqb3B0aW1hbDsKKworCQlyZXR1cm4gMDsKKwl9CisKIAlp bnRlcm1lZGlhdGUtPm51bV9sZXZlbHMgPSBtaW4ob3B0aW1hbC0+bnVtX2xldmVscywgYWN0aXZl LT5udW1fbGV2ZWxzKTsKIAlpbnRlcm1lZGlhdGUtPmN4c3IgPSBvcHRpbWFsLT5jeHNyICYmIGFj dGl2ZS0+Y3hzciAmJgotCQkhY3J0Y19zdGF0ZS0+ZGlzYWJsZV9jeHNyOworCQkhbmV3X2NydGNf c3RhdGUtPmRpc2FibGVfY3hzcjsKIAogCWZvciAobGV2ZWwgPSAwOyBsZXZlbCA8IGludGVybWVk aWF0ZS0+bnVtX2xldmVsczsgbGV2ZWwrKykgewogCQllbnVtIHBsYW5lX2lkIHBsYW5lX2lkOwpA QCAtMTQ5MSw3ICsxNDk5LDcgQEAgc3RhdGljIGludCB2bHZfY29tcHV0ZV9pbnRlcm1lZGlhdGVf d20oc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkgKiBvbWl0IHRoZSBwb3N0LXZibGFuayBwcm9n cmFtbWluZzsgb25seSB1cGRhdGUgaWYgaXQncyBkaWZmZXJlbnQuCiAJICovCiAJaWYgKG1lbWNt cChpbnRlcm1lZGlhdGUsIG9wdGltYWwsIHNpemVvZigqaW50ZXJtZWRpYXRlKSkgIT0gMCkKLQkJ Y3J0Y19zdGF0ZS0+d20ubmVlZF9wb3N0dmJsX3VwZGF0ZSA9IHRydWU7CisJCW5ld19jcnRjX3N0 YXRlLT53bS5uZWVkX3Bvc3R2YmxfdXBkYXRlID0gdHJ1ZTsKIAogCXJldHVybiAwOwogfQotLSAK Mi45LjMKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCklu dGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRw czovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=