From: ville.syrjala@linux.intel.com Subject: [PATCH 12/18] drm/i915: Sanitize VLV/CHV watermarks properly Date: Thu, 16 Feb 2017 20:07:45 +0200 Message-ID: <20170216180751.3097-13-ville.syrjala@linux.intel.com> References: <20170216180751.3097-1-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 086B76EC03 for ; Thu, 16 Feb 2017 18:08:30 +0000 (UTC) In-Reply-To: <20170216180751.3097-1-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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCkNs ZWFyIG91dCB0aGUgd2F0ZXJtYXJrIGZvciBhbGwgZGlzYWJsZWQgcGxhbmVzIHRvIDAuIFRoaXMg aXMgcmVxdWlyZWQKdG8gYXZvaWQgZmFsc2VseSB0aGlua2luZyB0aGF0IHRoZSBpbmhlcml0ZWQg d2F0ZXJtYXJrcyBhcmUgYm9ndXMgaW4KY2FzZSB0aGUgd2F0ZXJtYXJrIGlzIGFjdHVhbGx5IGhp Z2hlciB0aGFuIHRoZSBGSUZPIHNpemUuCgpTaWduZWQtb2ZmLWJ5OiBWaWxsZSBTeXJqw6Rsw6Qg PHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2Rpc3BsYXkuYyB8IDE3ICsrKysrKystLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZHJ2LmggICAgIHwgIDEgKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyAg ICAgIHwgNTAgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKystCiAzIGZpbGVzIGNo YW5nZWQsIDYxIGluc2VydGlvbnMoKyksIDcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZGlzcGxheS5jCmluZGV4IGE4ZjI4ZTc3Njg3OS4uOWZlZjI0OTQ0YzhlIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC0zNDgxLDcgKzM0ODEsOCBAQCBfX2ludGVs X2Rpc3BsYXlfcmVzdW1lKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJfQogCiAJLyogaWdub3Jl IGFueSByZXNldCB2YWx1ZXMvQklPUyBsZWZ0b3ZlcnMgaW4gdGhlIFdNIHJlZ2lzdGVycyAqLwot CXRvX2ludGVsX2F0b21pY19zdGF0ZShzdGF0ZSktPnNraXBfaW50ZXJtZWRpYXRlX3dtID0gdHJ1 ZTsKKwlpZiAoIUhBU19HTUNIX0RJU1BMQVkodG9faTkxNShkZXYpKSkKKwkJdG9faW50ZWxfYXRv bWljX3N0YXRlKHN0YXRlKS0+c2tpcF9pbnRlcm1lZGlhdGVfd20gPSB0cnVlOwogCiAJcmV0ID0g ZHJtX2F0b21pY19oZWxwZXJfY29tbWl0X2R1cGxpY2F0ZWRfc3RhdGUoc3RhdGUsIGN0eCk7CiAK QEAgLTE0OTUyLDcgKzE0OTUzLDggQEAgc3RhdGljIHZvaWQgc2FuaXRpemVfd2F0ZXJtYXJrcyhz dHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCSAqIGludGVybWVkaWF0ZSB3YXRlcm1hcmtzIChzaW5j ZSB3ZSBkb24ndCB0cnVzdCB0aGUgY3VycmVudAogCSAqIHdhdGVybWFya3MpLgogCSAqLwotCWlu dGVsX3N0YXRlLT5za2lwX2ludGVybWVkaWF0ZV93bSA9IHRydWU7CisJaWYgKCFIQVNfR01DSF9E SVNQTEFZKGRldl9wcml2KSkKKwkJaW50ZWxfc3RhdGUtPnNraXBfaW50ZXJtZWRpYXRlX3dtID0g dHJ1ZTsKIAogCXJldCA9IGludGVsX2F0b21pY19jaGVjayhkZXYsIHN0YXRlKTsKIAlpZiAocmV0 KSB7CkBAIC0xNTExNiw3ICsxNTExOCw4IEBAIGludCBpbnRlbF9tb2Rlc2V0X2luaXQoc3RydWN0 IGRybV9kZXZpY2UgKmRldikKIAkgKiBOb3RlIHRoYXQgd2UgbmVlZCB0byBkbyB0aGlzIGFmdGVy IHJlY29uc3RydWN0aW5nIHRoZSBCSU9TIGZiJ3MKIAkgKiBzaW5jZSB0aGUgd2F0ZXJtYXJrIGNh bGN1bGF0aW9uIGRvbmUgaGVyZSB3aWxsIHVzZSBwc3RhdGUtPmZiLgogCSAqLwotCXNhbml0aXpl X3dhdGVybWFya3MoZGV2KTsKKwlpZiAoIUhBU19HTUNIX0RJU1BMQVkoZGV2X3ByaXYpKQorCQlz YW5pdGl6ZV93YXRlcm1hcmtzKGRldik7CiAKIAlyZXR1cm4gMDsKIH0KQEAgLTE1NTY3LDEyICsx NTU3MCwxNCBAQCBpbnRlbF9tb2Rlc2V0X3NldHVwX2h3X3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYpCiAJCXBsbC0+b24gPSBmYWxzZTsKIAl9CiAKLQlpZiAoSVNfVkFMTEVZVklFVyhkZXZf cHJpdikgfHwgSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpCisJaWYgKElTX1ZBTExFWVZJRVcoZGV2 X3ByaXYpIHx8IElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpKSB7CiAJCXZsdl93bV9nZXRfaHdfc3Rh dGUoZGV2KTsKLQllbHNlIGlmIChJU19HRU45KGRldl9wcml2KSkKKwkJdmx2X3dtX3Nhbml0aXpl KGRldl9wcml2KTsKKwl9IGVsc2UgaWYgKElTX0dFTjkoZGV2X3ByaXYpKSB7CiAJCXNrbF93bV9n ZXRfaHdfc3RhdGUoZGV2KTsKLQllbHNlIGlmIChIQVNfUENIX1NQTElUKGRldl9wcml2KSkKKwl9 IGVsc2UgaWYgKEhBU19QQ0hfU1BMSVQoZGV2X3ByaXYpKSB7CiAJCWlsa193bV9nZXRfaHdfc3Rh dGUoZGV2KTsKKwl9CiAKIAlmb3JfZWFjaF9pbnRlbF9jcnRjKGRldiwgY3J0YykgewogCQl1NjQg cHV0X2RvbWFpbnM7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYu aCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCmluZGV4IGQxOTc2MTdlN2VlYi4u MjUxNzk0YTllNWY0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYu aAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaApAQCAtMTgwNyw2ICsxODA3 LDcgQEAgdm9pZCBza2xfZGRiX2dldF9od19zdGF0ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYsCiAJCQkgIHN0cnVjdCBza2xfZGRiX2FsbG9jYXRpb24gKmRkYiAvKiBvdXQgKi8p Owogdm9pZCBza2xfcGlwZV93bV9nZXRfaHdfc3RhdGUoc3RydWN0IGRybV9jcnRjICpjcnRjLAog CQkJICAgICAgc3RydWN0IHNrbF9waXBlX3dtICpvdXQpOwordm9pZCB2bHZfd21fc2FuaXRpemUo c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKIGJvb2wgaW50ZWxfY2FuX2VuYWJs ZV9zYWd2KHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSk7CiBpbnQgaW50ZWxfZW5hYmxl X3NhZ3Yoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKIGludCBpbnRlbF9kaXNh YmxlX3NhZ3Yoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9wbS5jCmluZGV4IDViZWIyZDJkYjcwMS4uNTU4YTRlNWI0MmIwIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3BtLmMKQEAgLTQ3MTMsNyArNDcxMyw2IEBAIHZvaWQgdmx2X3dtX2dldF9od19zdGF0 ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCiAJCXZsdl9nZXRfZmlmb19zaXplKGNydGNfc3Rh dGUpOwogCi0JCS8qIEZJWE1FIHNhbml0aXplIHRoaW5ncyBtb3JlICovCiAJCWZvciAobGV2ZWwg PSAwOyBsZXZlbCA8IGFjdGl2ZS0+bnVtX2xldmVsczsgbGV2ZWwrKykgewogCQkJc3RydWN0IHZs dl9waXBlX3dtICpub25pbnZlcnRlZCA9CiAJCQkJJmNydGNfc3RhdGUtPndtLnZsdi5ub25pbnZl cnRlZFtsZXZlbF07CkBAIC00NzQ5LDYgKzQ3NDgsNTUgQEAgdm9pZCB2bHZfd21fZ2V0X2h3X3N0 YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCSAgICAgIHdtLT5zci5wbGFuZSwgd20tPnNy LmN1cnNvciwgd20tPmxldmVsLCB3bS0+Y3hzcik7CiB9CiAKK3ZvaWQgdmx2X3dtX3Nhbml0aXpl KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKK3sKKwlzdHJ1Y3QgaW50ZWxfcGxh bmUgKnBsYW5lOworCXN0cnVjdCBpbnRlbF9jcnRjICpjcnRjOworCisJbXV0ZXhfbG9jaygmZGV2 X3ByaXYtPndtLndtX211dGV4KTsKKworCWZvcl9lYWNoX2ludGVsX3BsYW5lKCZkZXZfcHJpdi0+ ZHJtLCBwbGFuZSkgeworCQlzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YyA9CisJCQlpbnRlbF9nZXRf Y3J0Y19mb3JfcGlwZShkZXZfcHJpdiwgcGxhbmUtPnBpcGUpOworCQlzdHJ1Y3QgaW50ZWxfY3J0 Y19zdGF0ZSAqY3J0Y19zdGF0ZSA9CisJCQl0b19pbnRlbF9jcnRjX3N0YXRlKGNydGMtPmJhc2Uu c3RhdGUpOworCQlzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnBsYW5lX3N0YXRlID0KKwkJCXRv X2ludGVsX3BsYW5lX3N0YXRlKHBsYW5lLT5iYXNlLnN0YXRlKTsKKwkJc3RydWN0IHZsdl93bV9z dGF0ZSAqd21fc3RhdGUgPSAmY3J0Y19zdGF0ZS0+d20udmx2Lm9wdGltYWw7CisJCWNvbnN0IHN0 cnVjdCB2bHZfZmlmb19zdGF0ZSAqZmlmb19zdGF0ZSA9CisJCQkmY3J0Y19zdGF0ZS0+d20udmx2 LmZpZm9fc3RhdGU7CisJCWVudW0gcGxhbmVfaWQgcGxhbmVfaWQgPSBwbGFuZS0+aWQ7CisJCWlu dCBsZXZlbDsKKworCQlpZiAocGxhbmVfc3RhdGUtPmJhc2UudmlzaWJsZSkKKwkJCWNvbnRpbnVl OworCisJCWZvciAobGV2ZWwgPSAwOyBsZXZlbCA8IHdtX3N0YXRlLT5udW1fbGV2ZWxzOyBsZXZl bCsrKSB7CisJCQlzdHJ1Y3Qgdmx2X3BpcGVfd20gKm5vbmludmVydGVkID0KKwkJCQkmY3J0Y19z dGF0ZS0+d20udmx2Lm5vbmludmVydGVkW2xldmVsXTsKKworCQkJbm9uaW52ZXJ0ZWQtPnBsYW5l W3BsYW5lX2lkXSA9IDA7CisKKwkJCXdtX3N0YXRlLT53bVtsZXZlbF0ucGxhbmVbcGxhbmVfaWRd ID0KKwkJCQl2bHZfaW52ZXJ0X3dtX3ZhbHVlKG5vbmludmVydGVkLT5wbGFuZVtwbGFuZV9pZF0s CisJCQkJCQkgICAgZmlmb19zdGF0ZS0+cGxhbmVbcGxhbmVfaWRdKTsKKwkJfQorCX0KKworCWZv cl9lYWNoX2ludGVsX2NydGMoJmRldl9wcml2LT5kcm0sIGNydGMpIHsKKwkJc3RydWN0IGludGVs X2NydGNfc3RhdGUgKmNydGNfc3RhdGUgPQorCQkJdG9faW50ZWxfY3J0Y19zdGF0ZShjcnRjLT5i YXNlLnN0YXRlKTsKKworCQljcnRjX3N0YXRlLT53bS52bHYuaW50ZXJtZWRpYXRlID0KKwkJCWNy dGNfc3RhdGUtPndtLnZsdi5vcHRpbWFsOworCQljcnRjLT53bS5hY3RpdmUudmx2ID0gY3J0Y19z dGF0ZS0+d20udmx2Lm9wdGltYWw7CisJfQorCisJdmx2X3Byb2dyYW1fd2F0ZXJtYXJrcyhkZXZf cHJpdik7CisKKwltdXRleF91bmxvY2soJmRldl9wcml2LT53bS53bV9tdXRleCk7Cit9CisKIHZv aWQgaWxrX3dtX2dldF9od19zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogewogCXN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKLS0gCjIuMTAuMgoK X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4 IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==