From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: Re: [PATCH] drm/i915: Sanitize watermarks after hardware state readout (v3) Date: Tue, 1 Dec 2015 08:42:43 +0100 Message-ID: <565D4F73.3020902@linux.intel.com> References: <20151125170558.GS4437@intel.com> <1448927763-5726-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: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 7D5376E74F for ; Mon, 30 Nov 2015 23:42:45 -0800 (PST) In-Reply-To: <1448927763-5726-1-git-send-email-matthew.d.roper@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Matt Roper , intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org T3AgMDEtMTItMTUgb20gMDA6NTYgc2NocmVlZiBNYXR0IFJvcGVyOgo+IEFsdGhvdWdoIHdlIGNh biBkbyBhIGdvb2Qgam9iIG9mIHJlYWRpbmcgb3V0IGhhcmR3YXJlIHN0YXRlLCB0aGUKPiBncmFw aGljcyBmaXJtd2FyZSBtYXkgaGF2ZSBwcm9ncmFtbWVkIHRoZSB3YXRlcm1hcmtzIGluIGEgY3Jl YXRpdmUgd2F5Cj4gdGhhdCBkb2Vzbid0IG1hdGNoIGhvdyBpOTE1IHdvdWxkIGhhdmUgY2hvc2Vu IHRvIHByb2dyYW0gdGhlbS4gIFdlCj4gc2hvdWxkbid0IHRydXN0IHRoZSBmaXJtd2FyZSdzIHdh dGVybWFyayBwcm9ncmFtbWluZywgYnV0IHNob3VsZCByYXRoZXIKPiByZS1jYWxjdWxhdGUgaG93 IHdlIHRoaW5rIFdNJ3Mgc2hvdWxkIGJlIHByb2dyYW1tZWQgYW5kIHRoZW4gc2hvdmUgdGhvc2UK PiB2YWx1ZXMgaW50byB0aGUgaGFyZHdhcmUuCj4KPiBXZSBjYW4gZG8gdGhpcyBwcmV0dHkgZWFz aWx5IGJ5IGNyZWF0aW5nIGEgZHVtbXkgdG9wLWxldmVsIHN0YXRlLAo+IHJ1bm5pbmcgaXQgdGhy b3VnaCB0aGUgY2hlY2sgcHJvY2VzcyB0byBjYWxjdWxhdGUgYWxsIHRoZSB2YWx1ZXMsIGFuZAo+ IHRoZW4ganVzdCBwcm9ncmFtbWluZyB0aGUgd2F0ZXJtYXJrcyBmb3IgZWFjaCBDUlRDLgo+Cj4g djI6ICBNb3ZlIHdhdGVybWFyayBzYW5pdGl6YXRpb24gYWZ0ZXIgb3VyIEJJT1MgZmIgcmVjb25z dHJ1Y3Rpb247IHRoZQo+ICAgICAgd2F0ZXJtYXJrIGNhbGN1bGF0aW9ucyB0aGF0IHdlIGRvIGhl cmUgbmVlZCB0byBsb29rIGF0IHBzdGF0ZS0+ZmIsCj4gICAgICB3aGljaCBpc24ndCBzZXR1cCB5 ZXQgaW4gaW50ZWxfbW9kZXNldF9zZXR1cF9od19zdGF0ZSgpLCBldmVuCj4gICAgICB0aG91Z2gg d2UgaGF2ZSBhbiBlbmFibGVkICYgdmlzaWJsZSBwbGFuZS4KPgo+IHYzOgo+ICAtIERvbid0IG1v dmUgJ2FjdGl2ZSA9IG9wdGltYWwnIHdhdGVybWFyayBhc3NpZ25tZW50OyB3ZSBqdXN0IHVuZG8K PiAgICB0aGF0IGNoYW5nZSBpbiB0aGUgbmV4dCBwYXRjaCBhbnl3YXkuICAoVmlsbGUpCj4gIC0g TW92ZSBhdG9taWMgaGVscGVyIGxvY2tpbmcgZml4IHRvIHNlcGFyYXRlIHBhdGNoLiAgKE1hYXJ0 ZW4pCj4KPiBDYzogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4Lmlu dGVsLmNvbT4KPiBDYzogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVs LmNvbT4KPiBTaWduZWQtb2ZmLWJ5OiBNYXR0IFJvcGVyIDxtYXR0aGV3LmQucm9wZXJAaW50ZWwu Y29tPgo+IC0tLQo+IFRoZSBjYWxsIHRvIGRybV9hdG9taWNfaGVscGVyX2R1cGxpY2F0ZV9zdGF0 ZSgpIGluIHRoaXMgcGF0Y2ggd2lsbCB0aHJvdyBhCj4gd2FybmluZzsgYXRvbWljIGhlbHBlciBw YXRjaCAiZHJtL2F0b21pYy1oZWxwZXI6IEdyYWIgY29ubmVjdGlvbl9tdXRleCB3aGlsZQo+IGR1 cGxpY2F0aW5nIHN0YXRlIiBpcyBuZWNlc3NhcnkgdG8gZml4IHRoYXQuCj4KPiAgZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgIHwgIDEgKwo+ICBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kaXNwbGF5LmMgfCA1OCArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysKPiAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyAgICAgIHwgMTAgKysrKy0tLQo+ ICAzIGZpbGVzIGNoYW5nZWQsIDY1IGluc2VydGlvbnMoKyksIDQgZGVsZXRpb25zKC0pCj4KPiBk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZHJ2LmgKPiBpbmRleCAxMWFlNWE1Li41MTcyNjA0IDEwMDY0NAo+IC0t LSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKPiArKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2Rydi5oCj4gQEAgLTYzMCw2ICs2MzAsNyBAQCBzdHJ1Y3QgZHJtX2k5MTVf ZGlzcGxheV9mdW5jcyB7Cj4gIAkJCSAgc3RydWN0IGRwbGwgKmJlc3RfY2xvY2spOwo+ICAJaW50 ICgqY29tcHV0ZV9waXBlX3dtKShzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywKPiAgCQkJICAgICAg IHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSk7Cj4gKwl2b2lkICgqcHJvZ3JhbV93YXRl cm1hcmtzKShzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlKTsKPiAgCXZvaWQgKCp1cGRh dGVfd20pKHN0cnVjdCBkcm1fY3J0YyAqY3J0Yyk7Cj4gIAlpbnQgKCptb2Rlc2V0X2NhbGNfY2Rj bGspKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSk7Cj4gIAl2b2lkICgqbW9kZXNldF9j b21taXRfY2RjbGspKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSk7Cj4gZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Rpc3BsYXkuYwo+IGluZGV4IDAwZTRjMzcuLmViNTJhZmEgMTAwNjQ0Cj4g LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCj4gKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCj4gQEAgLTE1MTIwLDYgKzE1MTIwLDU3IEBA IHZvaWQgaW50ZWxfbW9kZXNldF9pbml0X2h3KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCj4gIAlp bnRlbF9lbmFibGVfZ3RfcG93ZXJzYXZlKGRldik7Cj4gIH0KPiAgCj4gKy8qCj4gKyAqIENhbGN1 bGF0ZSB3aGF0IHdlIHRoaW5rIHRoZSB3YXRlcm1hcmtzIHNob3VsZCBiZSBmb3IgdGhlIHN0YXRl IHdlJ3ZlIHJlYWQKPiArICogb3V0IG9mIHRoZSBoYXJkd2FyZSBhbmQgdGhlbiBpbW1lZGlhdGVs eSBwcm9ncmFtIHRob3NlIHdhdGVybWFya3Mgc28gdGhhdAo+ICsgKiB3ZSBlbnN1cmUgdGhlIGhh cmR3YXJlIHNldHRpbmdzIG1hdGNoIG91ciBpbnRlcm5hbCBzdGF0ZS4KPiArICovCj4gK3N0YXRp YyB2b2lkIHNhbml0aXplX3dhdGVybWFya3Moc3RydWN0IGRybV9kZXZpY2UgKmRldikKPiArewo+ ICsJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOwo+ICsJ c3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlOwo+ICsJc3RydWN0IGRybV9jcnRjICpjcnRj Owo+ICsJc3RydWN0IGRybV9jcnRjX3N0YXRlICpjc3RhdGU7Cj4gKwlzdHJ1Y3QgZHJtX21vZGVz ZXRfYWNxdWlyZV9jdHggY3R4Owo+ICsJaW50IHJldDsKPiArCWludCBpOwo+ICsKPiArCS8qIE9u bHkgc3VwcG9ydGVkIG9uIHBsYXRmb3JtcyB0aGF0IHVzZSBhdG9taWMgd2F0ZXJtYXJrIGRlc2ln biAqLwo+ICsJaWYgKCFkZXZfcHJpdi0+ZGlzcGxheS5wcm9ncmFtX3dhdGVybWFya3MpCj4gKwkJ cmV0dXJuOwo+ICsKPiArCS8qCj4gKwkgKiBDYWxjdWxhdGUgd2hhdCB3ZSB0aGluayBXTSdzIHNo b3VsZCBiZSBieSBjcmVhdGluZyBhIGR1bW15IHN0YXRlIGFuZAo+ICsJICogcnVubmluZyBpdCB0 aHJvdWdoIHRoZSBhdG9taWMgY2hlY2sgY29kZS4KPiArCSAqLwo+ICsJZHJtX21vZGVzZXRfYWNx dWlyZV9pbml0KCZjdHgsIDApOwo+ICsJc3RhdGUgPSBkcm1fYXRvbWljX2hlbHBlcl9kdXBsaWNh dGVfc3RhdGUoZGV2LCAmY3R4KTsKPiArCWlmIChXQVJOX09OKElTX0VSUihzdGF0ZSkpKQo+ICsJ CXJldHVybjsKPiArCj4gKwlyZXQgPSBpbnRlbF9hdG9taWNfY2hlY2soZGV2LCBzdGF0ZSk7Cj4g KwlpZiAocmV0KSB7Cj4gKwkJLyoKPiArCQkgKiBKdXN0IGdpdmUgdXAgYW5kIGxlYXZlIHdhdGVy bWFya3MgdW50b3VjaGVkIGlmIHdlIGdldCBhbgo+ICsJCSAqIGVycm9yIGJhY2sgZnJvbSAnY2hl Y2snCj4gKwkJICovCj4gKwkJRFJNX0RFQlVHX0tNUygiQ291bGQgbm90IGRldGVybWluZSB2YWxp ZCB3YXRlcm1hcmtzIGZvciBpbmhlcml0ZWQgc3RhdGVcbiIpOwpTZWVtcyBsaWtlIGEgc2VyaW91 cyBlcnJvciB0aGF0IHNob3VsZCBub3QgYmUgc2h1ZmZsZWQgYXdheSwgbWF5YmUgcHJpbnQgdGhl IHJldCB0b28/Cj4gKwkJcmV0dXJuOwo+ICsJfQo+ICsKPiArCS8qIFdyaXRlIGNhbGN1bGF0ZWQg d2F0ZXJtYXJrIHZhbHVlcyBiYWNrICovCj4gKwl0b19pOTE1KGRldiktPndtLmNvbmZpZyA9IHRv X2ludGVsX2F0b21pY19zdGF0ZShzdGF0ZSktPndtX2NvbmZpZzsKPiArCWZvcl9lYWNoX2NydGNf aW5fc3RhdGUoc3RhdGUsIGNydGMsIGNzdGF0ZSwgaSkgewo+ICsJCXN0cnVjdCBpbnRlbF9jcnRj X3N0YXRlICpjcyA9IHRvX2ludGVsX2NydGNfc3RhdGUoY3N0YXRlKTsKPiArCj4gKwkJZGV2X3By aXYtPmRpc3BsYXkucHJvZ3JhbV93YXRlcm1hcmtzKGNzKTsKPiArCX0KPiArCj4gKwlkcm1fYXRv bWljX3N0YXRlX2ZyZWUoc3RhdGUpOwo+ICsJZHJtX21vZGVzZXRfZHJvcF9sb2NrcygmY3R4KTsK PiArCWRybV9tb2Rlc2V0X2FjcXVpcmVfZmluaSgmY3R4KTsKPiArfQo+ICsKPiAgdm9pZCBpbnRl bF9tb2Rlc2V0X2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKPiAgewo+ICAJc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKPiBAQCAtMTUyNDMs NiArMTUyOTQsMTMgQEAgdm9pZCBpbnRlbF9tb2Rlc2V0X2luaXQoc3RydWN0IGRybV9kZXZpY2Ug KmRldikKPiAgCQlpbnRlbF9kdW1wX3BpcGVfY29uZmlnKGNydGMsIGNydGMtPmNvbmZpZywKPiAg CQkJCSAgICAgICAiW3N0YXRlIGFmdGVyIGluaXQgZmIgcmVjb25zdHJ1Y3Rpb25dIik7Cj4gIAl9 Cj4gKwo+ICsJLyoKPiArCSAqIE1ha2Ugc3VyZSBoYXJkd2FyZSB3YXRlcm1hcmtzIHJlYWxseSBt YXRjaCB0aGUgc3RhdGUgd2UgcmVhZCBvdXQuCj4gKwkgKiBOb3RlIHRoYXQgd2UgbmVlZCB0byBk byB0aGlzIGFmdGVyIHJlY29uc3RydWN0aW5nIHRoZSBCSU9TIGZiJ3MKPiArCSAqIHNpbmNlIHRo ZSB3YXRlcm1hcmsgY2FsY3VsYXRpb24gZG9uZSBoZXJlIHdpbGwgdXNlIHBzdGF0ZS0+ZmIuCj4g KwkgKi8KPiArCXNhbml0aXplX3dhdGVybWFya3MoZGV2KTsKPiAgfQo+ICAKPiAgc3RhdGljIHZv aWQgaW50ZWxfZW5hYmxlX3BpcGVfYShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQo+IGRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfcG0uYwo+IGluZGV4IGQ0Y2Q1ZDUuLjYzMzdjYmYgMTAwNjQ0Cj4gLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3BtLmMKPiBAQCAtMzYxMCw5ICszNjEwLDExIEBAIHN0YXRpYyB2b2lkIHNrbF91cGRh dGVfd20oc3RydWN0IGRybV9jcnRjICpjcnRjKQo+ICAJZGV2X3ByaXYtPndtLnNrbF9odyA9ICpy ZXN1bHRzOwo+ICB9Cj4gIAo+IC1zdGF0aWMgdm9pZCBpbGtfcHJvZ3JhbV93YXRlcm1hcmtzKHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKPiArc3RhdGljIHZvaWQgaWxrX3Byb2dy YW1fd2F0ZXJtYXJrcyhzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlKQo+ICB7Cj4gLQlz dHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gZGV2X3ByaXYtPmRldjsKPiArCXN0cnVjdCBkcm1fY3J0 YyAqY3J0YyA9IGNzdGF0ZS0+YmFzZS5jcnRjOwo+ICsJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9 IGNydGMtPmRldjsKPiArCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5 MTUoZGV2KTsKPiAgCXN0cnVjdCBpbnRlbF9waXBlX3dtIGxwX3dtXzFfMiA9IHt9LCBscF93bV81 XzYgPSB7fSwgKmJlc3RfbHBfd207Cj4gIAlzdHJ1Y3QgaWxrX3dtX21heGltdW1zIG1heDsKPiAg CXN0cnVjdCBpbnRlbF93bV9jb25maWcgKmNvbmZpZyA9ICZkZXZfcHJpdi0+d20uY29uZmlnOwo+ IEBAIC0zNjQzLDcgKzM2NDUsNiBAQCBzdGF0aWMgdm9pZCBpbGtfcHJvZ3JhbV93YXRlcm1hcmtz KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKPiAgCj4gIHN0YXRpYyB2b2lkIGls a191cGRhdGVfd20oc3RydWN0IGRybV9jcnRjICpjcnRjKQo+ICB7Cj4gLQlzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGNydGMtPmRldik7Cj4gIAlzdHJ1Y3QgaW50 ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7Cj4gIAlzdHJ1Y3QgaW50 ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlID0gdG9faW50ZWxfY3J0Y19zdGF0ZShjcnRjLT5zdGF0ZSk7 Cj4gIAo+IEBAIC0zNjYzLDcgKzM2NjQsNyBAQCBzdGF0aWMgdm9pZCBpbGtfdXBkYXRlX3dtKHN0 cnVjdCBkcm1fY3J0YyAqY3J0YykKPiAgCj4gIAlpbnRlbF9jcnRjLT53bS5hY3RpdmUuaWxrID0g Y3N0YXRlLT53bS5vcHRpbWFsLmlsazsKPiAgCj4gLQlpbGtfcHJvZ3JhbV93YXRlcm1hcmtzKGRl dl9wcml2KTsKPiArCWlsa19wcm9ncmFtX3dhdGVybWFya3MoY3N0YXRlKTsKPiAgfQo+ICAKPiAg c3RhdGljIHZvaWQgc2tsX3BpcGVfd21fYWN0aXZlX3N0YXRlKHVpbnQzMl90IHZhbCwKPiBAQCAt Njk3MSw2ICs2OTcyLDcgQEAgdm9pZCBpbnRlbF9pbml0X3BtKHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYpCj4gIAkJICAgICBkZXZfcHJpdi0+d20uc3ByX2xhdGVuY3lbMF0gJiYgZGV2X3ByaXYtPndt LmN1cl9sYXRlbmN5WzBdKSkgewo+ICAJCQlkZXZfcHJpdi0+ZGlzcGxheS51cGRhdGVfd20gPSBp bGtfdXBkYXRlX3dtOwo+ICAJCQlkZXZfcHJpdi0+ZGlzcGxheS5jb21wdXRlX3BpcGVfd20gPSBp bGtfY29tcHV0ZV9waXBlX3dtOwo+ICsJCQlkZXZfcHJpdi0+ZGlzcGxheS5wcm9ncmFtX3dhdGVy bWFya3MgPSBpbGtfcHJvZ3JhbV93YXRlcm1hcmtzOwo+CkFueSBwbGFucyBmb3IgZ2V0dGluZyBy aWQgb2YgdXBkYXRlX3dtKCkgPyBJIHJlYWxseSBsaWtlIHBhc3NpbmcgYSBjc3RhdGUuIDopCgp+ TWFhcnRlbgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJ bnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0 cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=