From: Mahesh Kumar Subject: [PATCH 08/11] drm/i915/skl+: Watermark calculation cleanup Date: Mon, 8 May 2017 17:18:59 +0530 Message-ID: <20170508114902.18965-9-mahesh1.kumar@intel.com> References: <20170508114902.18965-1-mahesh1.kumar@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id E175E6E227 for ; Mon, 8 May 2017 11:45:56 +0000 (UTC) In-Reply-To: <20170508114902.18965-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 VGhpcyBwYXRjaCBjbGVhbnVwL3Jlb3JnYW5pc2VzIHRoZSB3YXRlcm1hcmsgY2FsY3VsYXRpb24g ZnVuY3Rpb25zLgpUaGlzIHBhdGNoIGFsc28gbWFrZSB1c2Ugb2YgYWxyZWFkeSBhdmFpbGFibGUg bWFjcm8KImRybV9hdG9taWNfY3J0Y19zdGF0ZV9mb3JfZWFjaF9wbGFuZV9zdGF0ZSIgdG8gd2Fs ayB0aHJvdWdoCnBsYW5lX3N0YXRlIGxpc3QgaW5zdGVhZCBvZiBjYWxjdWxhdGluZyBwbGFuZV9z dGF0ZSBpbiBmdW5jdGlvbiBpdHNlbGYuCk5vdyB3ZSBpdGVyYXRlIG92ZXIgV00gbGV2ZWxzIGlu IHNrbF9jb21wdXRlX3dtX2xldmVsIGZ1bmN0aW9uIGluc3RlYWQKb2YgInNrbF9idWlsZF9waXBl X3dtIiBmdW5jdGlvbi4KClRoaXMgcmVzdHJ1Y3R1cmluZyB3aWxsIGhlbHAgbGF0ZXIgcGF0Y2gg Zm9yIG5ldyBEREIgYWxsb2NhdGlvbgphbGdvcml0aG0gdG8gZG8gb25seSBhbGdvIHJlbGF0ZWQg Y2hhbmdlcy4KClNpZ25lZC1vZmYtYnk6IE1haGVzaCBLdW1hciA8bWFoZXNoMS5rdW1hckBpbnRl bC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyB8IDg5ICsrKysrKysr KysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMzcgaW5z ZXJ0aW9ucygrKSwgNTIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfcG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKaW5kZXgg MGFjZTk0ZDY3NDMyLi45ZDAyMjU4NjJhN2UgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX3BtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwpAQCAt MzczMiw3ICszNzMyLDcgQEAgc3RhdGljIHVpbnRfZml4ZWRfMTZfMTZfdCBza2xfd21fbWV0aG9k Mih1aW50MzJfdCBwaXhlbF9yYXRlLAogfQogCiBzdGF0aWMgdWludDMyX3Qgc2tsX2FkanVzdGVk X3BsYW5lX3BpeGVsX3JhdGUoY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSwK LQkJCQkJICAgICAgc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpwc3RhdGUpCisJCQkJCSAgICAg IGNvbnN0IHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqcHN0YXRlKQogewogCXVpbnQ2NF90IGFk anVzdGVkX3BpeGVsX3JhdGU7CiAJdWludF9maXhlZF8xNl8xNl90IGRvd25zY2FsZV9hbW91bnQ7 CkBAIC0zNzU0LDcgKzM3NTQsNyBAQCBzdGF0aWMgdWludDMyX3Qgc2tsX2FkanVzdGVkX3BsYW5l X3BpeGVsX3JhdGUoY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNzdAogCiBzdGF0aWMg aW50IHNrbF9jb21wdXRlX3BsYW5lX3dtKGNvbnN0IHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdiwKIAkJCQlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlLAotCQkJCXN0cnVj dCBpbnRlbF9wbGFuZV9zdGF0ZSAqaW50ZWxfcHN0YXRlLAorCQkJCWNvbnN0IHN0cnVjdCBpbnRl bF9wbGFuZV9zdGF0ZSAqaW50ZWxfcHN0YXRlLAogCQkJCXVpbnQxNl90IGRkYl9hbGxvY2F0aW9u LAogCQkJCWludCBsZXZlbCwKIAkJCQl1aW50MTZfdCAqb3V0X2Jsb2NrcywgLyogb3V0ICovCkBA IC0zNzYyLDggKzM3NjIsOCBAQCBzdGF0aWMgaW50IHNrbF9jb21wdXRlX3BsYW5lX3dtKGNvbnN0 IHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJCQlib29sICplbmFibGVkIC8q IG91dCAqLykKIHsKIAlzdHJ1Y3QgaW50ZWxfcGxhbmUgKnBsYW5lID0gdG9faW50ZWxfcGxhbmUo aW50ZWxfcHN0YXRlLT5iYXNlLnBsYW5lKTsKLQlzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpwc3Rh dGUgPSAmaW50ZWxfcHN0YXRlLT5iYXNlOwotCXN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiID0g cHN0YXRlLT5mYjsKKwljb25zdCBzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpwc3RhdGUgPSAmaW50 ZWxfcHN0YXRlLT5iYXNlOworCWNvbnN0IHN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiID0gcHN0 YXRlLT5mYjsKIAl1aW50MzJfdCBsYXRlbmN5ID0gZGV2X3ByaXYtPndtLnNrbF9sYXRlbmN5W2xl dmVsXTsKIAl1aW50X2ZpeGVkXzE2XzE2X3QgbWV0aG9kMSwgbWV0aG9kMjsKIAl1aW50X2ZpeGVk XzE2XzE2X3QgcGxhbmVfYmxvY2tzX3Blcl9saW5lOwpAQCAtMzkxOCw1MiArMzkxOCwzNiBAQCBz dGF0aWMgaW50CiBza2xfY29tcHV0ZV93bV9sZXZlbChjb25zdCBzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYsCiAJCSAgICAgc3RydWN0IHNrbF9kZGJfYWxsb2NhdGlvbiAqZGRiLAog CQkgICAgIHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjc3RhdGUsCi0JCSAgICAgc3RydWN0IGlu dGVsX3BsYW5lICppbnRlbF9wbGFuZSwKLQkJICAgICBpbnQgbGV2ZWwsCi0JCSAgICAgc3RydWN0 IHNrbF93bV9sZXZlbCAqcmVzdWx0KQorCQkgICAgIGNvbnN0IHN0cnVjdCBpbnRlbF9wbGFuZV9z dGF0ZSAqaW50ZWxfcHN0YXRlLAorCQkgICAgIHN0cnVjdCBza2xfcGxhbmVfd20gKndtKQogewot CXN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSA9IGNzdGF0ZS0+YmFzZS5zdGF0ZTsKIAlz dHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3N0YXRlLT5iYXNl LmNydGMpOwotCXN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lID0gJmludGVsX3BsYW5lLT5iYXNlOwot CXN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqaW50ZWxfcHN0YXRlID0gTlVMTDsKKwlzdHJ1Y3Qg ZHJtX3BsYW5lICpwbGFuZSA9IGludGVsX3BzdGF0ZS0+YmFzZS5wbGFuZTsKKwlzdHJ1Y3QgaW50 ZWxfcGxhbmUgKmludGVsX3BsYW5lID0gdG9faW50ZWxfcGxhbmUocGxhbmUpOwogCXVpbnQxNl90 IGRkYl9ibG9ja3M7CiAJZW51bSBwaXBlIHBpcGUgPSBpbnRlbF9jcnRjLT5waXBlOworCWludCBs ZXZlbCwgbWF4X2xldmVsID0gaWxrX3dtX21heF9sZXZlbChkZXZfcHJpdik7CiAJaW50IHJldDsK IAotCWlmIChzdGF0ZSkKLQkJaW50ZWxfcHN0YXRlID0KLQkJCWludGVsX2F0b21pY19nZXRfZXhp c3RpbmdfcGxhbmVfc3RhdGUoc3RhdGUsCi0JCQkJCQkJICAgICAgaW50ZWxfcGxhbmUpOwotCi0J LyoKLQkgKiBOb3RlOiBJZiB3ZSBzdGFydCBzdXBwb3J0aW5nIG11bHRpcGxlIHBlbmRpbmcgYXRv bWljIGNvbW1pdHMgYWdhaW5zdAotCSAqIHRoZSBzYW1lIHBsYW5lcy9DUlRDJ3MgaW4gdGhlIGZ1 dHVyZSwgcGxhbmUtPnN0YXRlIHdpbGwgbm8gbG9uZ2VyIGJlCi0JICogdGhlIGNvcnJlY3QgcHJl LXN0YXRlIHRvIHVzZSBmb3IgdGhlIGNhbGN1bGF0aW9ucyBoZXJlIGFuZCB3ZSdsbAotCSAqIG5l ZWQgdG8gY2hhbmdlIHdoZXJlIHdlIGdldCB0aGUgJ3VuY2hhbmdlZCcgcGxhbmUgZGF0YSBmcm9t LgotCSAqCi0JICogRm9yIG5vdyB0aGlzIGlzIGZpbmUgYmVjYXVzZSB3ZSBvbmx5IGFsbG93IG9u ZSBxdWV1ZWQgY29tbWl0IGFnYWluc3QKLQkgKiBhIENSVEMuICBFdmVuIGlmIHRoZSBwbGFuZSBp c24ndCBtb2RpZmllZCBieSB0aGlzIHRyYW5zYWN0aW9uIGFuZCB3ZQotCSAqIGRvbid0IGhhdmUg YSBwbGFuZSBsb2NrLCB3ZSBzdGlsbCBoYXZlIHRoZSBDUlRDJ3MgbG9jaywgc28gd2Uga25vdwot CSAqIHRoYXQgbm8gb3RoZXIgdHJhbnNhY3Rpb25zIGFyZSByYWNpbmcgd2l0aCB1cyB0byB1cGRh dGUgaXQuCi0JICovCi0JaWYgKCFpbnRlbF9wc3RhdGUpCi0JCWludGVsX3BzdGF0ZSA9IHRvX2lu dGVsX3BsYW5lX3N0YXRlKHBsYW5lLT5zdGF0ZSk7Ci0KIAlpZiAoV0FSTl9PTighaW50ZWxfcHN0 YXRlLT5iYXNlLmZiKSkKIAkJcmV0dXJuIC1FSU5WQUw7CiAKIAlkZGJfYmxvY2tzID0gc2tsX2Rk Yl9lbnRyeV9zaXplKCZkZGItPnBsYW5lW3BpcGVdW2ludGVsX3BsYW5lLT5pZF0pOwogCi0JcmV0 ID0gc2tsX2NvbXB1dGVfcGxhbmVfd20oZGV2X3ByaXYsCi0JCQkJICAgY3N0YXRlLAotCQkJCSAg IGludGVsX3BzdGF0ZSwKLQkJCQkgICBkZGJfYmxvY2tzLAotCQkJCSAgIGxldmVsLAotCQkJCSAg ICZyZXN1bHQtPnBsYW5lX3Jlc19iLAotCQkJCSAgICZyZXN1bHQtPnBsYW5lX3Jlc19sLAotCQkJ CSAgICZyZXN1bHQtPnBsYW5lX2VuKTsKLQlpZiAocmV0KQotCQlyZXR1cm4gcmV0OworCWZvciAo bGV2ZWwgPSAwOyBsZXZlbCA8PSBtYXhfbGV2ZWw7IGxldmVsKyspIHsKKwkJc3RydWN0IHNrbF93 bV9sZXZlbCAqcmVzdWx0ID0gJndtLT53bVtsZXZlbF07CisKKwkJcmV0ID0gc2tsX2NvbXB1dGVf cGxhbmVfd20oZGV2X3ByaXYsCisJCQkJCSAgIGNzdGF0ZSwKKwkJCQkJICAgaW50ZWxfcHN0YXRl LAorCQkJCQkgICBkZGJfYmxvY2tzLAorCQkJCQkgICBsZXZlbCwKKwkJCQkJICAgJnJlc3VsdC0+ cGxhbmVfcmVzX2IsCisJCQkJCSAgICZyZXN1bHQtPnBsYW5lX3Jlc19sLAorCQkJCQkgICAmcmVz dWx0LT5wbGFuZV9lbik7CisJCWlmIChyZXQpCisJCQlyZXR1cm4gcmV0OworCX0KIAogCXJldHVy biAwOwogfQpAQCAtNDAwOSwxMCArMzk5MywxMSBAQCBzdGF0aWMgaW50IHNrbF9idWlsZF9waXBl X3dtKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjc3RhdGUsCiAJCQkgICAgIHN0cnVjdCBza2xf cGlwZV93bSAqcGlwZV93bSkKIHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3N0YXRlLT5i YXNlLmNydGMtPmRldjsKKwlzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNydGNfc3RhdGUgPSAmY3N0 YXRlLT5iYXNlOwogCWNvbnN0IHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRv X2k5MTUoZGV2KTsKLQlzdHJ1Y3QgaW50ZWxfcGxhbmUgKmludGVsX3BsYW5lOworCXN0cnVjdCBk cm1fcGxhbmUgKnBsYW5lOworCWNvbnN0IHN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgKnBzdGF0ZTsK IAlzdHJ1Y3Qgc2tsX3BsYW5lX3dtICp3bTsKLQlpbnQgbGV2ZWwsIG1heF9sZXZlbCA9IGlsa193 bV9tYXhfbGV2ZWwoZGV2X3ByaXYpOwogCWludCByZXQ7CiAKIAkvKgpAQCAtNDAyMSwxOCArNDAw NiwxOCBAQCBzdGF0aWMgaW50IHNrbF9idWlsZF9waXBlX3dtKHN0cnVjdCBpbnRlbF9jcnRjX3N0 YXRlICpjc3RhdGUsCiAJICovCiAJbWVtc2V0KHBpcGVfd20tPnBsYW5lcywgMCwgc2l6ZW9mKHBp cGVfd20tPnBsYW5lcykpOwogCi0JZm9yX2VhY2hfaW50ZWxfcGxhbmVfbWFzaygmZGV2X3ByaXYt PmRybSwKLQkJCQkgIGludGVsX3BsYW5lLAotCQkJCSAgY3N0YXRlLT5iYXNlLnBsYW5lX21hc2sp IHsKLQkJd20gPSAmcGlwZV93bS0+cGxhbmVzW2ludGVsX3BsYW5lLT5pZF07CisJZHJtX2F0b21p Y19jcnRjX3N0YXRlX2Zvcl9lYWNoX3BsYW5lX3N0YXRlKHBsYW5lLCBwc3RhdGUsIGNydGNfc3Rh dGUpIHsKKwkJY29uc3Qgc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICppbnRlbF9wc3RhdGUgPQor CQkJCQkJdG9faW50ZWxfcGxhbmVfc3RhdGUocHN0YXRlKTsKKwkJZW51bSBwbGFuZV9pZCBwbGFu ZV9pZCA9IHRvX2ludGVsX3BsYW5lKHBsYW5lKS0+aWQ7CisKKwkJd20gPSAmcGlwZV93bS0+cGxh bmVzW3BsYW5lX2lkXTsKKworCQlyZXQgPSBza2xfY29tcHV0ZV93bV9sZXZlbChkZXZfcHJpdiwg ZGRiLCBjc3RhdGUsCisJCQkJCSAgIGludGVsX3BzdGF0ZSwgd20pOworCQlpZiAocmV0KQorCQkJ cmV0dXJuIHJldDsKIAotCQlmb3IgKGxldmVsID0gMDsgbGV2ZWwgPD0gbWF4X2xldmVsOyBsZXZl bCsrKSB7Ci0JCQlyZXQgPSBza2xfY29tcHV0ZV93bV9sZXZlbChkZXZfcHJpdiwgZGRiLCBjc3Rh dGUsCi0JCQkJCQkgICBpbnRlbF9wbGFuZSwgbGV2ZWwsCi0JCQkJCQkgICAmd20tPndtW2xldmVs XSk7Ci0JCQlpZiAocmV0KQotCQkJCXJldHVybiByZXQ7Ci0JCX0KIAkJc2tsX2NvbXB1dGVfdHJh bnNpdGlvbl93bShjc3RhdGUsICZ3bS0+dHJhbnNfd20pOwogCX0KIAlwaXBlX3dtLT5saW5ldGlt ZSA9IHNrbF9jb21wdXRlX2xpbmV0aW1lX3dtKGNzdGF0ZSk7Ci0tIAoyLjExLjAKCl9fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5n IGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVk ZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=