From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jani Nikula <jani.nikula@linux.intel.com>
Subject: Re: [PATCH 14/15] drm/i915: Sanitize watermarks
	after	hardware state readout
Date: Thu, 01 Oct 2015 16:58:38 +0300
Message-ID: <874miabshd.fsf@intel.com>
References: <1443135200-9870-1-git-send-email-matthew.d.roper@intel.com>
 <1443135200-9870-15-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 mga01.intel.com (mga01.intel.com [192.55.52.88])
 by gabe.freedesktop.org (Postfix) with ESMTP id 09CE46E03D
 for <intel-gfx@lists.freedesktop.org>; Thu,  1 Oct 2015 06:55:22 -0700 (PDT)
In-Reply-To: <1443135200-9870-15-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: Matt Roper <matthew.d.roper@intel.com>, intel-gfx@lists.freedesktop.org
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
List-Id: intel-gfx@lists.freedesktop.org

T24gRnJpLCAyNSBTZXAgMjAxNSwgTWF0dCBSb3BlciA8bWF0dGhldy5kLnJvcGVyQGludGVsLmNv
bT4gd3JvdGU6Cj4gQWx0aG91Z2ggd2UgY2FuIGRvIGEgZ29vZCBqb2Igb2YgcmVhZGluZyBvdXQg
aGFyZHdhcmUgc3RhdGUsIHRoZQo+IGdyYXBoaWNzIGZpcm13YXJlIG1heSBoYXZlIHByb2dyYW1t
ZWQgdGhlIHdhdGVybWFya3MgaW4gYSBjcmVhdGl2ZSB3YXkKPiB0aGF0IGRvZXNuJ3QgbWF0Y2gg
aG93IGk5MTUgd291bGQgaGF2ZSBjaG9zZW4gdG8gcHJvZ3JhbSB0aGVtLiAgV2UKPiBzaG91bGRu
J3QgdHJ1c3QgdGhlIGZpcm13YXJlJ3Mgd2F0ZXJtYXJrIHByb2dyYW1taW5nLCBidXQgc2hvdWxk
IHJhdGhlcgo+IHJlLWNhbGN1bGF0ZSBob3cgd2UgdGhpbmsgV00ncyBzaG91bGQgYmUgcHJvZ3Jh
bW1lZCBhbmQgdGhlbiBzaG92ZSB0aG9zZQo+IHZhbHVlcyBpbnRvIHRoZSBoYXJkd2FyZS4KPgo+
IFdlIGNhbiBkbyB0aGlzIHByZXR0eSBlYXNpbHkgYnkgY3JlYXRpbmcgYSBkdW1teSB0b3AtbGV2
ZWwgc3RhdGUsCj4gcnVubmluZyBpdCB0aHJvdWdoIHRoZSBjaGVjayBwcm9jZXNzIHRvIGNhbGN1
bGF0ZSBhbGwgdGhlIHZhbHVlcywgYW5kCj4gdGhlbiBqdXN0IHByb2dyYW1taW5nIHRoZSB3YXRl
cm1hcmtzIGZvciBlYWNoIENSVEMuCj4KPiBDYzogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4u
bGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4KPiBTaWduZWQtb2ZmLWJ5OiBNYXR0IFJvcGVyIDxt
YXR0aGV3LmQucm9wZXJAaW50ZWwuY29tPgoKQmlzZWN0IHRlbGxzIG1lIHRoaXMgcGF0Y2gsIGku
ZS4KCmNvbW1pdCBjMTAzZjJiODNkZmEzYjZmYjZiNTgxOWFlMDM2MmZlZTZjZjRiMjQyCkF1dGhv
cjogTWF0dCBSb3BlciA8bWF0dGhldy5kLnJvcGVyQGludGVsLmNvbT4KRGF0ZTogICBUaHUgU2Vw
IDI0IDE1OjUzOjE5IDIwMTUgLTA3MDAKCiAgICBkcm0vaTkxNTogU2FuaXRpemUgd2F0ZXJtYXJr
cyBhZnRlciBoYXJkd2FyZSBzdGF0ZSByZWFkb3V0CgpnaXZlcyBtZSBibGFjayBzY3JlZW4gb24g
YSBCRFcgTlVDIHBjaWlkPTB4MTYxNi4KCkRhbmllbCwgcGxlYXNlIGRyb3AgaXQuCgpCUiwKSmFu
aS4KCgo+IC0tLQo+IE1hYXJ0ZW4sIGRvZXMgdGhpcyBzb2x2ZSB0aGUgcHJvYmxlbSB5b3Ugd2Vy
ZSBzZWVpbmcgb24gSXJvbmxha2U/ICBZb3UKPiBpbmRpY2F0ZWQgdGhhdCB5b3VyIGZpcm13YXJl
IGhhZCBzcHJpdGUgd2F0ZXJtYXJrcyBwcm9ncmFtbWVkIGV2ZW4gdGhvdWdoCj4gc3ByaXRlcyB0
aGVtc2VsdmVzIHdlcmUgb2ZmIGFuZCBJIGRvbid0IGhhdmUgYW55IGtpbmQgb2Ygc3lzdGVtIHRo
YXQgY2FuCj4gcmVwcm9kdWNlIHRoYXQgc2V0dXAuICBJJ20gaG9waW5nIHRoaXMgd2lsbCBwYXRj
aCB3aWxsIGRvIHRoZSB0cmljay4KPgo+ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5o
ICAgICAgfCAgMSArCj4gIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8IDUx
ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKwo+ICBkcml2ZXJzL2dwdS9kcm0v
aTkxNS9pbnRlbF9wbS5jICAgICAgfCAxNCArKysrKy0tLS0tCj4gIDMgZmlsZXMgY2hhbmdlZCwg
NjAgaW5zZXJ0aW9ucygrKSwgNiBkZWxldGlvbnMoLSkKPgo+IGRpZmYgLS1naXQgYS9kcml2ZXJz
L2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYu
aAo+IGluZGV4IDhiN2M4ZjkuLmE5YmFjMWUgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJt
L2k5MTUvaTkxNV9kcnYuaAo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgK
PiBAQCAtNjI5LDYgKzYyOSw3IEBAIHN0cnVjdCBkcm1faTkxNV9kaXNwbGF5X2Z1bmNzIHsKPiAg
CQkJICBzdHJ1Y3QgZHBsbCAqYmVzdF9jbG9jayk7Cj4gIAlpbnQgKCpjb21wdXRlX3BpcGVfd20p
KHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAo+ICAJCQkgICAgICAgc3RydWN0IGRybV9hdG9taWNf
c3RhdGUgKnN0YXRlKTsKPiArCXZvaWQgKCpwcm9ncmFtX3dhdGVybWFya3MpKHN0cnVjdCBpbnRl
bF9jcnRjX3N0YXRlICpjc3RhdGUpOwo+ICAJdm9pZCAoKnVwZGF0ZV93bSkoc3RydWN0IGRybV9j
cnRjICpjcnRjKTsKPiAgCWludCAoKm1vZGVzZXRfY2FsY19jZGNsaykoc3RydWN0IGRybV9hdG9t
aWNfc3RhdGUgKnN0YXRlKTsKPiAgCXZvaWQgKCptb2Rlc2V0X2NvbW1pdF9jZGNsaykoc3RydWN0
IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlKTsKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt
L2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxh
eS5jCj4gaW5kZXggZTJhMDc3Ny4uMGMzNzgzYyAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9k
cm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl
bF9kaXNwbGF5LmMKPiBAQCAtMTUzMTAsNiArMTUzMTAsNTQgQEAgc3RhdGljIHZvaWQgaW50ZWxf
bW9kZXNldF9yZWFkb3V0X2h3X3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCj4gIAl9Cj4g
IH0KPiAgCj4gKy8qCj4gKyAqIENhbGN1bGF0ZSB3aGF0IHdlIHRoaW5rIHRoZSB3YXRlcm1hcmtz
IHNob3VsZCBiZSBmb3IgdGhlIHN0YXRlIHdlJ3ZlIHJlYWQKPiArICogb3V0IG9mIHRoZSBoYXJk
d2FyZSBhbmQgdGhlbiBpbW1lZGlhdGVseSBwcm9ncmFtIHRob3NlIHdhdGVybWFya3Mgc28gdGhh
dAo+ICsgKiB3ZSBlbnN1cmUgdGhlIGhhcmR3YXJlIHNldHRpbmdzIG1hdGNoIG91ciBpbnRlcm5h
bCBzdGF0ZS4KPiArICovCj4gK3N0YXRpYyB2b2lkIHNhbml0aXplX3dhdGVybWFya3Moc3RydWN0
IGRybV9kZXZpY2UgKmRldikKPiArewo+ICsJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w
cml2ID0gdG9faTkxNShkZXYpOwo+ICsJc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlOwo+
ICsJc3RydWN0IGRybV9jcnRjICpjcnRjOwo+ICsJc3RydWN0IGRybV9jcnRjX3N0YXRlICpjc3Rh
dGU7Cj4gKwlpbnQgcmV0Owo+ICsJaW50IGk7Cj4gKwo+ICsJLyogT25seSBzdXBwb3J0ZWQgb24g
cGxhdGZvcm1zIHRoYXQgdXNlIGF0b21pYyB3YXRlcm1hcmsgZGVzaWduICovCj4gKwlpZiAoIWRl
dl9wcml2LT5kaXNwbGF5LnByb2dyYW1fd2F0ZXJtYXJrcykKPiArCQlyZXR1cm47Cj4gKwo+ICsJ
LyoKPiArCSAqIENhbGN1bGF0ZSB3aGF0IHdlIHRoaW5rIFdNJ3Mgc2hvdWxkIGJlIGJ5IGNyZWF0
aW5nIGEgZHVtbXkgc3RhdGUgYW5kCj4gKwkgKiBydW5uaW5nIGl0IHRocm91Z2ggdGhlIGF0b21p
YyBjaGVjayBjb2RlLgo+ICsJICovCj4gKwlzdGF0ZSA9IGRybV9hdG9taWNfaGVscGVyX2R1cGxp
Y2F0ZV9zdGF0ZShkZXYsCj4gKwkJCQkJCSAgZGV2LT5tb2RlX2NvbmZpZy5hY3F1aXJlX2N0eCk7
Cj4gKwlpZiAoV0FSTl9PTihJU19FUlIoc3RhdGUpKSkKPiArCQlyZXR1cm47Cj4gKwo+ICsJcmV0
ID0gaW50ZWxfYXRvbWljX2NoZWNrKGRldiwgc3RhdGUpOwo+ICsJaWYgKHJldCkgewo+ICsJCS8q
Cj4gKwkJICogSnVzdCBnaXZlIHVwIGFuZCBsZWF2ZSB3YXRlcm1hcmtzIHVudG91Y2hlZCBpZiB3
ZSBnZXQgYW4KPiArCQkgKiBlcnJvciBiYWNrIGZyb20gJ2NoZWNrJwo+ICsJCSAqLwo+ICsJCURS
TV9ERUJVR19LTVMoIkNvdWxkIG5vdCBkZXRlcm1pbmUgdmFsaWQgd2F0ZXJtYXJrcyBmb3IgaW5o
ZXJpdGVkIHN0YXRlXG4iKTsKPiArCQlyZXR1cm47Cj4gKwl9Cj4gKwo+ICsJLyogV3JpdGUgY2Fs
Y3VsYXRlZCB3YXRlcm1hcmsgdmFsdWVzIGJhY2sgKi8KPiArCXRvX2k5MTUoZGV2KS0+d20uY29u
ZmlnID0gdG9faW50ZWxfYXRvbWljX3N0YXRlKHN0YXRlKS0+d21fY29uZmlnOwo+ICsJZm9yX2Vh
Y2hfY3J0Y19pbl9zdGF0ZShzdGF0ZSwgY3J0YywgY3N0YXRlLCBpKSB7Cj4gKwkJc3RydWN0IGlu
dGVsX2NydGNfc3RhdGUgKmNzID0gdG9faW50ZWxfY3J0Y19zdGF0ZShjc3RhdGUpOwo+ICsKPiAr
CQlkZXZfcHJpdi0+ZGlzcGxheS5wcm9ncmFtX3dhdGVybWFya3MoY3MpOwo+ICsJfQo+ICsKPiAr
CWRybV9hdG9taWNfc3RhdGVfZnJlZShzdGF0ZSk7Cj4gK30KPiArCj4gIC8qIFNjYW4gb3V0IHRo
ZSBjdXJyZW50IGh3IG1vZGVzZXQgc3RhdGUsCj4gICAqIGFuZCBzYW5pdGl6ZXMgaXQgdG8gdGhl
IGN1cnJlbnQgc3RhdGUKPiAgICovCj4gQEAgLTE1MzY1LDYgKzE1NDEzLDkgQEAgaW50ZWxfbW9k
ZXNldF9zZXR1cF9od19zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQo+ICAJCQltb2Rlc2V0
X3B1dF9wb3dlcl9kb21haW5zKGRldl9wcml2LCBwdXRfZG9tYWlucyk7Cj4gIAl9Cj4gIAlpbnRl
bF9kaXNwbGF5X3NldF9pbml0X3Bvd2VyKGRldl9wcml2LCBmYWxzZSk7Cj4gKwo+ICsJLyogTWFr
ZSBzdXJlIGhhcmR3YXJlIHdhdGVybWFya3MgcmVhbGx5IG1hdGNoIHRoZSBzdGF0ZSB3ZSByZWFk
IG91dCAqLwo+ICsJc2FuaXRpemVfd2F0ZXJtYXJrcyhkZXYpOwo+ICB9Cj4gIAo+ICB2b2lkIGlu
dGVsX2Rpc3BsYXlfcmVzdW1lKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCj4gZGlmZiAtLWdpdCBh
L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p
bnRlbF9wbS5jCj4gaW5kZXggZjM2NTJiYi4uOTg4ODkzZSAxMDA2NDQKPiAtLS0gYS9kcml2ZXJz
L2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50
ZWxfcG0uYwo+IEBAIC0zNjY0LDE1ICszNjY0LDE5IEBAIHN0YXRpYyB2b2lkIHNrbF91cGRhdGVf
d20oc3RydWN0IGRybV9jcnRjICpjcnRjKQo+ICAJZGV2X3ByaXYtPndtLnNrbF9odyA9ICpyZXN1
bHRzOwo+ICB9Cj4gIAo+IC1zdGF0aWMgdm9pZCBpbGtfcHJvZ3JhbV93YXRlcm1hcmtzKHN0cnVj
dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKPiArc3RhdGljIHZvaWQgaWxrX3Byb2dyYW1f
d2F0ZXJtYXJrcyhzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlKQo+ICB7Cj4gLQlzdHJ1
Y3QgZHJtX2RldmljZSAqZGV2ID0gZGV2X3ByaXYtPmRldjsKPiArCXN0cnVjdCBkcm1fY3J0YyAq
Y3J0YyA9IGNzdGF0ZS0+YmFzZS5jcnRjOwo+ICsJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNy
dGMtPmRldjsKPiArCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUo
ZGV2KTsKPiAgCXN0cnVjdCBpbnRlbF9waXBlX3dtIGxwX3dtXzFfMiA9IHt9LCBscF93bV81XzYg
PSB7fSwgKmJlc3RfbHBfd207Cj4gIAlzdHJ1Y3QgaWxrX3dtX21heGltdW1zIG1heDsKPiAgCXN0
cnVjdCBpbnRlbF93bV9jb25maWcgKmNvbmZpZyA9ICZkZXZfcHJpdi0+d20uY29uZmlnOwo+ICAJ
c3RydWN0IGlsa193bV92YWx1ZXMgcmVzdWx0cyA9IHt9Owo+ICAJZW51bSBpbnRlbF9kZGJfcGFy
dGl0aW9uaW5nIHBhcnRpdGlvbmluZzsKPiAgCj4gKwl0b19pbnRlbF9jcnRjKGNydGMpLT53bS5h
Y3RpdmUuaWxrID0gY3N0YXRlLT53bS5vcHRpbWFsLmlsazsKPiArCj4gIAlpbGtfY29tcHV0ZV93
bV9tYXhpbXVtcyhkZXYsIDEsIGNvbmZpZywgSU5URUxfRERCX1BBUlRfMV8yLCAmbWF4KTsKPiAg
CWlsa193bV9tZXJnZShkZXYsIGNvbmZpZywgJm1heCwgJmxwX3dtXzFfMik7Cj4gIAo+IEBAIC0z
Njk3LDcgKzM3MDEsNiBAQCBzdGF0aWMgdm9pZCBpbGtfcHJvZ3JhbV93YXRlcm1hcmtzKHN0cnVj
dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKPiAgCj4gIHN0YXRpYyB2b2lkIGlsa191cGRh
dGVfd20oc3RydWN0IGRybV9jcnRjICpjcnRjKQo+ICB7Cj4gLQlzdHJ1Y3QgZHJtX2k5MTVfcHJp
dmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGNydGMtPmRldik7Cj4gIAlzdHJ1Y3QgaW50ZWxfY3J0
YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7Cj4gIAlzdHJ1Y3QgaW50ZWxfY3J0
Y19zdGF0ZSAqY3N0YXRlID0gdG9faW50ZWxfY3J0Y19zdGF0ZShjcnRjLT5zdGF0ZSk7Cj4gIAo+
IEBAIC0zNzE1LDkgKzM3MTgsNyBAQCBzdGF0aWMgdm9pZCBpbGtfdXBkYXRlX3dtKHN0cnVjdCBk
cm1fY3J0YyAqY3J0YykKPiAgCQlpbnRlbF93YWl0X2Zvcl92YmxhbmsoY3J0Yy0+ZGV2LCBpbnRl
bF9jcnRjLT5waXBlKTsKPiAgCX0KPiAgCj4gLQlpbnRlbF9jcnRjLT53bS5hY3RpdmUuaWxrID0g
Y3N0YXRlLT53bS5vcHRpbWFsLmlsazsKPiAtCj4gLQlpbGtfcHJvZ3JhbV93YXRlcm1hcmtzKGRl
dl9wcml2KTsKPiArCWlsa19wcm9ncmFtX3dhdGVybWFya3MoY3N0YXRlKTsKPiAgfQo+ICAKPiAg
c3RhdGljIHZvaWQgc2tsX3BpcGVfd21fYWN0aXZlX3N0YXRlKHVpbnQzMl90IHZhbCwKPiBAQCAt
NzA1MSw2ICs3MDUyLDcgQEAgdm9pZCBpbnRlbF9pbml0X3BtKHN0cnVjdCBkcm1fZGV2aWNlICpk
ZXYpCj4gIAkJICAgICBkZXZfcHJpdi0+d20uc3ByX2xhdGVuY3lbMF0gJiYgZGV2X3ByaXYtPndt
LmN1cl9sYXRlbmN5WzBdKSkgewo+ICAJCQlkZXZfcHJpdi0+ZGlzcGxheS51cGRhdGVfd20gPSBp
bGtfdXBkYXRlX3dtOwo+ICAJCQlkZXZfcHJpdi0+ZGlzcGxheS5jb21wdXRlX3BpcGVfd20gPSBp
bGtfY29tcHV0ZV9waXBlX3dtOwo+ICsJCQlkZXZfcHJpdi0+ZGlzcGxheS5wcm9ncmFtX3dhdGVy
bWFya3MgPSBpbGtfcHJvZ3JhbV93YXRlcm1hcmtzOwo+ICAJCX0gZWxzZSB7Cj4gIAkJCURSTV9E
RUJVR19LTVMoIkZhaWxlZCB0byByZWFkIGRpc3BsYXkgcGxhbmUgbGF0ZW5jeS4gIgo+ICAJCQkJ
ICAgICAgIkRpc2FibGUgQ3hTUlxuIik7Cj4gLS0gCj4gMi4xLjQKPgo+IF9fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCj4gSW50ZWwtZ2Z4IG1haWxpbmcgbGlz
dAo+IEludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKPiBodHRwOi8vbGlzdHMuZnJlZWRl
c2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4CgotLSAKSmFuaSBOaWt1bGEsIElu
dGVsIE9wZW4gU291cmNlIFRlY2hub2xvZ3kgQ2VudGVyCl9fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4
QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxt
YW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==