From mboxrd@z Thu Jan 1 00:00:00 1970 From: ville.syrjala@linux.intel.com Subject: [PATCH v2 12/18] drm/i915: Sanitize VLV/CHV watermarks properly Date: Thu, 2 Mar 2017 19:15:02 +0200 Message-ID: <20170302171508.1666-13-ville.syrjala@linux.intel.com> References: <20170302171508.1666-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 mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id A8C9D6EC05 for ; Thu, 2 Mar 2017 17:15:46 +0000 (UTC) In-Reply-To: <20170302171508.1666-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 Z2hlciB0aGFuIHRoZSBGSUZPIHNpemUuCgp2Mjogcy9ub25pbnZlcnRlZC9yYXcvIGZvciBjb25z aXN0ZW5jeSB3aXRoIG90aGVyIHBsYXRmb3JtcwoKU2lnbmVkLW9mZi1ieTogVmlsbGUgU3lyasOk bMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KUmV2aWV3ZWQtYnk6IE1hYXJ0ZW4g TGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgMTcgKysrKysrKy0tLS0tCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCAgICAgfCAgMSArCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9wbS5jICAgICAgfCA1MCArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr Ky0KIDMgZmlsZXMgY2hhbmdlZCwgNjEgaW5zZXJ0aW9ucygrKSwgNyBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggZTQwOGUyNTExMjVmLi44ZWE4Mjkw YTgwOGQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTM0NzksNyArMzQ3 OSw4IEBAIF9faW50ZWxfZGlzcGxheV9yZXN1bWUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAl9 CiAKIAkvKiBpZ25vcmUgYW55IHJlc2V0IHZhbHVlcy9CSU9TIGxlZnRvdmVycyBpbiB0aGUgV00g cmVnaXN0ZXJzICovCi0JdG9faW50ZWxfYXRvbWljX3N0YXRlKHN0YXRlKS0+c2tpcF9pbnRlcm1l ZGlhdGVfd20gPSB0cnVlOworCWlmICghSEFTX0dNQ0hfRElTUExBWSh0b19pOTE1KGRldikpKQor CQl0b19pbnRlbF9hdG9taWNfc3RhdGUoc3RhdGUpLT5za2lwX2ludGVybWVkaWF0ZV93bSA9IHRy dWU7CiAKIAlyZXQgPSBkcm1fYXRvbWljX2hlbHBlcl9jb21taXRfZHVwbGljYXRlZF9zdGF0ZShz dGF0ZSwgY3R4KTsKIApAQCAtMTQ4ODAsNyArMTQ4ODEsOCBAQCBzdGF0aWMgdm9pZCBzYW5pdGl6 ZV93YXRlcm1hcmtzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJICogaW50ZXJtZWRpYXRlIHdh dGVybWFya3MgKHNpbmNlIHdlIGRvbid0IHRydXN0IHRoZSBjdXJyZW50CiAJICogd2F0ZXJtYXJr cykuCiAJICovCi0JaW50ZWxfc3RhdGUtPnNraXBfaW50ZXJtZWRpYXRlX3dtID0gdHJ1ZTsKKwlp ZiAoIUhBU19HTUNIX0RJU1BMQVkoZGV2X3ByaXYpKQorCQlpbnRlbF9zdGF0ZS0+c2tpcF9pbnRl cm1lZGlhdGVfd20gPSB0cnVlOwogCiAJcmV0ID0gaW50ZWxfYXRvbWljX2NoZWNrKGRldiwgc3Rh dGUpOwogCWlmIChyZXQpIHsKQEAgLTE1MDQ0LDcgKzE1MDQ2LDggQEAgaW50IGludGVsX21vZGVz ZXRfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCSAqIE5vdGUgdGhhdCB3ZSBuZWVkIHRv IGRvIHRoaXMgYWZ0ZXIgcmVjb25zdHJ1Y3RpbmcgdGhlIEJJT1MgZmIncwogCSAqIHNpbmNlIHRo ZSB3YXRlcm1hcmsgY2FsY3VsYXRpb24gZG9uZSBoZXJlIHdpbGwgdXNlIHBzdGF0ZS0+ZmIuCiAJ ICovCi0Jc2FuaXRpemVfd2F0ZXJtYXJrcyhkZXYpOworCWlmICghSEFTX0dNQ0hfRElTUExBWShk ZXZfcHJpdikpCisJCXNhbml0aXplX3dhdGVybWFya3MoZGV2KTsKIAogCXJldHVybiAwOwogfQpA QCAtMTU1MTUsMTIgKzE1NTE4LDE0IEBAIGludGVsX21vZGVzZXRfc2V0dXBfaHdfc3RhdGUoc3Ry dWN0IGRybV9kZXZpY2UgKmRldikKIAkJcGxsLT5vbiA9IGZhbHNlOwogCX0KIAotCWlmIChJU19W QUxMRVlWSUVXKGRldl9wcml2KSB8fCBJU19DSEVSUllWSUVXKGRldl9wcml2KSkKKwlpZiAoSVNf VkFMTEVZVklFVyhkZXZfcHJpdikgfHwgSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpIHsKIAkJdmx2 X3dtX2dldF9od19zdGF0ZShkZXYpOwotCWVsc2UgaWYgKElTX0dFTjkoZGV2X3ByaXYpKQorCQl2 bHZfd21fc2FuaXRpemUoZGV2X3ByaXYpOworCX0gZWxzZSBpZiAoSVNfR0VOOShkZXZfcHJpdikp IHsKIAkJc2tsX3dtX2dldF9od19zdGF0ZShkZXYpOwotCWVsc2UgaWYgKEhBU19QQ0hfU1BMSVQo ZGV2X3ByaXYpKQorCX0gZWxzZSBpZiAoSEFTX1BDSF9TUExJVChkZXZfcHJpdikpIHsKIAkJaWxr X3dtX2dldF9od19zdGF0ZShkZXYpOworCX0KIAogCWZvcl9lYWNoX2ludGVsX2NydGMoZGV2LCBj cnRjKSB7CiAJCXU2NCBwdXRfZG9tYWluczsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKaW5kZXgg MmE4MDlkMDNlNzQ3Li45OGRhYzE5N2ZkNzYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCkBA IC0xODI0LDYgKzE4MjQsNyBAQCB2b2lkIHNrbF9kZGJfZ2V0X2h3X3N0YXRlKHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJCSAgc3RydWN0IHNrbF9kZGJfYWxsb2NhdGlvbiAq ZGRiIC8qIG91dCAqLyk7CiB2b2lkIHNrbF9waXBlX3dtX2dldF9od19zdGF0ZShzdHJ1Y3QgZHJt X2NydGMgKmNydGMsCiAJCQkgICAgICBzdHJ1Y3Qgc2tsX3BpcGVfd20gKm91dCk7Cit2b2lkIHZs dl93bV9zYW5pdGl6ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwogYm9vbCBp bnRlbF9jYW5fZW5hYmxlX3NhZ3Yoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlKTsKIGlu dCBpbnRlbF9lbmFibGVfc2FndihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwog aW50IGludGVsX2Rpc2FibGVfc2FndihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYp OwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3BtLmMKaW5kZXggN2E4NmQyNzdjYTllLi45YzY5YTU0MDRiY2Yg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwpAQCAtNDcyNyw3ICs0NzI3LDYgQEAgdm9pZCB2bHZf d21fZ2V0X2h3X3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAKIAkJdmx2X2dldF9maWZv X3NpemUoY3J0Y19zdGF0ZSk7CiAKLQkJLyogRklYTUUgc2FuaXRpemUgdGhpbmdzIG1vcmUgKi8K IAkJZm9yIChsZXZlbCA9IDA7IGxldmVsIDwgYWN0aXZlLT5udW1fbGV2ZWxzOyBsZXZlbCsrKSB7 CiAJCQlzdHJ1Y3Qgdmx2X3BpcGVfd20gKnJhdyA9CiAJCQkJJmNydGNfc3RhdGUtPndtLnZsdi5y YXdbbGV2ZWxdOwpAQCAtNDc2NSw2ICs0NzY0LDU1IEBAIHZvaWQgdmx2X3dtX2dldF9od19zdGF0 ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQkgICAgICB3bS0+c3IucGxhbmUsIHdtLT5zci5j dXJzb3IsIHdtLT5sZXZlbCwgd20tPmN4c3IpOwogfQogCit2b2lkIHZsdl93bV9zYW5pdGl6ZShz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCit7CisJc3RydWN0IGludGVsX3BsYW5l ICpwbGFuZTsKKwlzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YzsKKworCW11dGV4X2xvY2soJmRldl9w cml2LT53bS53bV9tdXRleCk7CisKKwlmb3JfZWFjaF9pbnRlbF9wbGFuZSgmZGV2X3ByaXYtPmRy bSwgcGxhbmUpIHsKKwkJc3RydWN0IGludGVsX2NydGMgKmNydGMgPQorCQkJaW50ZWxfZ2V0X2Ny dGNfZm9yX3BpcGUoZGV2X3ByaXYsIHBsYW5lLT5waXBlKTsKKwkJc3RydWN0IGludGVsX2NydGNf c3RhdGUgKmNydGNfc3RhdGUgPQorCQkJdG9faW50ZWxfY3J0Y19zdGF0ZShjcnRjLT5iYXNlLnN0 YXRlKTsKKwkJc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0ZSA9CisJCQl0b19p bnRlbF9wbGFuZV9zdGF0ZShwbGFuZS0+YmFzZS5zdGF0ZSk7CisJCXN0cnVjdCB2bHZfd21fc3Rh dGUgKndtX3N0YXRlID0gJmNydGNfc3RhdGUtPndtLnZsdi5vcHRpbWFsOworCQljb25zdCBzdHJ1 Y3Qgdmx2X2ZpZm9fc3RhdGUgKmZpZm9fc3RhdGUgPQorCQkJJmNydGNfc3RhdGUtPndtLnZsdi5m aWZvX3N0YXRlOworCQllbnVtIHBsYW5lX2lkIHBsYW5lX2lkID0gcGxhbmUtPmlkOworCQlpbnQg bGV2ZWw7CisKKwkJaWYgKHBsYW5lX3N0YXRlLT5iYXNlLnZpc2libGUpCisJCQljb250aW51ZTsK KworCQlmb3IgKGxldmVsID0gMDsgbGV2ZWwgPCB3bV9zdGF0ZS0+bnVtX2xldmVsczsgbGV2ZWwr KykgeworCQkJc3RydWN0IHZsdl9waXBlX3dtICpyYXcgPQorCQkJCSZjcnRjX3N0YXRlLT53bS52 bHYucmF3W2xldmVsXTsKKworCQkJcmF3LT5wbGFuZVtwbGFuZV9pZF0gPSAwOworCisJCQl3bV9z dGF0ZS0+d21bbGV2ZWxdLnBsYW5lW3BsYW5lX2lkXSA9CisJCQkJdmx2X2ludmVydF93bV92YWx1 ZShyYXctPnBsYW5lW3BsYW5lX2lkXSwKKwkJCQkJCSAgICBmaWZvX3N0YXRlLT5wbGFuZVtwbGFu ZV9pZF0pOworCQl9CisJfQorCisJZm9yX2VhY2hfaW50ZWxfY3J0YygmZGV2X3ByaXYtPmRybSwg Y3J0YykgeworCQlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSA9CisJCQl0b19p bnRlbF9jcnRjX3N0YXRlKGNydGMtPmJhc2Uuc3RhdGUpOworCisJCWNydGNfc3RhdGUtPndtLnZs di5pbnRlcm1lZGlhdGUgPQorCQkJY3J0Y19zdGF0ZS0+d20udmx2Lm9wdGltYWw7CisJCWNydGMt PndtLmFjdGl2ZS52bHYgPSBjcnRjX3N0YXRlLT53bS52bHYub3B0aW1hbDsKKwl9CisKKwl2bHZf cHJvZ3JhbV93YXRlcm1hcmtzKGRldl9wcml2KTsKKworCW11dGV4X3VubG9jaygmZGV2X3ByaXYt PndtLndtX211dGV4KTsKK30KKwogdm9pZCBpbGtfd21fZ2V0X2h3X3N0YXRlKHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYpCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9f aTkxNShkZXYpOwotLSAKMi4xMC4yCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVl ZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m by9pbnRlbC1nZngK