From: Mahesh Kumar Subject: [PATCH 08/12] drm/i915/skl+: Watermark calculation cleanup Date: Wed, 17 May 2017 17:28:27 +0530 Message-ID: <20170517115831.13830-9-mahesh1.kumar@intel.com> References: <20170517115831.13830-1-mahesh1.kumar@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id 958386E05D for ; Wed, 17 May 2017 11:57:48 +0000 (UTC) In-Reply-To: <20170517115831.13830-1-mahesh1.kumar@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 Cc: paulo.r.zanoni@intel.com, maarten.lankhorst@intel.com List-Id: intel-gfx@lists.freedesktop.org RnJvbTogIkt1bWFyLCBNYWhlc2giIDxtYWhlc2gxLmt1bWFyQGludGVsLmNvbT4KClRoaXMgcGF0 Y2ggY2xlYW51cC9yZW9yZ2FuaXNlcyB0aGUgd2F0ZXJtYXJrIGNhbGN1bGF0aW9uIGZ1bmN0aW9u cy4KVGhpcyBwYXRjaCBtYWtlIHVzZSBvZiBhbHJlYWR5IGF2YWlsYWJsZSBtYWNybwoiZHJtX2F0 b21pY19jcnRjX3N0YXRlX2Zvcl9lYWNoX3BsYW5lX3N0YXRlIiB0byB3YWxrIHRocm91Z2gKcGxh bmVfc3RhdGUgbGlzdCBpbnN0ZWFkIG9mIGNhbGN1bGF0aW5nIHBsYW5lX3N0YXRlIGluIGZ1bmN0 aW9uIGl0c2VsZi4KClRoaXMgcmVzdHJ1Y3R1cmluZyB3aWxsIGhlbHAgbGF0ZXIgcGF0Y2ggZm9y IG5ldyBEREIgYWxsb2NhdGlvbgphbGdvcml0aG0gdG8gZG8gb25seSBhbGdvIHJlbGF0ZWQgY2hh bmdlcy4KCkNoYW5nZXMgZnJvbSBWMToKIC0gc3BsaXQgdGhlIHBhdGNoIGluIHR3byBwYXJ0cyBh cyBwZXIgTWF0dCdzIGNvbW1lbnQKClNpZ25lZC1vZmYtYnk6IE1haGVzaCBLdW1hciA8bWFoZXNo MS5rdW1hckBpbnRlbC5jb20+ClJldmlld2VkLWJ5OiBNYXR0IFJvcGVyIDxtYXR0aGV3LmQucm9w ZXJAaW50ZWwuY29tPgpSZXZpZXdlZC1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFu a2hvcnN0QGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9w bS5jIHwgNTMgKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmls ZSBjaGFuZ2VkLCAxOSBpbnNlcnRpb25zKCspLCAzNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfcG0uYwppbmRleCBiYmM3MjA2OWFiNTcuLmMyNGE0ZTFiY2I4YiAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9wbS5jCkBAIC00MTk3LDggKzQxOTcsOSBAQCBzdGF0aWMgdWludF9maXhlZF8xNl8x Nl90IHNrbF93bV9tZXRob2QyKHVpbnQzMl90IHBpeGVsX3JhdGUsCiAJcmV0dXJuIHJldDsKIH0K IAotc3RhdGljIHVpbnQzMl90IHNrbF9hZGp1c3RlZF9wbGFuZV9waXhlbF9yYXRlKGNvbnN0IHN0 cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjc3RhdGUsCi0JCQkJCSAgICAgIHN0cnVjdCBpbnRlbF9w bGFuZV9zdGF0ZSAqcHN0YXRlKQorc3RhdGljIHVpbnQzMl90Citza2xfYWRqdXN0ZWRfcGxhbmVf cGl4ZWxfcmF0ZShjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlLAorCQkJICAg ICAgY29uc3Qgc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpwc3RhdGUpCiB7CiAJdWludDY0X3Qg YWRqdXN0ZWRfcGl4ZWxfcmF0ZTsKIAl1aW50X2ZpeGVkXzE2XzE2X3QgZG93bnNjYWxlX2Ftb3Vu dDsKQEAgLTQyMjAsNyArNDIyMSw3IEBAIHN0YXRpYyB1aW50MzJfdCBza2xfYWRqdXN0ZWRfcGxh bmVfcGl4ZWxfcmF0ZShjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0CiAKIHN0YXRp YyBpbnQgc2tsX2NvbXB1dGVfcGxhbmVfd20oY29uc3Qgc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2LAogCQkJCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjc3RhdGUsCi0JCQkJc3Ry dWN0IGludGVsX3BsYW5lX3N0YXRlICppbnRlbF9wc3RhdGUsCisJCQkJY29uc3Qgc3RydWN0IGlu dGVsX3BsYW5lX3N0YXRlICppbnRlbF9wc3RhdGUsCiAJCQkJdWludDE2X3QgZGRiX2FsbG9jYXRp b24sCiAJCQkJaW50IGxldmVsLAogCQkJCXVpbnQxNl90ICpvdXRfYmxvY2tzLCAvKiBvdXQgKi8K QEAgLTQyMjgsOCArNDIyOSw4IEBAIHN0YXRpYyBpbnQgc2tsX2NvbXB1dGVfcGxhbmVfd20oY29u c3Qgc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQkJCWJvb2wgKmVuYWJsZWQg Lyogb3V0ICovKQogewogCXN0cnVjdCBpbnRlbF9wbGFuZSAqcGxhbmUgPSB0b19pbnRlbF9wbGFu ZShpbnRlbF9wc3RhdGUtPmJhc2UucGxhbmUpOwotCXN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgKnBz dGF0ZSA9ICZpbnRlbF9wc3RhdGUtPmJhc2U7Ci0Jc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIg PSBwc3RhdGUtPmZiOworCWNvbnN0IHN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgKnBzdGF0ZSA9ICZp bnRlbF9wc3RhdGUtPmJhc2U7CisJY29uc3Qgc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIgPSBw c3RhdGUtPmZiOwogCXVpbnQzMl90IGxhdGVuY3kgPSBkZXZfcHJpdi0+d20uc2tsX2xhdGVuY3lb bGV2ZWxdOwogCXVpbnRfZml4ZWRfMTZfMTZfdCBtZXRob2QxLCBtZXRob2QyOwogCXVpbnRfZml4 ZWRfMTZfMTZfdCBwbGFuZV9ibG9ja3NfcGVyX2xpbmU7CkBAIC00Mzg0LDM3ICs0Mzg1LDE3IEBA IHN0YXRpYyBpbnQKIHNrbF9jb21wdXRlX3dtX2xldmVsKGNvbnN0IHN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdiwKIAkJICAgICBzdHJ1Y3Qgc2tsX2RkYl9hbGxvY2F0aW9uICpkZGIs CiAJCSAgICAgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSwKLQkJICAgICBzdHJ1Y3Qg aW50ZWxfcGxhbmUgKmludGVsX3BsYW5lLAorCQkgICAgIGNvbnN0IHN0cnVjdCBpbnRlbF9wbGFu ZV9zdGF0ZSAqaW50ZWxfcHN0YXRlLAogCQkgICAgIGludCBsZXZlbCwKIAkJICAgICBzdHJ1Y3Qg c2tsX3dtX2xldmVsICpyZXN1bHQpCiB7Ci0Jc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRl ID0gY3N0YXRlLT5iYXNlLnN0YXRlOwogCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0g dG9faW50ZWxfY3J0Yyhjc3RhdGUtPmJhc2UuY3J0Yyk7Ci0Jc3RydWN0IGRybV9wbGFuZSAqcGxh bmUgPSAmaW50ZWxfcGxhbmUtPmJhc2U7Ci0Jc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICppbnRl bF9wc3RhdGUgPSBOVUxMOworCXN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lID0gaW50ZWxfcHN0YXRl LT5iYXNlLnBsYW5lOworCXN0cnVjdCBpbnRlbF9wbGFuZSAqaW50ZWxfcGxhbmUgPSB0b19pbnRl bF9wbGFuZShwbGFuZSk7CiAJdWludDE2X3QgZGRiX2Jsb2NrczsKIAllbnVtIHBpcGUgcGlwZSA9 IGludGVsX2NydGMtPnBpcGU7CiAJaW50IHJldDsKIAotCWlmIChzdGF0ZSkKLQkJaW50ZWxfcHN0 YXRlID0KLQkJCWludGVsX2F0b21pY19nZXRfZXhpc3RpbmdfcGxhbmVfc3RhdGUoc3RhdGUsCi0J CQkJCQkJICAgICAgaW50ZWxfcGxhbmUpOwotCi0JLyoKLQkgKiBOb3RlOiBJZiB3ZSBzdGFydCBz dXBwb3J0aW5nIG11bHRpcGxlIHBlbmRpbmcgYXRvbWljIGNvbW1pdHMgYWdhaW5zdAotCSAqIHRo ZSBzYW1lIHBsYW5lcy9DUlRDJ3MgaW4gdGhlIGZ1dHVyZSwgcGxhbmUtPnN0YXRlIHdpbGwgbm8g bG9uZ2VyIGJlCi0JICogdGhlIGNvcnJlY3QgcHJlLXN0YXRlIHRvIHVzZSBmb3IgdGhlIGNhbGN1 bGF0aW9ucyBoZXJlIGFuZCB3ZSdsbAotCSAqIG5lZWQgdG8gY2hhbmdlIHdoZXJlIHdlIGdldCB0 aGUgJ3VuY2hhbmdlZCcgcGxhbmUgZGF0YSBmcm9tLgotCSAqCi0JICogRm9yIG5vdyB0aGlzIGlz IGZpbmUgYmVjYXVzZSB3ZSBvbmx5IGFsbG93IG9uZSBxdWV1ZWQgY29tbWl0IGFnYWluc3QKLQkg KiBhIENSVEMuICBFdmVuIGlmIHRoZSBwbGFuZSBpc24ndCBtb2RpZmllZCBieSB0aGlzIHRyYW5z YWN0aW9uIGFuZCB3ZQotCSAqIGRvbid0IGhhdmUgYSBwbGFuZSBsb2NrLCB3ZSBzdGlsbCBoYXZl IHRoZSBDUlRDJ3MgbG9jaywgc28gd2Uga25vdwotCSAqIHRoYXQgbm8gb3RoZXIgdHJhbnNhY3Rp b25zIGFyZSByYWNpbmcgd2l0aCB1cyB0byB1cGRhdGUgaXQuCi0JICovCi0JaWYgKCFpbnRlbF9w c3RhdGUpCi0JCWludGVsX3BzdGF0ZSA9IHRvX2ludGVsX3BsYW5lX3N0YXRlKHBsYW5lLT5zdGF0 ZSk7Ci0KIAlpZiAoV0FSTl9PTighaW50ZWxfcHN0YXRlLT5iYXNlLmZiKSkKIAkJcmV0dXJuIC1F SU5WQUw7CiAKQEAgLTQ0NzUsOCArNDQ1NiwxMCBAQCBzdGF0aWMgaW50IHNrbF9idWlsZF9waXBl X3dtKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjc3RhdGUsCiAJCQkgICAgIHN0cnVjdCBza2xf cGlwZV93bSAqcGlwZV93bSkKIHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3N0YXRlLT5i YXNlLmNydGMtPmRldjsKKwlzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNydGNfc3RhdGUgPSAmY3N0 YXRlLT5iYXNlOwogCWNvbnN0IHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRv X2k5MTUoZGV2KTsKLQlzdHJ1Y3QgaW50ZWxfcGxhbmUgKmludGVsX3BsYW5lOworCXN0cnVjdCBk cm1fcGxhbmUgKnBsYW5lOworCWNvbnN0IHN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgKnBzdGF0ZTsK IAlzdHJ1Y3Qgc2tsX3BsYW5lX3dtICp3bTsKIAlpbnQgbGV2ZWwsIG1heF9sZXZlbCA9IGlsa193 bV9tYXhfbGV2ZWwoZGV2X3ByaXYpOwogCWludCByZXQ7CkBAIC00NDg3LDE0ICs0NDcwLDE2IEBA IHN0YXRpYyBpbnQgc2tsX2J1aWxkX3BpcGVfd20oc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNz dGF0ZSwKIAkgKi8KIAltZW1zZXQocGlwZV93bS0+cGxhbmVzLCAwLCBzaXplb2YocGlwZV93bS0+ cGxhbmVzKSk7CiAKLQlmb3JfZWFjaF9pbnRlbF9wbGFuZV9tYXNrKCZkZXZfcHJpdi0+ZHJtLAot CQkJCSAgaW50ZWxfcGxhbmUsCi0JCQkJICBjc3RhdGUtPmJhc2UucGxhbmVfbWFzaykgewotCQl3 bSA9ICZwaXBlX3dtLT5wbGFuZXNbaW50ZWxfcGxhbmUtPmlkXTsKKwlkcm1fYXRvbWljX2NydGNf c3RhdGVfZm9yX2VhY2hfcGxhbmVfc3RhdGUocGxhbmUsIHBzdGF0ZSwgY3J0Y19zdGF0ZSkgewor CQljb25zdCBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKmludGVsX3BzdGF0ZSA9CisJCQkJCQl0 b19pbnRlbF9wbGFuZV9zdGF0ZShwc3RhdGUpOworCQllbnVtIHBsYW5lX2lkIHBsYW5lX2lkID0g dG9faW50ZWxfcGxhbmUocGxhbmUpLT5pZDsKKworCQl3bSA9ICZwaXBlX3dtLT5wbGFuZXNbcGxh bmVfaWRdOwogCiAJCWZvciAobGV2ZWwgPSAwOyBsZXZlbCA8PSBtYXhfbGV2ZWw7IGxldmVsKysp IHsKIAkJCXJldCA9IHNrbF9jb21wdXRlX3dtX2xldmVsKGRldl9wcml2LCBkZGIsIGNzdGF0ZSwK LQkJCQkJCSAgIGludGVsX3BsYW5lLCBsZXZlbCwKKwkJCQkJCSAgIGludGVsX3BzdGF0ZSwgbGV2 ZWwsCiAJCQkJCQkgICAmd20tPndtW2xldmVsXSk7CiAJCQlpZiAocmV0KQogCQkJCXJldHVybiBy ZXQ7Ci0tIAoyLjExLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9w Lm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVs LWdmeAo=