From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH 2/2] drm/i915: Calculate ironlake intermediate watermarks correctly, v2. Date: Thu, 19 Oct 2017 17:13:41 +0200 Message-ID: <20171019151341.4579-2-maarten.lankhorst@linux.intel.com> References: <20171019151341.4579-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 77BB16E10A for ; Thu, 19 Oct 2017 15:13:52 +0000 (UTC) In-Reply-To: <20171019151341.4579-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 YXRlcm1hcmtzLgoKQ2hhbmdlcyBzaW5jZSB2MToKLSBVc2UgaW50ZWxfYXRvbWljX2dldF9vbGRf Y3J0Y19zdGF0ZS4gKHZpbGxlKQoKU2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1h YXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4KUmV2aWV3ZWQtYnk6IFZpbGxlIFN5cmrD pGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfcG0uYyB8IDkgKysrKysrKystCiAxIGZpbGUgY2hhbmdlZCwgOCBpbnNlcnRp b25zKCspLCAxIGRlbGV0aW9uKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfcG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKaW5kZXggZWE3MGM3 MjBmNDkyLi5lMTgxZGZjMzYyMDAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3BtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwpAQCAtMzEyNCw3 ICszMTI0LDExIEBAIHN0YXRpYyBpbnQgaWxrX2NvbXB1dGVfaW50ZXJtZWRpYXRlX3dtKHN0cnVj dCBkcm1fZGV2aWNlICpkZXYsCiAJCQkJICAgICAgIHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpu ZXdzdGF0ZSkKIHsKIAlzdHJ1Y3QgaW50ZWxfcGlwZV93bSAqYSA9ICZuZXdzdGF0ZS0+d20uaWxr LmludGVybWVkaWF0ZTsKLQlzdHJ1Y3QgaW50ZWxfcGlwZV93bSAqYiA9ICZpbnRlbF9jcnRjLT53 bS5hY3RpdmUuaWxrOworCXN0cnVjdCBpbnRlbF9hdG9taWNfc3RhdGUgKmludGVsX3N0YXRlID0K KwkJdG9faW50ZWxfYXRvbWljX3N0YXRlKG5ld3N0YXRlLT5iYXNlLnN0YXRlKTsKKwljb25zdCBz dHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqb2xkc3RhdGUgPQorCQlpbnRlbF9hdG9taWNfZ2V0X29s ZF9jcnRjX3N0YXRlKGludGVsX3N0YXRlLCBpbnRlbF9jcnRjKTsKKwljb25zdCBzdHJ1Y3QgaW50 ZWxfcGlwZV93bSAqYiA9ICZvbGRzdGF0ZS0+d20uaWxrLm9wdGltYWw7CiAJaW50IGxldmVsLCBt YXhfbGV2ZWwgPSBpbGtfd21fbWF4X2xldmVsKHRvX2k5MTUoZGV2KSk7CiAKIAkvKgpAQCAtMzEz Myw2ICszMTM3LDkgQEAgc3RhdGljIGludCBpbGtfY29tcHV0ZV9pbnRlcm1lZGlhdGVfd20oc3Ry dWN0IGRybV9kZXZpY2UgKmRldiwKIAkgKiBhbmQgYWZ0ZXIgdGhlIHZibGFuay4KIAkgKi8KIAkq YSA9IG5ld3N0YXRlLT53bS5pbGsub3B0aW1hbDsKKwlpZiAoIW5ld3N0YXRlLT5iYXNlLmFjdGl2 ZSB8fCBkcm1fYXRvbWljX2NydGNfbmVlZHNfbW9kZXNldCgmbmV3c3RhdGUtPmJhc2UpKQorCQly ZXR1cm4gMDsKKwogCWEtPnBpcGVfZW5hYmxlZCB8PSBiLT5waXBlX2VuYWJsZWQ7CiAJYS0+c3By aXRlc19lbmFibGVkIHw9IGItPnNwcml0ZXNfZW5hYmxlZDsKIAlhLT5zcHJpdGVzX3NjYWxlZCB8 PSBiLT5zcHJpdGVzX3NjYWxlZDsKLS0gCjIuMTQuMQoKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhA bGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxt YW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==