From: Mahesh Kumar Subject: [PATCH 08/12] drm/i915/skl+: Watermark calculation cleanup Date: Mon, 15 May 2017 14:04:33 +0530 Message-ID: <20170515083437.31394-9-mahesh1.kumar@intel.com> References: <20170515083437.31394-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 D2FBF89FEC for ; Mon, 15 May 2017 08:33:02 +0000 (UTC) In-Reply-To: <20170515083437.31394-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+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyB8 IDUzICsrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hh bmdlZCwgMTkgaW5zZXJ0aW9ucygrKSwgMzQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3BtLmMKaW5kZXggYmJjNzIwNjlhYjU3Li5jMjRhNGUxYmNiOGIgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfcG0uYwpAQCAtNDE5Nyw4ICs0MTk3LDkgQEAgc3RhdGljIHVpbnRfZml4ZWRfMTZfMTZfdCBz a2xfd21fbWV0aG9kMih1aW50MzJfdCBwaXhlbF9yYXRlLAogCXJldHVybiByZXQ7CiB9CiAKLXN0 YXRpYyB1aW50MzJfdCBza2xfYWRqdXN0ZWRfcGxhbmVfcGl4ZWxfcmF0ZShjb25zdCBzdHJ1Y3Qg aW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlLAotCQkJCQkgICAgICBzdHJ1Y3QgaW50ZWxfcGxhbmVf c3RhdGUgKnBzdGF0ZSkKK3N0YXRpYyB1aW50MzJfdAorc2tsX2FkanVzdGVkX3BsYW5lX3BpeGVs X3JhdGUoY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSwKKwkJCSAgICAgIGNv bnN0IHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqcHN0YXRlKQogewogCXVpbnQ2NF90IGFkanVz dGVkX3BpeGVsX3JhdGU7CiAJdWludF9maXhlZF8xNl8xNl90IGRvd25zY2FsZV9hbW91bnQ7CkBA IC00MjIwLDcgKzQyMjEsNyBAQCBzdGF0aWMgdWludDMyX3Qgc2tsX2FkanVzdGVkX3BsYW5lX3Bp eGVsX3JhdGUoY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNzdAogCiBzdGF0aWMgaW50 IHNrbF9jb21wdXRlX3BsYW5lX3dtKGNvbnN0IHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdiwKIAkJCQlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlLAotCQkJCXN0cnVjdCBp bnRlbF9wbGFuZV9zdGF0ZSAqaW50ZWxfcHN0YXRlLAorCQkJCWNvbnN0IHN0cnVjdCBpbnRlbF9w bGFuZV9zdGF0ZSAqaW50ZWxfcHN0YXRlLAogCQkJCXVpbnQxNl90IGRkYl9hbGxvY2F0aW9uLAog CQkJCWludCBsZXZlbCwKIAkJCQl1aW50MTZfdCAqb3V0X2Jsb2NrcywgLyogb3V0ICovCkBAIC00 MjI4LDggKzQyMjksOCBAQCBzdGF0aWMgaW50IHNrbF9jb21wdXRlX3BsYW5lX3dtKGNvbnN0IHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJCQlib29sICplbmFibGVkIC8qIG91 dCAqLykKIHsKIAlzdHJ1Y3QgaW50ZWxfcGxhbmUgKnBsYW5lID0gdG9faW50ZWxfcGxhbmUoaW50 ZWxfcHN0YXRlLT5iYXNlLnBsYW5lKTsKLQlzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpwc3RhdGUg PSAmaW50ZWxfcHN0YXRlLT5iYXNlOwotCXN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiID0gcHN0 YXRlLT5mYjsKKwljb25zdCBzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpwc3RhdGUgPSAmaW50ZWxf cHN0YXRlLT5iYXNlOworCWNvbnN0IHN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiID0gcHN0YXRl LT5mYjsKIAl1aW50MzJfdCBsYXRlbmN5ID0gZGV2X3ByaXYtPndtLnNrbF9sYXRlbmN5W2xldmVs XTsKIAl1aW50X2ZpeGVkXzE2XzE2X3QgbWV0aG9kMSwgbWV0aG9kMjsKIAl1aW50X2ZpeGVkXzE2 XzE2X3QgcGxhbmVfYmxvY2tzX3Blcl9saW5lOwpAQCAtNDM4NCwzNyArNDM4NSwxNyBAQCBzdGF0 aWMgaW50CiBza2xfY29tcHV0ZV93bV9sZXZlbChjb25zdCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYsCiAJCSAgICAgc3RydWN0IHNrbF9kZGJfYWxsb2NhdGlvbiAqZGRiLAogCQkg ICAgIHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjc3RhdGUsCi0JCSAgICAgc3RydWN0IGludGVs X3BsYW5lICppbnRlbF9wbGFuZSwKKwkJICAgICBjb25zdCBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3Rh dGUgKmludGVsX3BzdGF0ZSwKIAkJICAgICBpbnQgbGV2ZWwsCiAJCSAgICAgc3RydWN0IHNrbF93 bV9sZXZlbCAqcmVzdWx0KQogewotCXN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSA9IGNz dGF0ZS0+YmFzZS5zdGF0ZTsKIAlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2lu dGVsX2NydGMoY3N0YXRlLT5iYXNlLmNydGMpOwotCXN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lID0g JmludGVsX3BsYW5lLT5iYXNlOwotCXN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqaW50ZWxfcHN0 YXRlID0gTlVMTDsKKwlzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSA9IGludGVsX3BzdGF0ZS0+YmFz ZS5wbGFuZTsKKwlzdHJ1Y3QgaW50ZWxfcGxhbmUgKmludGVsX3BsYW5lID0gdG9faW50ZWxfcGxh bmUocGxhbmUpOwogCXVpbnQxNl90IGRkYl9ibG9ja3M7CiAJZW51bSBwaXBlIHBpcGUgPSBpbnRl bF9jcnRjLT5waXBlOwogCWludCByZXQ7CiAKLQlpZiAoc3RhdGUpCi0JCWludGVsX3BzdGF0ZSA9 Ci0JCQlpbnRlbF9hdG9taWNfZ2V0X2V4aXN0aW5nX3BsYW5lX3N0YXRlKHN0YXRlLAotCQkJCQkJ CSAgICAgIGludGVsX3BsYW5lKTsKLQotCS8qCi0JICogTm90ZTogSWYgd2Ugc3RhcnQgc3VwcG9y dGluZyBtdWx0aXBsZSBwZW5kaW5nIGF0b21pYyBjb21taXRzIGFnYWluc3QKLQkgKiB0aGUgc2Ft ZSBwbGFuZXMvQ1JUQydzIGluIHRoZSBmdXR1cmUsIHBsYW5lLT5zdGF0ZSB3aWxsIG5vIGxvbmdl ciBiZQotCSAqIHRoZSBjb3JyZWN0IHByZS1zdGF0ZSB0byB1c2UgZm9yIHRoZSBjYWxjdWxhdGlv bnMgaGVyZSBhbmQgd2UnbGwKLQkgKiBuZWVkIHRvIGNoYW5nZSB3aGVyZSB3ZSBnZXQgdGhlICd1 bmNoYW5nZWQnIHBsYW5lIGRhdGEgZnJvbS4KLQkgKgotCSAqIEZvciBub3cgdGhpcyBpcyBmaW5l IGJlY2F1c2Ugd2Ugb25seSBhbGxvdyBvbmUgcXVldWVkIGNvbW1pdCBhZ2FpbnN0Ci0JICogYSBD UlRDLiAgRXZlbiBpZiB0aGUgcGxhbmUgaXNuJ3QgbW9kaWZpZWQgYnkgdGhpcyB0cmFuc2FjdGlv biBhbmQgd2UKLQkgKiBkb24ndCBoYXZlIGEgcGxhbmUgbG9jaywgd2Ugc3RpbGwgaGF2ZSB0aGUg Q1JUQydzIGxvY2ssIHNvIHdlIGtub3cKLQkgKiB0aGF0IG5vIG90aGVyIHRyYW5zYWN0aW9ucyBh cmUgcmFjaW5nIHdpdGggdXMgdG8gdXBkYXRlIGl0LgotCSAqLwotCWlmICghaW50ZWxfcHN0YXRl KQotCQlpbnRlbF9wc3RhdGUgPSB0b19pbnRlbF9wbGFuZV9zdGF0ZShwbGFuZS0+c3RhdGUpOwot CiAJaWYgKFdBUk5fT04oIWludGVsX3BzdGF0ZS0+YmFzZS5mYikpCiAJCXJldHVybiAtRUlOVkFM OwogCkBAIC00NDc1LDggKzQ0NTYsMTAgQEAgc3RhdGljIGludCBza2xfYnVpbGRfcGlwZV93bShz dHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlLAogCQkJICAgICBzdHJ1Y3Qgc2tsX3BpcGVf d20gKnBpcGVfd20pCiB7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNzdGF0ZS0+YmFzZS5j cnRjLT5kZXY7CisJc3RydWN0IGRybV9jcnRjX3N0YXRlICpjcnRjX3N0YXRlID0gJmNzdGF0ZS0+ YmFzZTsKIAljb25zdCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1 KGRldik7Ci0Jc3RydWN0IGludGVsX3BsYW5lICppbnRlbF9wbGFuZTsKKwlzdHJ1Y3QgZHJtX3Bs YW5lICpwbGFuZTsKKwljb25zdCBzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpwc3RhdGU7CiAJc3Ry dWN0IHNrbF9wbGFuZV93bSAqd207CiAJaW50IGxldmVsLCBtYXhfbGV2ZWwgPSBpbGtfd21fbWF4 X2xldmVsKGRldl9wcml2KTsKIAlpbnQgcmV0OwpAQCAtNDQ4NywxNCArNDQ3MCwxNiBAQCBzdGF0 aWMgaW50IHNrbF9idWlsZF9waXBlX3dtKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjc3RhdGUs CiAJICovCiAJbWVtc2V0KHBpcGVfd20tPnBsYW5lcywgMCwgc2l6ZW9mKHBpcGVfd20tPnBsYW5l cykpOwogCi0JZm9yX2VhY2hfaW50ZWxfcGxhbmVfbWFzaygmZGV2X3ByaXYtPmRybSwKLQkJCQkg IGludGVsX3BsYW5lLAotCQkJCSAgY3N0YXRlLT5iYXNlLnBsYW5lX21hc2spIHsKLQkJd20gPSAm cGlwZV93bS0+cGxhbmVzW2ludGVsX3BsYW5lLT5pZF07CisJZHJtX2F0b21pY19jcnRjX3N0YXRl X2Zvcl9lYWNoX3BsYW5lX3N0YXRlKHBsYW5lLCBwc3RhdGUsIGNydGNfc3RhdGUpIHsKKwkJY29u c3Qgc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICppbnRlbF9wc3RhdGUgPQorCQkJCQkJdG9faW50 ZWxfcGxhbmVfc3RhdGUocHN0YXRlKTsKKwkJZW51bSBwbGFuZV9pZCBwbGFuZV9pZCA9IHRvX2lu dGVsX3BsYW5lKHBsYW5lKS0+aWQ7CisKKwkJd20gPSAmcGlwZV93bS0+cGxhbmVzW3BsYW5lX2lk XTsKIAogCQlmb3IgKGxldmVsID0gMDsgbGV2ZWwgPD0gbWF4X2xldmVsOyBsZXZlbCsrKSB7CiAJ CQlyZXQgPSBza2xfY29tcHV0ZV93bV9sZXZlbChkZXZfcHJpdiwgZGRiLCBjc3RhdGUsCi0JCQkJ CQkgICBpbnRlbF9wbGFuZSwgbGV2ZWwsCisJCQkJCQkgICBpbnRlbF9wc3RhdGUsIGxldmVsLAog CQkJCQkJICAgJndtLT53bVtsZXZlbF0pOwogCQkJaWYgKHJldCkKIAkJCQlyZXR1cm4gcmV0Owot LSAKMi4xMS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcK aHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK