From mboxrd@z Thu Jan  1 00:00:00 1970
From: Matt Roper <matthew.d.roper@intel.com>
Subject: [PATCH 14/15] drm/i915: Sanitize watermarks after
	hardware state readout
Date: Thu, 24 Sep 2015 15:53:19 -0700
Message-ID: <1443135200-9870-15-git-send-email-matthew.d.roper@intel.com>
References: <1443135200-9870-1-git-send-email-matthew.d.roper@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 mga11.intel.com (mga11.intel.com [192.55.52.93])
 by gabe.freedesktop.org (Postfix) with ESMTP id 2F9626E858
 for <intel-gfx@lists.freedesktop.org>; Thu, 24 Sep 2015 15:54:08 -0700 (PDT)
In-Reply-To: <1443135200-9870-1-git-send-email-matthew.d.roper@intel.com>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://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: <http://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
List-Id: intel-gfx@lists.freedesktop.org

QWx0aG91Z2ggd2UgY2FuIGRvIGEgZ29vZCBqb2Igb2YgcmVhZGluZyBvdXQgaGFyZHdhcmUgc3Rh
dGUsIHRoZQpncmFwaGljcyBmaXJtd2FyZSBtYXkgaGF2ZSBwcm9ncmFtbWVkIHRoZSB3YXRlcm1h
cmtzIGluIGEgY3JlYXRpdmUgd2F5CnRoYXQgZG9lc24ndCBtYXRjaCBob3cgaTkxNSB3b3VsZCBo
YXZlIGNob3NlbiB0byBwcm9ncmFtIHRoZW0uICBXZQpzaG91bGRuJ3QgdHJ1c3QgdGhlIGZpcm13
YXJlJ3Mgd2F0ZXJtYXJrIHByb2dyYW1taW5nLCBidXQgc2hvdWxkIHJhdGhlcgpyZS1jYWxjdWxh
dGUgaG93IHdlIHRoaW5rIFdNJ3Mgc2hvdWxkIGJlIHByb2dyYW1tZWQgYW5kIHRoZW4gc2hvdmUg
dGhvc2UKdmFsdWVzIGludG8gdGhlIGhhcmR3YXJlLgoKV2UgY2FuIGRvIHRoaXMgcHJldHR5IGVh
c2lseSBieSBjcmVhdGluZyBhIGR1bW15IHRvcC1sZXZlbCBzdGF0ZSwKcnVubmluZyBpdCB0aHJv
dWdoIHRoZSBjaGVjayBwcm9jZXNzIHRvIGNhbGN1bGF0ZSBhbGwgdGhlIHZhbHVlcywgYW5kCnRo
ZW4ganVzdCBwcm9ncmFtbWluZyB0aGUgd2F0ZXJtYXJrcyBmb3IgZWFjaCBDUlRDLgoKQ2M6IE1h
YXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+ClNpZ25l
ZC1vZmYtYnk6IE1hdHQgUm9wZXIgPG1hdHRoZXcuZC5yb3BlckBpbnRlbC5jb20+Ci0tLQpNYWFy
dGVuLCBkb2VzIHRoaXMgc29sdmUgdGhlIHByb2JsZW0geW91IHdlcmUgc2VlaW5nIG9uIElyb25s
YWtlPyAgWW91CmluZGljYXRlZCB0aGF0IHlvdXIgZmlybXdhcmUgaGFkIHNwcml0ZSB3YXRlcm1h
cmtzIHByb2dyYW1tZWQgZXZlbiB0aG91Z2gKc3ByaXRlcyB0aGVtc2VsdmVzIHdlcmUgb2ZmIGFu
ZCBJIGRvbid0IGhhdmUgYW55IGtpbmQgb2Ygc3lzdGVtIHRoYXQgY2FuCnJlcHJvZHVjZSB0aGF0
IHNldHVwLiAgSSdtIGhvcGluZyB0aGlzIHdpbGwgcGF0Y2ggd2lsbCBkbyB0aGUgdHJpY2suCgog
ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgIHwgIDEgKwogZHJpdmVycy9ncHUv
ZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgNTEgKysrKysrKysrKysrKysrKysrKysrKysrKysr
KysrKysrKysrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jICAgICAgfCAxNCArKysr
Ky0tLS0tCiAzIGZpbGVzIGNoYW5nZWQsIDYwIGluc2VydGlvbnMoKyksIDYgZGVsZXRpb25zKC0p
CgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMv
Z3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggOGI3YzhmOS4uYTliYWMxZSAxMDA2NDQKLS0t
IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0v
aTkxNS9pOTE1X2Rydi5oCkBAIC02MjksNiArNjI5LDcgQEAgc3RydWN0IGRybV9pOTE1X2Rpc3Bs
YXlfZnVuY3MgewogCQkJICBzdHJ1Y3QgZHBsbCAqYmVzdF9jbG9jayk7CiAJaW50ICgqY29tcHV0
ZV9waXBlX3dtKShzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywKIAkJCSAgICAgICBzdHJ1Y3QgZHJt
X2F0b21pY19zdGF0ZSAqc3RhdGUpOworCXZvaWQgKCpwcm9ncmFtX3dhdGVybWFya3MpKHN0cnVj
dCBpbnRlbF9jcnRjX3N0YXRlICpjc3RhdGUpOwogCXZvaWQgKCp1cGRhdGVfd20pKHN0cnVjdCBk
cm1fY3J0YyAqY3J0Yyk7CiAJaW50ICgqbW9kZXNldF9jYWxjX2NkY2xrKShzdHJ1Y3QgZHJtX2F0
b21pY19zdGF0ZSAqc3RhdGUpOwogCXZvaWQgKCptb2Rlc2V0X2NvbW1pdF9jZGNsaykoc3RydWN0
IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p
OTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXku
YwppbmRleCBlMmEwNzc3Li4wYzM3ODNjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx
NS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxh
eS5jCkBAIC0xNTMxMCw2ICsxNTMxMCw1NCBAQCBzdGF0aWMgdm9pZCBpbnRlbF9tb2Rlc2V0X3Jl
YWRvdXRfaHdfc3RhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAl9CiB9CiAKKy8qCisgKiBD
YWxjdWxhdGUgd2hhdCB3ZSB0aGluayB0aGUgd2F0ZXJtYXJrcyBzaG91bGQgYmUgZm9yIHRoZSBz
dGF0ZSB3ZSd2ZSByZWFkCisgKiBvdXQgb2YgdGhlIGhhcmR3YXJlIGFuZCB0aGVuIGltbWVkaWF0
ZWx5IHByb2dyYW0gdGhvc2Ugd2F0ZXJtYXJrcyBzbyB0aGF0CisgKiB3ZSBlbnN1cmUgdGhlIGhh
cmR3YXJlIHNldHRpbmdzIG1hdGNoIG91ciBpbnRlcm5hbCBzdGF0ZS4KKyAqLworc3RhdGljIHZv
aWQgc2FuaXRpemVfd2F0ZXJtYXJrcyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQoreworCXN0cnVj
dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKKwlzdHJ1Y3QgZHJt
X2F0b21pY19zdGF0ZSAqc3RhdGU7CisJc3RydWN0IGRybV9jcnRjICpjcnRjOworCXN0cnVjdCBk
cm1fY3J0Y19zdGF0ZSAqY3N0YXRlOworCWludCByZXQ7CisJaW50IGk7CisKKwkvKiBPbmx5IHN1
cHBvcnRlZCBvbiBwbGF0Zm9ybXMgdGhhdCB1c2UgYXRvbWljIHdhdGVybWFyayBkZXNpZ24gKi8K
KwlpZiAoIWRldl9wcml2LT5kaXNwbGF5LnByb2dyYW1fd2F0ZXJtYXJrcykKKwkJcmV0dXJuOwor
CisJLyoKKwkgKiBDYWxjdWxhdGUgd2hhdCB3ZSB0aGluayBXTSdzIHNob3VsZCBiZSBieSBjcmVh
dGluZyBhIGR1bW15IHN0YXRlIGFuZAorCSAqIHJ1bm5pbmcgaXQgdGhyb3VnaCB0aGUgYXRvbWlj
IGNoZWNrIGNvZGUuCisJICovCisJc3RhdGUgPSBkcm1fYXRvbWljX2hlbHBlcl9kdXBsaWNhdGVf
c3RhdGUoZGV2LAorCQkJCQkJICBkZXYtPm1vZGVfY29uZmlnLmFjcXVpcmVfY3R4KTsKKwlpZiAo
V0FSTl9PTihJU19FUlIoc3RhdGUpKSkKKwkJcmV0dXJuOworCisJcmV0ID0gaW50ZWxfYXRvbWlj
X2NoZWNrKGRldiwgc3RhdGUpOworCWlmIChyZXQpIHsKKwkJLyoKKwkJICogSnVzdCBnaXZlIHVw
IGFuZCBsZWF2ZSB3YXRlcm1hcmtzIHVudG91Y2hlZCBpZiB3ZSBnZXQgYW4KKwkJICogZXJyb3Ig
YmFjayBmcm9tICdjaGVjaycKKwkJICovCisJCURSTV9ERUJVR19LTVMoIkNvdWxkIG5vdCBkZXRl
cm1pbmUgdmFsaWQgd2F0ZXJtYXJrcyBmb3IgaW5oZXJpdGVkIHN0YXRlXG4iKTsKKwkJcmV0dXJu
OworCX0KKworCS8qIFdyaXRlIGNhbGN1bGF0ZWQgd2F0ZXJtYXJrIHZhbHVlcyBiYWNrICovCisJ
dG9faTkxNShkZXYpLT53bS5jb25maWcgPSB0b19pbnRlbF9hdG9taWNfc3RhdGUoc3RhdGUpLT53
bV9jb25maWc7CisJZm9yX2VhY2hfY3J0Y19pbl9zdGF0ZShzdGF0ZSwgY3J0YywgY3N0YXRlLCBp
KSB7CisJCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcyA9IHRvX2ludGVsX2NydGNfc3RhdGUo
Y3N0YXRlKTsKKworCQlkZXZfcHJpdi0+ZGlzcGxheS5wcm9ncmFtX3dhdGVybWFya3MoY3MpOwor
CX0KKworCWRybV9hdG9taWNfc3RhdGVfZnJlZShzdGF0ZSk7Cit9CisKIC8qIFNjYW4gb3V0IHRo
ZSBjdXJyZW50IGh3IG1vZGVzZXQgc3RhdGUsCiAgKiBhbmQgc2FuaXRpemVzIGl0IHRvIHRoZSBj
dXJyZW50IHN0YXRlCiAgKi8KQEAgLTE1MzY1LDYgKzE1NDEzLDkgQEAgaW50ZWxfbW9kZXNldF9z
ZXR1cF9od19zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQkJbW9kZXNldF9wdXRfcG93
ZXJfZG9tYWlucyhkZXZfcHJpdiwgcHV0X2RvbWFpbnMpOwogCX0KIAlpbnRlbF9kaXNwbGF5X3Nl
dF9pbml0X3Bvd2VyKGRldl9wcml2LCBmYWxzZSk7CisKKwkvKiBNYWtlIHN1cmUgaGFyZHdhcmUg
d2F0ZXJtYXJrcyByZWFsbHkgbWF0Y2ggdGhlIHN0YXRlIHdlIHJlYWQgb3V0ICovCisJc2FuaXRp
emVfd2F0ZXJtYXJrcyhkZXYpOwogfQogCiB2b2lkIGludGVsX2Rpc3BsYXlfcmVzdW1lKHN0cnVj
dCBkcm1fZGV2aWNlICpkZXYpCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl
bF9wbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwppbmRleCBmMzY1MmJiLi45
ODg4OTNlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCisrKyBi
L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKQEAgLTM2NjQsMTUgKzM2NjQsMTkgQEAg
c3RhdGljIHZvaWQgc2tsX3VwZGF0ZV93bShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAJZGV2X3By
aXYtPndtLnNrbF9odyA9ICpyZXN1bHRzOwogfQogCi1zdGF0aWMgdm9pZCBpbGtfcHJvZ3JhbV93
YXRlcm1hcmtzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKK3N0YXRpYyB2b2lk
IGlsa19wcm9ncmFtX3dhdGVybWFya3Moc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSkK
IHsKLQlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gZGV2X3ByaXYtPmRldjsKKwlzdHJ1Y3QgZHJt
X2NydGMgKmNydGMgPSBjc3RhdGUtPmJhc2UuY3J0YzsKKwlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2
ID0gY3J0Yy0+ZGV2OworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5
MTUoZGV2KTsKIAlzdHJ1Y3QgaW50ZWxfcGlwZV93bSBscF93bV8xXzIgPSB7fSwgbHBfd21fNV82
ID0ge30sICpiZXN0X2xwX3dtOwogCXN0cnVjdCBpbGtfd21fbWF4aW11bXMgbWF4OwogCXN0cnVj
dCBpbnRlbF93bV9jb25maWcgKmNvbmZpZyA9ICZkZXZfcHJpdi0+d20uY29uZmlnOwogCXN0cnVj
dCBpbGtfd21fdmFsdWVzIHJlc3VsdHMgPSB7fTsKIAllbnVtIGludGVsX2RkYl9wYXJ0aXRpb25p
bmcgcGFydGl0aW9uaW5nOwogCisJdG9faW50ZWxfY3J0YyhjcnRjKS0+d20uYWN0aXZlLmlsayA9
IGNzdGF0ZS0+d20ub3B0aW1hbC5pbGs7CisKIAlpbGtfY29tcHV0ZV93bV9tYXhpbXVtcyhkZXYs
IDEsIGNvbmZpZywgSU5URUxfRERCX1BBUlRfMV8yLCAmbWF4KTsKIAlpbGtfd21fbWVyZ2UoZGV2
LCBjb25maWcsICZtYXgsICZscF93bV8xXzIpOwogCkBAIC0zNjk3LDcgKzM3MDEsNiBAQCBzdGF0
aWMgdm9pZCBpbGtfcHJvZ3JhbV93YXRlcm1hcmtzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk
ZXZfcHJpdikKIAogc3RhdGljIHZvaWQgaWxrX3VwZGF0ZV93bShzdHJ1Y3QgZHJtX2NydGMgKmNy
dGMpCiB7Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShjcnRj
LT5kZXYpOwogCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0Yyhj
cnRjKTsKIAlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlID0gdG9faW50ZWxfY3J0Y19z
dGF0ZShjcnRjLT5zdGF0ZSk7CiAKQEAgLTM3MTUsOSArMzcxOCw3IEBAIHN0YXRpYyB2b2lkIGls
a191cGRhdGVfd20oc3RydWN0IGRybV9jcnRjICpjcnRjKQogCQlpbnRlbF93YWl0X2Zvcl92Ymxh
bmsoY3J0Yy0+ZGV2LCBpbnRlbF9jcnRjLT5waXBlKTsKIAl9CiAKLQlpbnRlbF9jcnRjLT53bS5h
Y3RpdmUuaWxrID0gY3N0YXRlLT53bS5vcHRpbWFsLmlsazsKLQotCWlsa19wcm9ncmFtX3dhdGVy
bWFya3MoZGV2X3ByaXYpOworCWlsa19wcm9ncmFtX3dhdGVybWFya3MoY3N0YXRlKTsKIH0KIAog
c3RhdGljIHZvaWQgc2tsX3BpcGVfd21fYWN0aXZlX3N0YXRlKHVpbnQzMl90IHZhbCwKQEAgLTcw
NTEsNiArNzA1Miw3IEBAIHZvaWQgaW50ZWxfaW5pdF9wbShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2
KQogCQkgICAgIGRldl9wcml2LT53bS5zcHJfbGF0ZW5jeVswXSAmJiBkZXZfcHJpdi0+d20uY3Vy
X2xhdGVuY3lbMF0pKSB7CiAJCQlkZXZfcHJpdi0+ZGlzcGxheS51cGRhdGVfd20gPSBpbGtfdXBk
YXRlX3dtOwogCQkJZGV2X3ByaXYtPmRpc3BsYXkuY29tcHV0ZV9waXBlX3dtID0gaWxrX2NvbXB1
dGVfcGlwZV93bTsKKwkJCWRldl9wcml2LT5kaXNwbGF5LnByb2dyYW1fd2F0ZXJtYXJrcyA9IGls
a19wcm9ncmFtX3dhdGVybWFya3M7CiAJCX0gZWxzZSB7CiAJCQlEUk1fREVCVUdfS01TKCJGYWls
ZWQgdG8gcmVhZCBkaXNwbGF5IHBsYW5lIGxhdGVuY3kuICIKIAkJCQkgICAgICAiRGlzYWJsZSBD
eFNSXG4iKTsKLS0gCjIuMS40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVz
a3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2lu
dGVsLWdmeAo=