From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [(resend) PATCH 1/2] drm/i915: Calculate vlv/chv intermediate watermarks correctly, v3. Date: Wed, 15 Nov 2017 17:31:56 +0100 Message-ID: <20171115163157.14372-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 [141.105.120.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id C7D5C6E284 for ; Wed, 15 Nov 2017 16:32:01 +0000 (UTC) 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 YXRlcm1hcmtzLgoKQ1hTUiBtdXN0IGFsd2F5cyBiZSBkaXNhYmxlZCBpbiB0aGUgaW50ZXJtZWRp YXRlIGNhc2UgZm9yIG1vZGVzZXRzLCBlbHNlCndlIGdldCBhIFdBUk4gZm9yIHZibGFuayB3YWl0 IHRpbWVvdXQuCgpBbHNvIHJlbmFtZSBjcnRjX3N0YXRlIHRvIG5ld19jcnRjX3N0YXRlLCB0byBk aXN0aW5ndWlzaCBpdCBmcm9tIHRoZSBvbGQgc3RhdGUuCgpDaGFuZ2VzIHNpbmNlIHYxOgotIFVz ZSBpbnRlbF9hdG9taWNfZ2V0X29sZF9jcnRjX3N0YXRlLiAodmlsbGUpCkNoYW5nZXMgc2luY2Ug djI6Ci0gQWx3YXlzIHVuc2V0IGN4c3IgZHVyaW5nIG1vZGVzZXQuCgpTaWduZWQtb2ZmLWJ5OiBN YWFydGVuIExhbmtob3JzdCA8bWFhcnRlbi5sYW5raG9yc3RAbGludXguaW50ZWwuY29tPgotLS0K IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgfCAyNCArKysrKysrKysrKysrKysrKyst LS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxOCBpbnNlcnRpb25zKCspLCA2IGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9wbS5jCmluZGV4IDhjNjllYzllYjZlZS4uZjkwNGJmNzNkYmQ2IDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3BtLmMKQEAgLTIwMjYsMTYgKzIwMjYsMjcgQEAgc3RhdGljIHZv aWQgdmx2X2F0b21pY191cGRhdGVfZmlmbyhzdHJ1Y3QgaW50ZWxfYXRvbWljX3N0YXRlICpzdGF0 ZSwKIAogc3RhdGljIGludCB2bHZfY29tcHV0ZV9pbnRlcm1lZGlhdGVfd20oc3RydWN0IGRybV9k ZXZpY2UgKmRldiwKIAkJCQkgICAgICAgc3RydWN0IGludGVsX2NydGMgKmNydGMsCi0JCQkJICAg ICAgIHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlKQorCQkJCSAgICAgICBzdHJ1 Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqbmV3X2NydGNfc3RhdGUpCiB7Ci0Jc3RydWN0IHZsdl93bV9z dGF0ZSAqaW50ZXJtZWRpYXRlID0gJmNydGNfc3RhdGUtPndtLnZsdi5pbnRlcm1lZGlhdGU7Ci0J Y29uc3Qgc3RydWN0IHZsdl93bV9zdGF0ZSAqb3B0aW1hbCA9ICZjcnRjX3N0YXRlLT53bS52bHYu b3B0aW1hbDsKLQljb25zdCBzdHJ1Y3Qgdmx2X3dtX3N0YXRlICphY3RpdmUgPSAmY3J0Yy0+d20u YWN0aXZlLnZsdjsKKwlzdHJ1Y3Qgdmx2X3dtX3N0YXRlICppbnRlcm1lZGlhdGUgPSAmbmV3X2Ny dGNfc3RhdGUtPndtLnZsdi5pbnRlcm1lZGlhdGU7CisJY29uc3Qgc3RydWN0IHZsdl93bV9zdGF0 ZSAqb3B0aW1hbCA9ICZuZXdfY3J0Y19zdGF0ZS0+d20udmx2Lm9wdGltYWw7CisJc3RydWN0IGlu dGVsX2F0b21pY19zdGF0ZSAqaW50ZWxfc3RhdGUgPQorCQl0b19pbnRlbF9hdG9taWNfc3RhdGUo bmV3X2NydGNfc3RhdGUtPmJhc2Uuc3RhdGUpOworCWNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0 YXRlICpvbGRfY3J0Y19zdGF0ZSA9CisJCWludGVsX2F0b21pY19nZXRfb2xkX2NydGNfc3RhdGUo aW50ZWxfc3RhdGUsIGNydGMpOworCWNvbnN0IHN0cnVjdCB2bHZfd21fc3RhdGUgKmFjdGl2ZSA9 ICZvbGRfY3J0Y19zdGF0ZS0+d20udmx2Lm9wdGltYWw7CiAJaW50IGxldmVsOwogCisJaWYgKCFu ZXdfY3J0Y19zdGF0ZS0+YmFzZS5hY3RpdmUgfHwgZHJtX2F0b21pY19jcnRjX25lZWRzX21vZGVz ZXQoJm5ld19jcnRjX3N0YXRlLT5iYXNlKSkgeworCQkqaW50ZXJtZWRpYXRlID0gKm9wdGltYWw7 CisKKwkJaW50ZXJtZWRpYXRlLT5jeHNyID0gZmFsc2U7CisJCWdvdG8gb3V0OworCX0KKwogCWlu dGVybWVkaWF0ZS0+bnVtX2xldmVscyA9IG1pbihvcHRpbWFsLT5udW1fbGV2ZWxzLCBhY3RpdmUt Pm51bV9sZXZlbHMpOwogCWludGVybWVkaWF0ZS0+Y3hzciA9IG9wdGltYWwtPmN4c3IgJiYgYWN0 aXZlLT5jeHNyICYmCi0JCSFjcnRjX3N0YXRlLT5kaXNhYmxlX2N4c3I7CisJCSFuZXdfY3J0Y19z dGF0ZS0+ZGlzYWJsZV9jeHNyOwogCiAJZm9yIChsZXZlbCA9IDA7IGxldmVsIDwgaW50ZXJtZWRp YXRlLT5udW1fbGV2ZWxzOyBsZXZlbCsrKSB7CiAJCWVudW0gcGxhbmVfaWQgcGxhbmVfaWQ7CkBA IC0yMDU0LDEyICsyMDY1LDEzIEBAIHN0YXRpYyBpbnQgdmx2X2NvbXB1dGVfaW50ZXJtZWRpYXRl X3dtKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAKIAl2bHZfaW52YWxpZGF0ZV93bXMoY3J0Yywg aW50ZXJtZWRpYXRlLCBsZXZlbCk7CiAKK291dDoKIAkvKgogCSAqIElmIG91ciBpbnRlcm1lZGlh dGUgV00gYXJlIGlkZW50aWNhbCB0byB0aGUgZmluYWwgV00sIHRoZW4gd2UgY2FuCiAJICogb21p dCB0aGUgcG9zdC12YmxhbmsgcHJvZ3JhbW1pbmc7IG9ubHkgdXBkYXRlIGlmIGl0J3MgZGlmZmVy ZW50LgogCSAqLwogCWlmIChtZW1jbXAoaW50ZXJtZWRpYXRlLCBvcHRpbWFsLCBzaXplb2YoKmlu dGVybWVkaWF0ZSkpICE9IDApCi0JCWNydGNfc3RhdGUtPndtLm5lZWRfcG9zdHZibF91cGRhdGUg PSB0cnVlOworCQluZXdfY3J0Y19zdGF0ZS0+d20ubmVlZF9wb3N0dmJsX3VwZGF0ZSA9IHRydWU7 CiAKIAlyZXR1cm4gMDsKIH0KLS0gCjIuMTUuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlz dHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4v bGlzdGluZm8vaW50ZWwtZ2Z4Cg==