From mboxrd@z Thu Jan  1 00:00:00 1970
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Subject: [(resend) PATCH 2/2] drm/i915: Calculate g4x
	intermediate watermarks correctly
Date: Wed, 15 Nov 2017 17:31:57 +0100
Message-ID: <20171115163157.14372-2-maarten.lankhorst@linux.intel.com>
References: <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: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mblankhorst.nl (mblankhorst.nl [141.105.120.124])
 by gabe.freedesktop.org (Postfix) with ESMTPS id CABF16E5A9
 for <intel-gfx@lists.freedesktop.org>; Wed, 15 Nov 2017 16:32:01 +0000 (UTC)
In-Reply-To: <20171115163157.14372-1-maarten.lankhorst@linux.intel.com>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

VGhlIHdhdGVybWFya3MgaXQgc2hvdWxkIGNhbGN1bGF0ZSBhZ2FpbnN0IGFyZSB0aGUgb2xkIG9w
dGltYWwgd2F0ZXJtYXJrcy4KVGhlIGN1cnJlbnRseSBhY3RpdmUgY3J0YyB3YXRlcm1hcmtzIGFy
ZSBwdXJlIGZpY3Rpb24sIGFuZCBhcmUgaW52YWxpZCBpbgpjYXNlIG9mIGEgbm9uYmxvY2tpbmcg
bW9kZXNldCwgcGFnZSBmbGlwIGVuYWJsaW5nL2Rpc2FibGluZyBwbGFuZXMgb3IgYW55Cm90aGVy
IHJlYXNvbi4KCldoZW4gdGhlIGNydGMgaXMgZGlzYWJsZWQgb3IgZHVyaW5nIGEgbW9kZXNldCB0
aGUgaW50ZXJtZWRpYXRlIHdhdGVybWFya3MKZG9uJ3QgbmVlZCB0byBiZSBwcm9ncmFtbWVkIHNl
cGFyYXRlbHksIGFuZCBjb3VsZCBiZSBkaXJlY3RseSBhc3NpZ25lZAp0byB0aGUgb3B0aW1hbCB3
YXRlcm1hcmtzLgoKQ1hTUiBtdXN0IGFsd2F5cyBiZSBkaXNhYmxlZCBpbiB0aGUgaW50ZXJtZWRp
YXRlIGNhc2UgZm9yIG1vZGVzZXRzLAplbHNlIHdlIGdldCBhIFdBUk4gZm9yIHZibGFuayB3YWl0
IHRpbWVvdXQuCgpBbHNvIHJlbmFtZSBjcnRjX3N0YXRlIHRvIG5ld19jcnRjX3N0YXRlLCB0byBk
aXN0aW5ndWlzaCBpdCBmcm9tIHRoZSBvbGQgc3RhdGUuCgpTaWduZWQtb2ZmLWJ5OiBNYWFydGVu
IExhbmtob3JzdCA8bWFhcnRlbi5sYW5raG9yc3RAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZl
cnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgfCAyNyArKysrKysrKysrKysrKysrKysrKy0tLS0t
LS0KIDEgZmlsZSBjaGFuZ2VkLCAyMCBpbnNlcnRpb25zKCspLCA3IGRlbGV0aW9ucygtKQoKZGlm
ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgYi9kcml2ZXJzL2dwdS9k
cm0vaTkxNS9pbnRlbF9wbS5jCmluZGV4IGY5MDRiZjczZGJkNi4uM2M1NWU0MDI2MzMxIDEwMDY0
NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCisrKyBiL2RyaXZlcnMvZ3B1
L2RybS9pOTE1L2ludGVsX3BtLmMKQEAgLTE0MDYsMTcgKzE0MDYsMjkgQEAgc3RhdGljIGludCBn
NHhfY29tcHV0ZV9waXBlX3dtKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlKQog
CiBzdGF0aWMgaW50IGc0eF9jb21wdXRlX2ludGVybWVkaWF0ZV93bShzdHJ1Y3QgZHJtX2Rldmlj
ZSAqZGV2LAogCQkJCSAgICAgICBzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywKLQkJCQkgICAgICAg
c3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpCisJCQkJICAgICAgIHN0cnVjdCBp
bnRlbF9jcnRjX3N0YXRlICpuZXdfY3J0Y19zdGF0ZSkKIHsKLQlzdHJ1Y3QgZzR4X3dtX3N0YXRl
ICppbnRlcm1lZGlhdGUgPSAmY3J0Y19zdGF0ZS0+d20uZzR4LmludGVybWVkaWF0ZTsKLQljb25z
dCBzdHJ1Y3QgZzR4X3dtX3N0YXRlICpvcHRpbWFsID0gJmNydGNfc3RhdGUtPndtLmc0eC5vcHRp
bWFsOwotCWNvbnN0IHN0cnVjdCBnNHhfd21fc3RhdGUgKmFjdGl2ZSA9ICZjcnRjLT53bS5hY3Rp
dmUuZzR4OworCXN0cnVjdCBnNHhfd21fc3RhdGUgKmludGVybWVkaWF0ZSA9ICZuZXdfY3J0Y19z
dGF0ZS0+d20uZzR4LmludGVybWVkaWF0ZTsKKwljb25zdCBzdHJ1Y3QgZzR4X3dtX3N0YXRlICpv
cHRpbWFsID0gJm5ld19jcnRjX3N0YXRlLT53bS5nNHgub3B0aW1hbDsKKwlzdHJ1Y3QgaW50ZWxf
YXRvbWljX3N0YXRlICppbnRlbF9zdGF0ZSA9CisJCXRvX2ludGVsX2F0b21pY19zdGF0ZShuZXdf
Y3J0Y19zdGF0ZS0+YmFzZS5zdGF0ZSk7CisJY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUg
Km9sZF9jcnRjX3N0YXRlID0KKwkJaW50ZWxfYXRvbWljX2dldF9vbGRfY3J0Y19zdGF0ZShpbnRl
bF9zdGF0ZSwgY3J0Yyk7CisJY29uc3Qgc3RydWN0IGc0eF93bV9zdGF0ZSAqYWN0aXZlID0gJm9s
ZF9jcnRjX3N0YXRlLT53bS5nNHgub3B0aW1hbDsKIAllbnVtIHBsYW5lX2lkIHBsYW5lX2lkOwog
CisJaWYgKCFuZXdfY3J0Y19zdGF0ZS0+YmFzZS5hY3RpdmUgfHwgZHJtX2F0b21pY19jcnRjX25l
ZWRzX21vZGVzZXQoJm5ld19jcnRjX3N0YXRlLT5iYXNlKSkgeworCQkqaW50ZXJtZWRpYXRlID0g
Km9wdGltYWw7CisKKwkJaW50ZXJtZWRpYXRlLT5jeHNyID0gZmFsc2U7CisJCWludGVybWVkaWF0
ZS0+aHBsbF9lbiA9IGZhbHNlOworCQlnb3RvIG91dDsKKwl9CisKIAlpbnRlcm1lZGlhdGUtPmN4
c3IgPSBvcHRpbWFsLT5jeHNyICYmIGFjdGl2ZS0+Y3hzciAmJgotCQkhY3J0Y19zdGF0ZS0+ZGlz
YWJsZV9jeHNyOworCQkhbmV3X2NydGNfc3RhdGUtPmRpc2FibGVfY3hzcjsKIAlpbnRlcm1lZGlh
dGUtPmhwbGxfZW4gPSBvcHRpbWFsLT5ocGxsX2VuICYmIGFjdGl2ZS0+aHBsbF9lbiAmJgotCQkh
Y3J0Y19zdGF0ZS0+ZGlzYWJsZV9jeHNyOworCQkhbmV3X2NydGNfc3RhdGUtPmRpc2FibGVfY3hz
cjsKIAlpbnRlcm1lZGlhdGUtPmZiY19lbiA9IG9wdGltYWwtPmZiY19lbiAmJiBhY3RpdmUtPmZi
Y19lbjsKIAogCWZvcl9lYWNoX3BsYW5lX2lkX29uX2NydGMoY3J0YywgcGxhbmVfaWQpIHsKQEAg
LTE0NTgsMTIgKzE0NzAsMTMgQEAgc3RhdGljIGludCBnNHhfY29tcHV0ZV9pbnRlcm1lZGlhdGVf
d20oc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAlXQVJOX09OKGludGVybWVkaWF0ZS0+aHBsbC5m
YmMgPiBnNHhfZmJjX2ZpZm9fc2l6ZSgyKSAmJgogCQlpbnRlcm1lZGlhdGUtPmZiY19lbiAmJiBp
bnRlcm1lZGlhdGUtPmhwbGxfZW4pOwogCitvdXQ6CiAJLyoKIAkgKiBJZiBvdXIgaW50ZXJtZWRp
YXRlIFdNIGFyZSBpZGVudGljYWwgdG8gdGhlIGZpbmFsIFdNLCB0aGVuIHdlIGNhbgogCSAqIG9t
aXQgdGhlIHBvc3QtdmJsYW5rIHByb2dyYW1taW5nOyBvbmx5IHVwZGF0ZSBpZiBpdCdzIGRpZmZl
cmVudC4KIAkgKi8KIAlpZiAobWVtY21wKGludGVybWVkaWF0ZSwgb3B0aW1hbCwgc2l6ZW9mKCpp
bnRlcm1lZGlhdGUpKSAhPSAwKQotCQljcnRjX3N0YXRlLT53bS5uZWVkX3Bvc3R2YmxfdXBkYXRl
ID0gdHJ1ZTsKKwkJbmV3X2NydGNfc3RhdGUtPndtLm5lZWRfcG9zdHZibF91cGRhdGUgPSB0cnVl
OwogCiAJcmV0dXJuIDA7CiB9Ci0tIAoyLjE1LjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxp
c3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFu
L2xpc3RpbmZvL2ludGVsLWdmeAo=