From: Ville Syrjala Subject: [PATCH v2 09/12] drm/i915: Sanitize wm latency values for ilk+ Date: Fri, 26 Oct 2018 22:11:23 +0300 Message-ID: <20181026191123.28550-1-ville.syrjala@linux.intel.com> References: <20181010130454.28557-10-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id 643646E53E for ; Fri, 26 Oct 2018 19:11:26 +0000 (UTC) In-Reply-To: <20181010130454.28557-10-ville.syrjala@linux.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 List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCkZv ciBza2wrIHdlIGRpc2FibGUgYWxsIHdtIGxldmVscyB3aXRoIGEgZGVjcmVhc2luZyBtZW1vcnkg bGF0ZW5jeQp2YWx1ZS4gTGV0J3MgZ2VuZXJhbGl6ZSB0aGUgc2FtZSBjb2RlIHRvIHdvcmsgZm9y IGFsbCBwbGF0b2Zvcm1zLAphbmQgbGV0J3MgdXNlIGl0IGZvciBpbGstYmR3IGFzIHdlbGwgc2lu Y2UgdGhvc2UgcGxhdGZvcm1zIGFsc28KcmVhZCB0aGUgbGF0ZW5jeSB2YWx1ZXMgZnJvbSBhIHNj cmF0Y2ggcmVnaXN0ZXIuCgp2MjogbioxMCB1c2VjLCByZWJhc2UKClNpZ25lZC1vZmYtYnk6IFZp bGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyB8IDU3ICsrKysrKysrKysrKysrKysrKysrKysrKy0t LS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDQyIGluc2VydGlvbnMoKyksIDE1IGRlbGV0aW9ucygt KQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCmluZGV4IDg4MjBjNTljNTZlNC4uYzcyZDNmZDcxYjZm IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKQEAgLTI4MjUsNiArMjgyNSw0MSBAQCBoc3dfY29t cHV0ZV9saW5ldGltZV93bShjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlKQog CSAgICAgICBQSVBFX1dNX0xJTkVUSU1FX1RJTUUobGluZXRpbWUpOwogfQogCitzdGF0aWMgdm9p ZCBpbnRlbF9zYW5pdGl6ZV93bV9sYXRlbmN5KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdiwKKwkJCQkgICAgICB1MTYgKndtKQoreworCWludCBsZXZlbCwgbnVtX2xldmVscyA9IGRl dl9wcml2LT53bS5udW1fbGV2ZWxzOworCisJLyoKKwkgKiBJZiB3ZSBkb24ndCBoYXZlIFdNMCBs YXRlbmN5LCBhc3N1bWUKKwkgKiA1IHVzZWMgYW5kIGRpc2FibGUgYWxsIFdNMSsgbGV2ZWxzLgor CSAqIDUgdXNlYyBzZWVtcyBsaWtlIGEgc2FmZShpc2gpIGZhbGxiYWNrIHZhbHVlLgorCSAqLwor CWlmIChXQVJOKHdtWzBdID09IDAsICJXTTAgbWVtb3J5IGxhdGVuY3kgdmFsdWUgaXMgemVybyIp KSB7CisJCWludGVsX3ByaW50X3dtX2xhdGVuY3koZGV2X3ByaXYsICJCYWQiLCB3bSk7CisKKwkJ d21bMF0gPSA1ICogMTA7CisKKwkJZm9yIChsZXZlbCA9IDE7IGxldmVsIDwgbnVtX2xldmVsczsg bGV2ZWwrKykKKwkJCXdtW2xldmVsXSA9IDA7CisJCXJldHVybjsKKwl9CisKKwkvKiBNYWtlIHN1 cmUgdGhlIGxhdGVuY2llcyBhcmUgbm9uLWRlY3JlYXNpbmcgKi8KKwlmb3IgKGxldmVsID0gMTsg bGV2ZWwgPCBudW1fbGV2ZWxzOyBsZXZlbCsrKSB7CisJCWlmICh3bVtsZXZlbF0gPj0gd21bbGV2 ZWwgLSAxXSkKKwkJCWNvbnRpbnVlOworCisJCWlmIChXQVJOKHdtW2xldmVsXSAhPSAwLAorCQkJ ICJEZWNyZWFzaW5nIFdNIG1lbW9yeSBsYXRlbmN5IHZhbHVlKHMpIikpCisJCQlpbnRlbF9wcmlu dF93bV9sYXRlbmN5KGRldl9wcml2LCAiQmFkIiwgd20pOworCisJCWZvciAoOyBsZXZlbCA8IG51 bV9sZXZlbHM7IGxldmVsKyspCisJCQl3bVtsZXZlbF0gPSAwOworCQlicmVhazsKKwl9Cit9CisK IHN0YXRpYyB2b2lkIGlsa19yZWFkX3dtX2xhdGVuY3koc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2LAogCQkJCXUxNiB3bVs1XSkKIHsKQEAgLTI5MzQsNiArMjk2OSwxMCBAQCBzdGF0 aWMgdm9pZCBpbGtfc2V0dXBfd21fbGF0ZW5jeShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYpCiAJaWxrX2ZpeHVwX3Nwcl9jdXJfd21fbGF0ZW5jeShkZXZfcHJpdiwgZGV2X3ByaXYt PndtLnNwcl9sYXRlbmN5KTsKIAlpbGtfZml4dXBfc3ByX2N1cl93bV9sYXRlbmN5KGRldl9wcml2 LCBkZXZfcHJpdi0+d20uY3VyX2xhdGVuY3kpOwogCisJaW50ZWxfc2FuaXRpemVfd21fbGF0ZW5j eShkZXZfcHJpdiwgZGV2X3ByaXYtPndtLnByaV9sYXRlbmN5KTsKKwlpbnRlbF9zYW5pdGl6ZV93 bV9sYXRlbmN5KGRldl9wcml2LCBkZXZfcHJpdi0+d20uc3ByX2xhdGVuY3kpOworCWludGVsX3Nh bml0aXplX3dtX2xhdGVuY3koZGV2X3ByaXYsIGRldl9wcml2LT53bS5jdXJfbGF0ZW5jeSk7CisK IAlpbnRlbF9wcmludF93bV9sYXRlbmN5KGRldl9wcml2LCAiUHJpbWFyeSIsIGRldl9wcml2LT53 bS5wcmlfbGF0ZW5jeSk7CiAJaW50ZWxfcHJpbnRfd21fbGF0ZW5jeShkZXZfcHJpdiwgIlNwcml0 ZSIsIGRldl9wcml2LT53bS5zcHJfbGF0ZW5jeSk7CiAJaW50ZWxfcHJpbnRfd21fbGF0ZW5jeShk ZXZfcHJpdiwgIkN1cnNvciIsIGRldl9wcml2LT53bS5jdXJfbGF0ZW5jeSk7CkBAIC0yOTQ1LDgg KzI5ODQsNyBAQCBzdGF0aWMgdm9pZCBpbGtfc2V0dXBfd21fbGF0ZW5jeShzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiBzdGF0aWMgdm9pZCBza2xfcmVhZF93bV9sYXRlbmN5KHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJCQl1MTYgd21bOF0pCiB7Ci0JaW50 IGxldmVsLCBudW1fbGV2ZWxzID0gZGV2X3ByaXYtPndtLm51bV9sZXZlbHM7Ci0JaW50IHJldCwg aTsKKwlpbnQgcmV0OwogCXUzMiB2YWw7CiAKIAkvKiByZWFkIHRoZSBmaXJzdCBzZXQgb2YgbWVt b3J5IGxhdGVuY2llc1swOjNdICovCkBAIC0yOTg5LDE5ICszMDI3LDYgQEAgc3RhdGljIHZvaWQg c2tsX3JlYWRfd21fbGF0ZW5jeShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJ CUdFTjlfTUVNX0xBVEVOQ1lfTEVWRUxfTUFTSzsKIAl3bVs3XSA9ICh2YWwgPj4gR0VOOV9NRU1f TEFURU5DWV9MRVZFTF8zXzdfU0hJRlQpICYKIAkJR0VOOV9NRU1fTEFURU5DWV9MRVZFTF9NQVNL OwotCi0JLyoKLQkgKiBJZiBhIGxldmVsIG4gKG4gPiAxKSBoYXMgYSAwdXMgbGF0ZW5jeSwgYWxs IGxldmVscyBtIChtID49IG4pCi0JICogbmVlZCB0byBiZSBkaXNhYmxlZC4gV2UgbWFrZSBzdXJl IHRvIHNhbml0aXplIHRoZSB2YWx1ZXMgb3V0Ci0JICogb2YgdGhlIHB1bml0IHRvIHNhdGlzZnkg dGhpcyByZXF1aXJlbWVudC4KLQkgKi8KLQlmb3IgKGxldmVsID0gMTsgbGV2ZWwgPCBudW1fbGV2 ZWxzOyBsZXZlbCsrKSB7Ci0JCWlmICh3bVtsZXZlbF0gPT0gMCkgewotCQkJZm9yIChpID0gbGV2 ZWwgKyAxOyBpIDwgbnVtX2xldmVsczsgaSsrKQotCQkJCXdtW2ldID0gMDsKLQkJCWJyZWFrOwot CQl9Ci0JfQogfQogCiBzdGF0aWMgdm9pZCBza2xfZml4dXBfd21fbGF0ZW5jeV91bml0cyhzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCkBAIC0zMDU2LDYgKzMwODEsOCBAQCBzdGF0 aWMgdm9pZCBza2xfc2V0dXBfd21fbGF0ZW5jeShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYpCiAKIAlza2xfd21fbGF0ZW5jeV93YShkZXZfcHJpdiwgZGV2X3ByaXYtPndtLnByaV9s YXRlbmN5KTsKIAorCWludGVsX3Nhbml0aXplX3dtX2xhdGVuY3koZGV2X3ByaXYsIGRldl9wcml2 LT53bS5wcmlfbGF0ZW5jeSk7CisKIAltZW1jcHkoZGV2X3ByaXYtPndtLnNwcl9sYXRlbmN5LCBk ZXZfcHJpdi0+d20ucHJpX2xhdGVuY3ksCiAJICAgICAgIHNpemVvZihkZXZfcHJpdi0+d20ucHJp X2xhdGVuY3kpKTsKIAltZW1jcHkoZGV2X3ByaXYtPndtLmN1cl9sYXRlbmN5LCBkZXZfcHJpdi0+ d20ucHJpX2xhdGVuY3ksCi0tIAoyLjE4LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3Rz LmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xp c3RpbmZvL2ludGVsLWdmeAo=