From: Maarten Lankhorst Subject: [PATCH 2/2] drm/i915: Calculate vlv/chv intermediate watermarks correctly Date: Mon, 24 Apr 2017 11:30:29 +0200 Message-ID: <1493026229-4930-2-git-send-email-maarten.lankhorst@linux.intel.com> References: <1493026229-4930-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 9A8356E1BE for ; Mon, 24 Apr 2017 09:30:36 +0000 (UTC) In-Reply-To: <1493026229-4930-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 VGhlIHdhdGVybWFya3MgaXQgc2hvdWxkIGNhbGN1bGF0ZSBhZ2FpbnN0IGFyZSB0aGUgb2xkIG9w dGltYWwgd2F0ZXJtYXJrcy4KVGhlIGN1cnJlbnRseSBhY3RpdmUgY3J0YyB3YXRlcm1hcmtzIGFy ZSBwdXJlIGZpY3Rpb24sIGFuZCBhcmUgaW52YWxpZCBpbgpjYXNlIG9mIGEgbm9uYmxvY2tpbmcg bW9kZXNldCwgcGFnZSBmbGlwIGVuYWJsaW5nL2Rpc2FibGluZyBwbGFuZXMgb3IgYW55Cm90aGVy IHJlYXNvbi4KCldoZW4gdGhlIGNydGMgaXMgZGlzYWJsZWQgb3IgZHVyaW5nIGEgbW9kZXNldCB0 aGUgaW50ZXJtZWRpYXRlIHdhdGVybWFya3MKZG9uJ3QgbmVlZCB0byBiZSBwcm9ncmFtbWVkIHNl cGFyYXRlbHksIGFuZCBjb3VsZCBiZSBkaXJlY3RseSBhc3NpZ25lZAp0byB0aGUgb3B0aW1hbCB3 YXRlcm1hcmtzLgoKQWxzbyByZW5hbWUgY3J0Y19zdGF0ZSB0byBuZXdfY3J0Y19zdGF0ZSwgdG8g ZGlzdGluZ3Vpc2ggaXQgZnJvbSB0aGUgb2xkIHN0YXRlLgoKU2lnbmVkLW9mZi1ieTogTWFhcnRl biBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4KQ2M6IFZpbGxl IFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfcG0uYyB8IDIwICsrKysrKysrKysrKysrLS0tLS0tCiAxIGZpbGUg Y2hhbmdlZCwgMTQgaW5zZXJ0aW9ucygrKSwgNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfcG0uYwppbmRleCA3ZGE3MDFkYzNjYWEuLjllZTczZWYxZGQxYiAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9wbS5jCkBAIC0xNDU4LDE2ICsxNDU4LDI0IEBAIHN0YXRpYyB2b2lkIHZsdl9hdG9taWNf dXBkYXRlX2ZpZm8oc3RydWN0IGludGVsX2F0b21pY19zdGF0ZSAqc3RhdGUsCiAKIHN0YXRpYyBp bnQgdmx2X2NvbXB1dGVfaW50ZXJtZWRpYXRlX3dtKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJ CQkJICAgICAgIHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAotCQkJCSAgICAgICBzdHJ1Y3QgaW50 ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSkKKwkJCQkgICAgICAgc3RydWN0IGludGVsX2NydGNf c3RhdGUgKm5ld19jcnRjX3N0YXRlKQogewotCXN0cnVjdCB2bHZfd21fc3RhdGUgKmludGVybWVk aWF0ZSA9ICZjcnRjX3N0YXRlLT53bS52bHYuaW50ZXJtZWRpYXRlOwotCWNvbnN0IHN0cnVjdCB2 bHZfd21fc3RhdGUgKm9wdGltYWwgPSAmY3J0Y19zdGF0ZS0+d20udmx2Lm9wdGltYWw7Ci0JY29u c3Qgc3RydWN0IHZsdl93bV9zdGF0ZSAqYWN0aXZlID0gJmNydGMtPndtLmFjdGl2ZS52bHY7CisJ c3RydWN0IHZsdl93bV9zdGF0ZSAqaW50ZXJtZWRpYXRlID0gJm5ld19jcnRjX3N0YXRlLT53bS52 bHYuaW50ZXJtZWRpYXRlOworCWNvbnN0IHN0cnVjdCB2bHZfd21fc3RhdGUgKm9wdGltYWwgPSAm bmV3X2NydGNfc3RhdGUtPndtLnZsdi5vcHRpbWFsOworCWNvbnN0IHN0cnVjdCBkcm1fY3J0Y19z dGF0ZSAqb2xkX2RybV9jcnRjX3N0YXRlID0KKwkJZHJtX2F0b21pY19nZXRfb2xkX2NydGNfc3Rh dGUobmV3X2NydGNfc3RhdGUtPmJhc2Uuc3RhdGUsICZjcnRjLT5iYXNlKTsKKwljb25zdCBzdHJ1 Y3Qgdmx2X3dtX3N0YXRlICphY3RpdmUgPSAmdG9faW50ZWxfY3J0Y19zdGF0ZShvbGRfZHJtX2Ny dGNfc3RhdGUpLT53bS52bHYub3B0aW1hbDsKIAlpbnQgbGV2ZWw7CiAKKwlpZiAoIW5ld19jcnRj X3N0YXRlLT5iYXNlLmFjdGl2ZSB8fCBkcm1fYXRvbWljX2NydGNfbmVlZHNfbW9kZXNldCgmbmV3 X2NydGNfc3RhdGUtPmJhc2UpKSB7CisJCSppbnRlcm1lZGlhdGUgPSAqb3B0aW1hbDsKKworCQly ZXR1cm4gMDsKKwl9CisKIAlpbnRlcm1lZGlhdGUtPm51bV9sZXZlbHMgPSBtaW4ob3B0aW1hbC0+ bnVtX2xldmVscywgYWN0aXZlLT5udW1fbGV2ZWxzKTsKIAlpbnRlcm1lZGlhdGUtPmN4c3IgPSBv cHRpbWFsLT5jeHNyICYmIGFjdGl2ZS0+Y3hzciAmJgotCQkhY3J0Y19zdGF0ZS0+ZGlzYWJsZV9j eHNyOworCQkhbmV3X2NydGNfc3RhdGUtPmRpc2FibGVfY3hzcjsKIAogCWZvciAobGV2ZWwgPSAw OyBsZXZlbCA8IGludGVybWVkaWF0ZS0+bnVtX2xldmVsczsgbGV2ZWwrKykgewogCQllbnVtIHBs YW5lX2lkIHBsYW5lX2lkOwpAQCAtMTQ5MSw3ICsxNDk5LDcgQEAgc3RhdGljIGludCB2bHZfY29t cHV0ZV9pbnRlcm1lZGlhdGVfd20oc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkgKiBvbWl0IHRo ZSBwb3N0LXZibGFuayBwcm9ncmFtbWluZzsgb25seSB1cGRhdGUgaWYgaXQncyBkaWZmZXJlbnQu CiAJICovCiAJaWYgKG1lbWNtcChpbnRlcm1lZGlhdGUsIG9wdGltYWwsIHNpemVvZigqaW50ZXJt ZWRpYXRlKSkgIT0gMCkKLQkJY3J0Y19zdGF0ZS0+d20ubmVlZF9wb3N0dmJsX3VwZGF0ZSA9IHRy dWU7CisJCW5ld19jcnRjX3N0YXRlLT53bS5uZWVkX3Bvc3R2YmxfdXBkYXRlID0gdHJ1ZTsKIAog CXJldHVybiAwOwogfQotLSAKMi43LjQKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZy ZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3Rp bmZvL2ludGVsLWdmeAo=