From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [RFC PATCH 8/8] drm/i915: Calculate vlv/chv intermediate watermarks correctly, v3. Date: Thu, 20 Jul 2017 15:15:19 +0200 Message-ID: <20170720131519.30104-9-maarten.lankhorst@linux.intel.com> References: <20170720131519.30104-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 005686E6A6 for ; Thu, 20 Jul 2017 13:15:27 +0000 (UTC) In-Reply-To: <20170720131519.30104-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 YXRlcm1hcmtzLgoKQ1hTUiBtdXN0IGFsd2F5cyBiZSBkaXNhYmxlZCBpbiB0aGUgaW50ZXJtZWRp YXRlIGNhc2UgZm9yIG1vZGVzZXRzLCBlbHNlCndlIGdldCBhIFdBUk4gZm9yIHZibGFuayB3YWl0 IHRpbWVvdXQuCgpBbHNvIHJlbmFtZSBjcnRjX3N0YXRlIHRvIG5ld19jcnRjX3N0YXRlLCB0byBk aXN0aW5ndWlzaCBpdCBmcm9tIHRoZSBvbGQgc3RhdGUuCgpDaGFuZ2VzIHNpbmNlIHYxOgotIFVz ZSBpbnRlbF9hdG9taWNfZ2V0X29sZF9jcnRjX3N0YXRlLiAodmlsbGUpCkNoYW5nZXMgc2luY2Ug djI6Ci0gQWx3YXlzIHVuc2V0IGN4c3IgZHVyaW5nIG1vZGVzZXQuCgpTaWduZWQtb2ZmLWJ5OiBN YWFydGVuIExhbmtob3JzdCA8bWFhcnRlbi5sYW5raG9yc3RAbGludXguaW50ZWwuY29tPgpCdWd6 aWxsYTogaHR0cHM6Ly9idWdzLmZyZWVkZXNrdG9wLm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAxNTk3 Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyB8IDIyICsrKysrKysrKysrKysr KystLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxNiBpbnNlcnRpb25zKCspLCA2IGRlbGV0aW9ucygt KQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCmluZGV4IDAwNDhiZjA0MzMzNy4uOTZkZTRmOGUzYjJh IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKQEAgLTIwMDQsMTYgKzIwMDQsMjUgQEAgc3RhdGlj IHZvaWQgdmx2X2F0b21pY191cGRhdGVfZmlmbyhzdHJ1Y3QgaW50ZWxfYXRvbWljX3N0YXRlICpz dGF0ZSwKIAogc3RhdGljIGludCB2bHZfY29tcHV0ZV9pbnRlcm1lZGlhdGVfd20oc3RydWN0IGRy bV9kZXZpY2UgKmRldiwKIAkJCQkgICAgICAgc3RydWN0IGludGVsX2NydGMgKmNydGMsCi0JCQkJ ICAgICAgIHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlKQorCQkJCSAgICAgICBz dHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqbmV3X2NydGNfc3RhdGUpCiB7Ci0Jc3RydWN0IHZsdl93 bV9zdGF0ZSAqaW50ZXJtZWRpYXRlID0gJmNydGNfc3RhdGUtPndtLnZsdi5pbnRlcm1lZGlhdGU7 Ci0JY29uc3Qgc3RydWN0IHZsdl93bV9zdGF0ZSAqb3B0aW1hbCA9ICZjcnRjX3N0YXRlLT53bS52 bHYub3B0aW1hbDsKLQljb25zdCBzdHJ1Y3Qgdmx2X3dtX3N0YXRlICphY3RpdmUgPSAmY3J0Yy0+ d20uYWN0aXZlLnZsdjsKKwlzdHJ1Y3Qgdmx2X3dtX3N0YXRlICppbnRlcm1lZGlhdGUgPSAmbmV3 X2NydGNfc3RhdGUtPndtLnZsdi5pbnRlcm1lZGlhdGU7CisJY29uc3Qgc3RydWN0IHZsdl93bV9z dGF0ZSAqb3B0aW1hbCA9ICZuZXdfY3J0Y19zdGF0ZS0+d20udmx2Lm9wdGltYWw7CisJY29uc3Qg c3RydWN0IGludGVsX2NydGNfc3RhdGUgKm9sZF9jcnRjX3N0YXRlID0KKwkJaW50ZWxfYXRvbWlj X2dldF9vbGRfY3J0Y19zdGF0ZShuZXdfY3J0Y19zdGF0ZS0+YmFzZS5zdGF0ZSwgY3J0Yyk7CisJ Y29uc3Qgc3RydWN0IHZsdl93bV9zdGF0ZSAqYWN0aXZlID0gJm9sZF9jcnRjX3N0YXRlLT53bS52 bHYub3B0aW1hbDsKIAlpbnQgbGV2ZWw7CiAKKwlpZiAoIW5ld19jcnRjX3N0YXRlLT5iYXNlLmFj dGl2ZSB8fCBkcm1fYXRvbWljX2NydGNfbmVlZHNfbW9kZXNldCgmbmV3X2NydGNfc3RhdGUtPmJh c2UpKSB7CisJCSppbnRlcm1lZGlhdGUgPSAqb3B0aW1hbDsKKworCQlpbnRlcm1lZGlhdGUtPmN4 c3IgPSBmYWxzZTsKKwkJZ290byBvdXQ7CisJfQorCiAJaW50ZXJtZWRpYXRlLT5udW1fbGV2ZWxz ID0gbWluKG9wdGltYWwtPm51bV9sZXZlbHMsIGFjdGl2ZS0+bnVtX2xldmVscyk7CiAJaW50ZXJt ZWRpYXRlLT5jeHNyID0gb3B0aW1hbC0+Y3hzciAmJiBhY3RpdmUtPmN4c3IgJiYKLQkJIWNydGNf c3RhdGUtPmRpc2FibGVfY3hzcjsKKwkJIW5ld19jcnRjX3N0YXRlLT5kaXNhYmxlX2N4c3I7CiAK IAlmb3IgKGxldmVsID0gMDsgbGV2ZWwgPCBpbnRlcm1lZGlhdGUtPm51bV9sZXZlbHM7IGxldmVs KyspIHsKIAkJZW51bSBwbGFuZV9pZCBwbGFuZV9pZDsKQEAgLTIwMzIsMTIgKzIwNDEsMTMgQEAg c3RhdGljIGludCB2bHZfY29tcHV0ZV9pbnRlcm1lZGlhdGVfd20oc3RydWN0IGRybV9kZXZpY2Ug KmRldiwKIAogCXZsdl9pbnZhbGlkYXRlX3dtcyhjcnRjLCBpbnRlcm1lZGlhdGUsIGxldmVsKTsK IAorb3V0OgogCS8qCiAJICogSWYgb3VyIGludGVybWVkaWF0ZSBXTSBhcmUgaWRlbnRpY2FsIHRv IHRoZSBmaW5hbCBXTSwgdGhlbiB3ZSBjYW4KIAkgKiBvbWl0IHRoZSBwb3N0LXZibGFuayBwcm9n cmFtbWluZzsgb25seSB1cGRhdGUgaWYgaXQncyBkaWZmZXJlbnQuCiAJICovCiAJaWYgKG1lbWNt cChpbnRlcm1lZGlhdGUsIG9wdGltYWwsIHNpemVvZigqaW50ZXJtZWRpYXRlKSkgIT0gMCkKLQkJ Y3J0Y19zdGF0ZS0+d20ubmVlZF9wb3N0dmJsX3VwZGF0ZSA9IHRydWU7CisJCW5ld19jcnRjX3N0 YXRlLT53bS5uZWVkX3Bvc3R2YmxfdXBkYXRlID0gdHJ1ZTsKIAogCXJldHVybiAwOwogfQotLSAK Mi4xMS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJ bnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0 cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK