From: Maarten Lankhorst Subject: [PATCH 1/2] drm/i915: Calculate ironlake intermediate watermarks correctly Date: Mon, 24 Apr 2017 11:30:28 +0200 Message-ID: <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 991256E1BD for ; Mon, 24 Apr 2017 09:30:36 +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 YXRlcm1hcmtzLgoKU2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFu a2hvcnN0QGxpbnV4LmludGVsLmNvbT4KQ2M6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFs YUBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyB8 IDcgKysrKysrLQogMSBmaWxlIGNoYW5nZWQsIDYgaW5zZXJ0aW9ucygrKSwgMSBkZWxldGlvbigt KQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCmluZGV4IGNhY2I2NWZhMmRkNS4uN2RhNzAxZGMzY2Fh IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKQEAgLTI2MzksNyArMjYzOSw5IEBAIHN0YXRpYyBp bnQgaWxrX2NvbXB1dGVfaW50ZXJtZWRpYXRlX3dtKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJ CQkJICAgICAgIHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpuZXdzdGF0ZSkKIHsKIAlzdHJ1Y3Qg aW50ZWxfcGlwZV93bSAqYSA9ICZuZXdzdGF0ZS0+d20uaWxrLmludGVybWVkaWF0ZTsKLQlzdHJ1 Y3QgaW50ZWxfcGlwZV93bSAqYiA9ICZpbnRlbF9jcnRjLT53bS5hY3RpdmUuaWxrOworCWNvbnN0 IHN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqb2xkX2RybV9zdGF0ZSA9CisJCWRybV9hdG9taWNfZ2V0 X29sZF9jcnRjX3N0YXRlKG5ld3N0YXRlLT5iYXNlLnN0YXRlLCAmaW50ZWxfY3J0Yy0+YmFzZSk7 CisJY29uc3Qgc3RydWN0IGludGVsX3BpcGVfd20gKmIgPSAmdG9faW50ZWxfY3J0Y19zdGF0ZShv bGRfZHJtX3N0YXRlKS0+d20uaWxrLm9wdGltYWw7CiAJaW50IGxldmVsLCBtYXhfbGV2ZWwgPSBp bGtfd21fbWF4X2xldmVsKHRvX2k5MTUoZGV2KSk7CiAKIAkvKgpAQCAtMjY0OCw2ICsyNjUwLDkg QEAgc3RhdGljIGludCBpbGtfY29tcHV0ZV9pbnRlcm1lZGlhdGVfd20oc3RydWN0IGRybV9kZXZp Y2UgKmRldiwKIAkgKiBhbmQgYWZ0ZXIgdGhlIHZibGFuay4KIAkgKi8KIAkqYSA9IG5ld3N0YXRl LT53bS5pbGsub3B0aW1hbDsKKwlpZiAoIW5ld3N0YXRlLT5iYXNlLmFjdGl2ZSB8fCBkcm1fYXRv bWljX2NydGNfbmVlZHNfbW9kZXNldCgmbmV3c3RhdGUtPmJhc2UpKQorCQlyZXR1cm4gMDsKKwog CWEtPnBpcGVfZW5hYmxlZCB8PSBiLT5waXBlX2VuYWJsZWQ7CiAJYS0+c3ByaXRlc19lbmFibGVk IHw9IGItPnNwcml0ZXNfZW5hYmxlZDsKIAlhLT5zcHJpdGVzX3NjYWxlZCB8PSBiLT5zcHJpdGVz X3NjYWxlZDsKLS0gCjIuNy40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVz a3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9p bnRlbC1nZngK