From mboxrd@z Thu Jan  1 00:00:00 1970
From: Mahesh Kumar <mahesh1.kumar@intel.com>
Subject: [PATCH 6/8] drm/i915/skl+: Watermark calculation cleanup
Date: Tue, 28 Feb 2017 17:01:41 +0530
Message-ID: <20170228113143.8280-7-mahesh1.kumar@intel.com>
References: <20170228113143.8280-1-mahesh1.kumar@intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mga04.intel.com (mga04.intel.com [192.55.52.120])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 8AC1C6E6DC
 for <intel-gfx@lists.freedesktop.org>; Tue, 28 Feb 2017 11:29:28 +0000 (UTC)
In-Reply-To: <20170228113143.8280-1-mahesh1.kumar@intel.com>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: intel-gfx@lists.freedesktop.org
Cc: paulo.r.zanoni@intel.com, maarten.lankhorst@intel.com
List-Id: intel-gfx@lists.freedesktop.org

VGhpcyBwYXRjaCBjbGVhbnMgdGhlIHdhdGVybWFyayBjYWxjdWxhdGlvbiBmdW5jdGlvbnMuIFRo
aXMgcGF0Y2ggbWFrZQp1c2Ugb2YgYWxyZWFkeSBhdmFpbGFibGUgbWFjcm8gdG8gd2FsayB0aHJv
dWdoIHBsYW5lX3N0YXRlIGxpc3QgaW5zdGVhZApvZiBjYWxjdWxhdGluZyBwbGFuZV9zdGF0ZSBp
biBmdW5jdGlvbiBpdHNlbGYuCk5vdyB3ZSBpdGVyYXRlIG92ZXIgV00gbGV2ZWxzIGluIHNrbF9j
b21wdXRlX3dtX2xldmVsIGZ1bmN0aW9uLgoKU2lnbmVkLW9mZi1ieTogTWFoZXNoIEt1bWFyIDxt
YWhlc2gxLmt1bWFyQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9w
bS5jIHwgODkgKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmls
ZSBjaGFuZ2VkLCAzNyBpbnNlcnRpb25zKCspLCA1MiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQg
YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv
aW50ZWxfcG0uYwppbmRleCAyNGU5ZTVkNjk4MzMuLjUxYTQ4M2M2ODUyMSAxMDA2NDQKLS0tIGEv
ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx
NS9pbnRlbF9wbS5jCkBAIC0zNTQyLDcgKzM1NDIsNyBAQCBza2xfZ2V0X2xpbmV0aW1lX3VzKHN0
cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjc3RhdGUpCiB9CiAKIHN0YXRpYyB1aW50MzJfdCBza2xf
YWRqdXN0ZWRfcGxhbmVfcGl4ZWxfcmF0ZShjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAq
Y3N0YXRlLAotCQkJCQkgICAgICBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnBzdGF0ZSkKKwkJ
CQkJICAgICAgY29uc3Qgc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpwc3RhdGUpCiB7CiAJdWlu
dDY0X3QgYWRqdXN0ZWRfcGl4ZWxfcmF0ZTsKIAl1aW50X2ZpeGVkXzE2XzE2X3QgZG93bnNjYWxl
X2Ftb3VudDsKQEAgLTM1NjQsMTUgKzM1NjQsMTUgQEAgc3RhdGljIHVpbnQzMl90IHNrbF9hZGp1
c3RlZF9wbGFuZV9waXhlbF9yYXRlKGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjc3QK
IAogc3RhdGljIGludCBza2xfY29tcHV0ZV9wbGFuZV93bShjb25zdCBzdHJ1Y3QgZHJtX2k5MTVf
cHJpdmF0ZSAqZGV2X3ByaXYsCiAJCQkJc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSwK
LQkJCQlzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKmludGVsX3BzdGF0ZSwKKwkJCQljb25zdCBz
dHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKmludGVsX3BzdGF0ZSwKIAkJCQl1aW50MTZfdCBkZGJf
YWxsb2NhdGlvbiwKIAkJCQlpbnQgbGV2ZWwsCiAJCQkJdWludDE2X3QgKm91dF9ibG9ja3MsIC8q
IG91dCAqLwogCQkJCXVpbnQ4X3QgKm91dF9saW5lcywgLyogb3V0ICovCiAJCQkJYm9vbCAqZW5h
YmxlZCAvKiBvdXQgKi8pCiB7Ci0Jc3RydWN0IGRybV9wbGFuZV9zdGF0ZSAqcHN0YXRlID0gJmlu
dGVsX3BzdGF0ZS0+YmFzZTsKLQlzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiA9IHBzdGF0ZS0+
ZmI7CisJY29uc3Qgc3RydWN0IGRybV9wbGFuZV9zdGF0ZSAqcHN0YXRlID0gJmludGVsX3BzdGF0
ZS0+YmFzZTsKKwljb25zdCBzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiA9IHBzdGF0ZS0+ZmI7
CiAJdWludDMyX3QgbGF0ZW5jeSA9IGRldl9wcml2LT53bS5za2xfbGF0ZW5jeVtsZXZlbF07CiAJ
dWludF9maXhlZF8xNl8xNl90IG1ldGhvZDEsIG1ldGhvZDI7CiAJdWludF9maXhlZF8xNl8xNl90
IHBsYW5lX2Jsb2Nrc19wZXJfbGluZTsKQEAgLTM3MjcsNTIgKzM3MjcsMzYgQEAgc3RhdGljIGlu
dAogc2tsX2NvbXB1dGVfd21fbGV2ZWwoY29uc3Qgc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl
dl9wcml2LAogCQkgICAgIHN0cnVjdCBza2xfZGRiX2FsbG9jYXRpb24gKmRkYiwKIAkJICAgICBz
dHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlLAotCQkgICAgIHN0cnVjdCBpbnRlbF9wbGFu
ZSAqaW50ZWxfcGxhbmUsCi0JCSAgICAgaW50IGxldmVsLAotCQkgICAgIHN0cnVjdCBza2xfd21f
bGV2ZWwgKnJlc3VsdCkKKwkJICAgICBjb25zdCBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKmlu
dGVsX3BzdGF0ZSwKKwkJICAgICBzdHJ1Y3Qgc2tsX3BsYW5lX3dtICp3bSkKIHsKLQlzdHJ1Y3Qg
ZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUgPSBjc3RhdGUtPmJhc2Uuc3RhdGU7CiAJc3RydWN0IGlu
dGVsX2NydGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGNzdGF0ZS0+YmFzZS5jcnRjKTsK
LQlzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSA9ICZpbnRlbF9wbGFuZS0+YmFzZTsKLQlzdHJ1Y3Qg
aW50ZWxfcGxhbmVfc3RhdGUgKmludGVsX3BzdGF0ZSA9IE5VTEw7CisJc3RydWN0IGRybV9wbGFu
ZSAqcGxhbmUgPSBpbnRlbF9wc3RhdGUtPmJhc2UucGxhbmU7CisJc3RydWN0IGludGVsX3BsYW5l
ICppbnRlbF9wbGFuZSA9IHRvX2ludGVsX3BsYW5lKHBsYW5lKTsKIAl1aW50MTZfdCBkZGJfYmxv
Y2tzOwogCWVudW0gcGlwZSBwaXBlID0gaW50ZWxfY3J0Yy0+cGlwZTsKKwlpbnQgbGV2ZWwsIG1h
eF9sZXZlbCA9IGlsa193bV9tYXhfbGV2ZWwoZGV2X3ByaXYpOwogCWludCByZXQ7CiAKLQlpZiAo
c3RhdGUpCi0JCWludGVsX3BzdGF0ZSA9Ci0JCQlpbnRlbF9hdG9taWNfZ2V0X2V4aXN0aW5nX3Bs
YW5lX3N0YXRlKHN0YXRlLAotCQkJCQkJCSAgICAgIGludGVsX3BsYW5lKTsKLQotCS8qCi0JICog
Tm90ZTogSWYgd2Ugc3RhcnQgc3VwcG9ydGluZyBtdWx0aXBsZSBwZW5kaW5nIGF0b21pYyBjb21t
aXRzIGFnYWluc3QKLQkgKiB0aGUgc2FtZSBwbGFuZXMvQ1JUQydzIGluIHRoZSBmdXR1cmUsIHBs
YW5lLT5zdGF0ZSB3aWxsIG5vIGxvbmdlciBiZQotCSAqIHRoZSBjb3JyZWN0IHByZS1zdGF0ZSB0
byB1c2UgZm9yIHRoZSBjYWxjdWxhdGlvbnMgaGVyZSBhbmQgd2UnbGwKLQkgKiBuZWVkIHRvIGNo
YW5nZSB3aGVyZSB3ZSBnZXQgdGhlICd1bmNoYW5nZWQnIHBsYW5lIGRhdGEgZnJvbS4KLQkgKgot
CSAqIEZvciBub3cgdGhpcyBpcyBmaW5lIGJlY2F1c2Ugd2Ugb25seSBhbGxvdyBvbmUgcXVldWVk
IGNvbW1pdCBhZ2FpbnN0Ci0JICogYSBDUlRDLiAgRXZlbiBpZiB0aGUgcGxhbmUgaXNuJ3QgbW9k
aWZpZWQgYnkgdGhpcyB0cmFuc2FjdGlvbiBhbmQgd2UKLQkgKiBkb24ndCBoYXZlIGEgcGxhbmUg
bG9jaywgd2Ugc3RpbGwgaGF2ZSB0aGUgQ1JUQydzIGxvY2ssIHNvIHdlIGtub3cKLQkgKiB0aGF0
IG5vIG90aGVyIHRyYW5zYWN0aW9ucyBhcmUgcmFjaW5nIHdpdGggdXMgdG8gdXBkYXRlIGl0Lgot
CSAqLwotCWlmICghaW50ZWxfcHN0YXRlKQotCQlpbnRlbF9wc3RhdGUgPSB0b19pbnRlbF9wbGFu
ZV9zdGF0ZShwbGFuZS0+c3RhdGUpOwotCiAJaWYgKFdBUk5fT04oIWludGVsX3BzdGF0ZS0+YmFz
ZS5mYikpCiAJCXJldHVybiAtRUlOVkFMOwogCiAJZGRiX2Jsb2NrcyA9IHNrbF9kZGJfZW50cnlf
c2l6ZSgmZGRiLT5wbGFuZVtwaXBlXVtpbnRlbF9wbGFuZS0+aWRdKTsKIAotCXJldCA9IHNrbF9j
b21wdXRlX3BsYW5lX3dtKGRldl9wcml2LAotCQkJCSAgIGNzdGF0ZSwKLQkJCQkgICBpbnRlbF9w
c3RhdGUsCi0JCQkJICAgZGRiX2Jsb2NrcywKLQkJCQkgICBsZXZlbCwKLQkJCQkgICAmcmVzdWx0
LT5wbGFuZV9yZXNfYiwKLQkJCQkgICAmcmVzdWx0LT5wbGFuZV9yZXNfbCwKLQkJCQkgICAmcmVz
dWx0LT5wbGFuZV9lbik7Ci0JaWYgKHJldCkKLQkJcmV0dXJuIHJldDsKKwlmb3IgKGxldmVsID0g
MDsgbGV2ZWwgPD0gbWF4X2xldmVsOyBsZXZlbCsrKSB7CisJCXN0cnVjdCBza2xfd21fbGV2ZWwg
KnJlc3VsdCA9ICZ3bS0+d21bbGV2ZWxdOworCisJCXJldCA9IHNrbF9jb21wdXRlX3BsYW5lX3dt
KGRldl9wcml2LAorCQkJCQkgICBjc3RhdGUsCisJCQkJCSAgIGludGVsX3BzdGF0ZSwKKwkJCQkJ
ICAgZGRiX2Jsb2NrcywKKwkJCQkJICAgbGV2ZWwsCisJCQkJCSAgICZyZXN1bHQtPnBsYW5lX3Jl
c19iLAorCQkJCQkgICAmcmVzdWx0LT5wbGFuZV9yZXNfbCwKKwkJCQkJICAgJnJlc3VsdC0+cGxh
bmVfZW4pOworCQlpZiAocmV0KQorCQkJcmV0dXJuIHJldDsKKwl9CiAKIAlyZXR1cm4gMDsKIH0K
QEAgLTM4MTUsMTAgKzM3OTksMTEgQEAgc3RhdGljIGludCBza2xfYnVpbGRfcGlwZV93bShzdHJ1
Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlLAogCQkJICAgICBzdHJ1Y3Qgc2tsX3BpcGVfd20g
KnBpcGVfd20pCiB7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNzdGF0ZS0+YmFzZS5jcnRj
LT5kZXY7CisJc3RydWN0IGRybV9jcnRjX3N0YXRlICpjcnRjX3N0YXRlID0gJmNzdGF0ZS0+YmFz
ZTsKIAljb25zdCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRl
dik7Ci0Jc3RydWN0IGludGVsX3BsYW5lICppbnRlbF9wbGFuZTsKKwlzdHJ1Y3QgZHJtX3BsYW5l
ICpwbGFuZTsKKwljb25zdCBzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpwc3RhdGU7CiAJc3RydWN0
IHNrbF9wbGFuZV93bSAqd207Ci0JaW50IGxldmVsLCBtYXhfbGV2ZWwgPSBpbGtfd21fbWF4X2xl
dmVsKGRldl9wcml2KTsKIAlpbnQgcmV0OwogCiAJLyoKQEAgLTM4MjcsMTggKzM4MTIsMTggQEAg
c3RhdGljIGludCBza2xfYnVpbGRfcGlwZV93bShzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0
YXRlLAogCSAqLwogCW1lbXNldChwaXBlX3dtLT5wbGFuZXMsIDAsIHNpemVvZihwaXBlX3dtLT5w
bGFuZXMpKTsKIAotCWZvcl9lYWNoX2ludGVsX3BsYW5lX21hc2soJmRldl9wcml2LT5kcm0sCi0J
CQkJICBpbnRlbF9wbGFuZSwKLQkJCQkgIGNzdGF0ZS0+YmFzZS5wbGFuZV9tYXNrKSB7Ci0JCXdt
ID0gJnBpcGVfd20tPnBsYW5lc1tpbnRlbF9wbGFuZS0+aWRdOworCWRybV9hdG9taWNfY3J0Y19z
dGF0ZV9mb3JfZWFjaF9wbGFuZV9zdGF0ZShwbGFuZSwgcHN0YXRlLCBjcnRjX3N0YXRlKSB7CisJ
CWNvbnN0IHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqaW50ZWxfcHN0YXRlID0KKwkJCQkJCXRv
X2ludGVsX3BsYW5lX3N0YXRlKHBzdGF0ZSk7CisJCWVudW0gcGxhbmVfaWQgcGxhbmVfaWQgPSB0
b19pbnRlbF9wbGFuZShwbGFuZSktPmlkOworCisJCXdtID0gJnBpcGVfd20tPnBsYW5lc1twbGFu
ZV9pZF07CisKKwkJcmV0ID0gc2tsX2NvbXB1dGVfd21fbGV2ZWwoZGV2X3ByaXYsIGRkYiwgY3N0
YXRlLAorCQkJCQkgICBpbnRlbF9wc3RhdGUsIHdtKTsKKwkJaWYgKHJldCkKKwkJCXJldHVybiBy
ZXQ7CiAKLQkJZm9yIChsZXZlbCA9IDA7IGxldmVsIDw9IG1heF9sZXZlbDsgbGV2ZWwrKykgewot
CQkJcmV0ID0gc2tsX2NvbXB1dGVfd21fbGV2ZWwoZGV2X3ByaXYsIGRkYiwgY3N0YXRlLAotCQkJ
CQkJICAgaW50ZWxfcGxhbmUsIGxldmVsLAotCQkJCQkJICAgJndtLT53bVtsZXZlbF0pOwotCQkJ
aWYgKHJldCkKLQkJCQlyZXR1cm4gcmV0OwotCQl9CiAJCXNrbF9jb21wdXRlX3RyYW5zaXRpb25f
d20oY3N0YXRlLCAmd20tPnRyYW5zX3dtKTsKIAl9CiAJcGlwZV93bS0+bGluZXRpbWUgPSBza2xf
Y29tcHV0ZV9saW5ldGltZV93bShjc3RhdGUpOwotLSAKMi4xMS4wCgpfX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0Cklu
dGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5v
cmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK