From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: Re: [PATCH 8/9] drm/i915: Sanitize watermarks after hardware state readout (v2) Date: Mon, 30 Nov 2015 10:50:26 +0100 Message-ID: <565C1BE2.3000607@linux.intel.com> References: <1448470115-7863-1-git-send-email-matthew.d.roper@intel.com> <1448470115-7863-9-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 mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id D46F56E4D7 for ; Mon, 30 Nov 2015 01:50:28 -0800 (PST) In-Reply-To: <1448470115-7863-9-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 T3AgMjUtMTEtMTUgb20gMTc6NDggc2NocmVlZiBNYXR0IFJvcGVyOgo+IEFsdGhvdWdoIHdlIGNh biBkbyBhIGdvb2Qgam9iIG9mIHJlYWRpbmcgb3V0IGhhcmR3YXJlIHN0YXRlLCB0aGUKPiBncmFw aGljcyBmaXJtd2FyZSBtYXkgaGF2ZSBwcm9ncmFtbWVkIHRoZSB3YXRlcm1hcmtzIGluIGEgY3Jl YXRpdmUgd2F5Cj4gdGhhdCBkb2Vzbid0IG1hdGNoIGhvdyBpOTE1IHdvdWxkIGhhdmUgY2hvc2Vu IHRvIHByb2dyYW0gdGhlbS4gIFdlCj4gc2hvdWxkbid0IHRydXN0IHRoZSBmaXJtd2FyZSdzIHdh dGVybWFyayBwcm9ncmFtbWluZywgYnV0IHNob3VsZCByYXRoZXIKPiByZS1jYWxjdWxhdGUgaG93 IHdlIHRoaW5rIFdNJ3Mgc2hvdWxkIGJlIHByb2dyYW1tZWQgYW5kIHRoZW4gc2hvdmUgdGhvc2UK PiB2YWx1ZXMgaW50byB0aGUgaGFyZHdhcmUuCj4KPiBXZSBjYW4gZG8gdGhpcyBwcmV0dHkgZWFz aWx5IGJ5IGNyZWF0aW5nIGEgZHVtbXkgdG9wLWxldmVsIHN0YXRlLAo+IHJ1bm5pbmcgaXQgdGhy b3VnaCB0aGUgY2hlY2sgcHJvY2VzcyB0byBjYWxjdWxhdGUgYWxsIHRoZSB2YWx1ZXMsIGFuZAo+ IHRoZW4ganVzdCBwcm9ncmFtbWluZyB0aGUgd2F0ZXJtYXJrcyBmb3IgZWFjaCBDUlRDLgo+Cj4g djI6ICBNb3ZlIHdhdGVybWFyayBzYW5pdGl6YXRpb24gYWZ0ZXIgb3VyIEJJT1MgZmIgcmVjb25z dHJ1Y3Rpb247IHRoZQo+ICAgICAgd2F0ZXJtYXJrIGNhbGN1bGF0aW9ucyB0aGF0IHdlIGRvIGhl cmUgbmVlZCB0byBsb29rIGF0IHBzdGF0ZS0+ZmIsCj4gICAgICB3aGljaCBpc24ndCBzZXR1cCB5 ZXQgaW4gaW50ZWxfbW9kZXNldF9zZXR1cF9od19zdGF0ZSgpLCBldmVuCj4gICAgICB0aG91Z2gg d2UgaGF2ZSBhbiBlbmFibGVkICYgdmlzaWJsZSBwbGFuZS4KPgo+IENjOiBNYWFydGVuIExhbmto b3JzdCA8bWFhcnRlbi5sYW5raG9yc3RAbGludXguaW50ZWwuY29tPgo+IFNpZ25lZC1vZmYtYnk6 IE1hdHQgUm9wZXIgPG1hdHRoZXcuZC5yb3BlckBpbnRlbC5jb20+Cj4gLS0tCj4gIGRyaXZlcnMv Z3B1L2RybS9kcm1fYXRvbWljX2hlbHBlci5jICB8ICAxICsKPiAgZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9kcnYuaCAgICAgIHwgIDEgKwo+ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k aXNwbGF5LmMgfCA1OCArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysKPiAgZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyAgICAgIHwgMTQgKysrKystLS0tCj4gIDQgZmls ZXMgY2hhbmdlZCwgNjggaW5zZXJ0aW9ucygrKSwgNiBkZWxldGlvbnMoLSkKPgo+IGRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pY19oZWxwZXIuYyBiL2RyaXZlcnMvZ3B1L2Ry bS9kcm1fYXRvbWljX2hlbHBlci5jCj4gaW5kZXggMzczMWEyNi4uOGE5OGUwYyAxMDA2NDQKPiAt LS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pY19oZWxwZXIuYwo+ICsrKyBiL2RyaXZlcnMv Z3B1L2RybS9kcm1fYXRvbWljX2hlbHBlci5jCj4gQEAgLTI0NzgsNiArMjQ3OCw3IEBAIGRybV9h dG9taWNfaGVscGVyX2R1cGxpY2F0ZV9zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAo+ICAJ CX0KPiAgCX0KPiAgCj4gKwlkcm1fbW9kZXNldF9sb2NrKCZkZXYtPm1vZGVfY29uZmlnLmNvbm5l Y3Rpb25fbXV0ZXgsIGN0eCk7Cj4gIAlkcm1fZm9yX2VhY2hfY29ubmVjdG9yKGNvbm4sIGRldikg ewo+ICAJCXN0cnVjdCBkcm1fY29ubmVjdG9yX3N0YXRlICpjb25uX3N0YXRlOwpTZWVtcyB0aGlz IGh1bmsgZG9lc24ndCBiZWxvbmcgdG8gdGhpcyBwYXRjaD8KQWxzbyB0aGF0IGxvY2tpbmcgaXMg YWxyZWFkeSB0YWtlbiBjYXJlIG9mIGJ5IGRybV9hdG9taWNfZ2V0X2Nvbm5lY3Rvcl9zdGF0ZSwK YW5kIGl0IGRvZXNuJ3QgY2hlY2sgZm9yIGRybV9tb2Rlc2V0X2xvY2sgcmV0dXJuaW5nIGFuIGVy cm9yIGNvZGUuLgoKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYu aCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKPiBpbmRleCAxMWFlNWE1Li41MTcy NjA0IDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKPiArKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCj4gQEAgLTYzMCw2ICs2MzAsNyBAQCBz dHJ1Y3QgZHJtX2k5MTVfZGlzcGxheV9mdW5jcyB7Cj4gIAkJCSAgc3RydWN0IGRwbGwgKmJlc3Rf Y2xvY2spOwo+ICAJaW50ICgqY29tcHV0ZV9waXBlX3dtKShzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0 YywKPiAgCQkJICAgICAgIHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSk7Cj4gKwl2b2lk ICgqcHJvZ3JhbV93YXRlcm1hcmtzKShzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlKTsK PiAgCXZvaWQgKCp1cGRhdGVfd20pKHN0cnVjdCBkcm1fY3J0YyAqY3J0Yyk7Cj4gIAlpbnQgKCpt b2Rlc2V0X2NhbGNfY2RjbGspKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSk7Cj4gIAl2 b2lkICgqbW9kZXNldF9jb21taXRfY2RjbGspKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0 ZSk7Cj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwo+IGluZGV4IDAwZTRjMzcuLmVi NTJhZmEgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5j Cj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCj4gQEAgLTE1MTIw LDYgKzE1MTIwLDU3IEBAIHZvaWQgaW50ZWxfbW9kZXNldF9pbml0X2h3KHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYpCj4gIAlpbnRlbF9lbmFibGVfZ3RfcG93ZXJzYXZlKGRldik7Cj4gIH0KPiAgCj4g Ky8qCj4gKyAqIENhbGN1bGF0ZSB3aGF0IHdlIHRoaW5rIHRoZSB3YXRlcm1hcmtzIHNob3VsZCBi ZSBmb3IgdGhlIHN0YXRlIHdlJ3ZlIHJlYWQKPiArICogb3V0IG9mIHRoZSBoYXJkd2FyZSBhbmQg dGhlbiBpbW1lZGlhdGVseSBwcm9ncmFtIHRob3NlIHdhdGVybWFya3Mgc28gdGhhdAo+ICsgKiB3 ZSBlbnN1cmUgdGhlIGhhcmR3YXJlIHNldHRpbmdzIG1hdGNoIG91ciBpbnRlcm5hbCBzdGF0ZS4K PiArICovCj4gK3N0YXRpYyB2b2lkIHNhbml0aXplX3dhdGVybWFya3Moc3RydWN0IGRybV9kZXZp Y2UgKmRldikKPiArewo+ICsJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9f aTkxNShkZXYpOwo+ICsJc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlOwo+ICsJc3RydWN0 IGRybV9jcnRjICpjcnRjOwo+ICsJc3RydWN0IGRybV9jcnRjX3N0YXRlICpjc3RhdGU7Cj4gKwlz dHJ1Y3QgZHJtX21vZGVzZXRfYWNxdWlyZV9jdHggY3R4Owo+ICsJaW50IHJldDsKPiArCWludCBp Owo+ICsKPiArCS8qIE9ubHkgc3VwcG9ydGVkIG9uIHBsYXRmb3JtcyB0aGF0IHVzZSBhdG9taWMg d2F0ZXJtYXJrIGRlc2lnbiAqLwo+ICsJaWYgKCFkZXZfcHJpdi0+ZGlzcGxheS5wcm9ncmFtX3dh dGVybWFya3MpCj4gKwkJcmV0dXJuOwo+ICsKPiArCS8qCj4gKwkgKiBDYWxjdWxhdGUgd2hhdCB3 ZSB0aGluayBXTSdzIHNob3VsZCBiZSBieSBjcmVhdGluZyBhIGR1bW15IHN0YXRlIGFuZAo+ICsJ ICogcnVubmluZyBpdCB0aHJvdWdoIHRoZSBhdG9taWMgY2hlY2sgY29kZS4KPiArCSAqLwo+ICsJ ZHJtX21vZGVzZXRfYWNxdWlyZV9pbml0KCZjdHgsIDApOwo+ICsJc3RhdGUgPSBkcm1fYXRvbWlj X2hlbHBlcl9kdXBsaWNhdGVfc3RhdGUoZGV2LCAmY3R4KTsKPiArCWlmIChXQVJOX09OKElTX0VS UihzdGF0ZSkpKQo+ICsJCXJldHVybjsKPiArCj4gKwlyZXQgPSBpbnRlbF9hdG9taWNfY2hlY2so ZGV2LCBzdGF0ZSk7Cj4gKwlpZiAocmV0KSB7Cj4gKwkJLyoKPiArCQkgKiBKdXN0IGdpdmUgdXAg YW5kIGxlYXZlIHdhdGVybWFya3MgdW50b3VjaGVkIGlmIHdlIGdldCBhbgo+ICsJCSAqIGVycm9y IGJhY2sgZnJvbSAnY2hlY2snCj4gKwkJICovCj4gKwkJRFJNX0RFQlVHX0tNUygiQ291bGQgbm90 IGRldGVybWluZSB2YWxpZCB3YXRlcm1hcmtzIGZvciBpbmhlcml0ZWQgc3RhdGVcbiIpOwo+ICsJ CXJldHVybjsKPiArCX0KPiArCj4gKwkvKiBXcml0ZSBjYWxjdWxhdGVkIHdhdGVybWFyayB2YWx1 ZXMgYmFjayAqLwo+ICsJdG9faTkxNShkZXYpLT53bS5jb25maWcgPSB0b19pbnRlbF9hdG9taWNf c3RhdGUoc3RhdGUpLT53bV9jb25maWc7Cj4gKwlmb3JfZWFjaF9jcnRjX2luX3N0YXRlKHN0YXRl LCBjcnRjLCBjc3RhdGUsIGkpIHsKPiArCQlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3MgPSB0 b19pbnRlbF9jcnRjX3N0YXRlKGNzdGF0ZSk7Cj4gKwo+ICsJCWRldl9wcml2LT5kaXNwbGF5LnBy b2dyYW1fd2F0ZXJtYXJrcyhjcyk7Cj4gKwl9Cj4gKwo+ICsJZHJtX2F0b21pY19zdGF0ZV9mcmVl KHN0YXRlKTsKPiArCWRybV9tb2Rlc2V0X2Ryb3BfbG9ja3MoJmN0eCk7Cj4gKwlkcm1fbW9kZXNl dF9hY3F1aXJlX2ZpbmkoJmN0eCk7Cj4gK30KPiArCj4gIHZvaWQgaW50ZWxfbW9kZXNldF9pbml0 KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCj4gIHsKPiAgCXN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7Cj4gQEAgLTE1MjQzLDYgKzE1Mjk0LDEzIEBA IHZvaWQgaW50ZWxfbW9kZXNldF9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCj4gIAkJaW50 ZWxfZHVtcF9waXBlX2NvbmZpZyhjcnRjLCBjcnRjLT5jb25maWcsCj4gIAkJCQkgICAgICAgIltz dGF0ZSBhZnRlciBpbml0IGZiIHJlY29uc3RydWN0aW9uXSIpOwo+ICAJfQo+ICsKPiArCS8qCj4g KwkgKiBNYWtlIHN1cmUgaGFyZHdhcmUgd2F0ZXJtYXJrcyByZWFsbHkgbWF0Y2ggdGhlIHN0YXRl IHdlIHJlYWQgb3V0Lgo+ICsJICogTm90ZSB0aGF0IHdlIG5lZWQgdG8gZG8gdGhpcyBhZnRlciBy ZWNvbnN0cnVjdGluZyB0aGUgQklPUyBmYidzCj4gKwkgKiBzaW5jZSB0aGUgd2F0ZXJtYXJrIGNh bGN1bGF0aW9uIGRvbmUgaGVyZSB3aWxsIHVzZSBwc3RhdGUtPmZiLgo+ICsJICovCj4gKwlzYW5p dGl6ZV93YXRlcm1hcmtzKGRldik7Cj4gIH0KPiAgCj4gIHN0YXRpYyB2b2lkIGludGVsX2VuYWJs ZV9waXBlX2Eoc3RydWN0IGRybV9kZXZpY2UgKmRldikKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfcG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMK PiBpbmRleCBkNGNkNWQ1Li5jMjA5YTY5IDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX3BtLmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCj4g QEAgLTM2MTAsMTUgKzM2MTAsMTkgQEAgc3RhdGljIHZvaWQgc2tsX3VwZGF0ZV93bShzdHJ1Y3Qg ZHJtX2NydGMgKmNydGMpCj4gIAlkZXZfcHJpdi0+d20uc2tsX2h3ID0gKnJlc3VsdHM7Cj4gIH0K PiAgCj4gLXN0YXRpYyB2b2lkIGlsa19wcm9ncmFtX3dhdGVybWFya3Moc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2KQo+ICtzdGF0aWMgdm9pZCBpbGtfcHJvZ3JhbV93YXRlcm1hcmtz KHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjc3RhdGUpCj4gIHsKPiAtCXN0cnVjdCBkcm1fZGV2 aWNlICpkZXYgPSBkZXZfcHJpdi0+ZGV2Owo+ICsJc3RydWN0IGRybV9jcnRjICpjcnRjID0gY3N0 YXRlLT5iYXNlLmNydGM7Cj4gKwlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+ZGV2Owo+ ICsJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOwo+ICAJ c3RydWN0IGludGVsX3BpcGVfd20gbHBfd21fMV8yID0ge30sIGxwX3dtXzVfNiA9IHt9LCAqYmVz dF9scF93bTsKPiAgCXN0cnVjdCBpbGtfd21fbWF4aW11bXMgbWF4Owo+ICAJc3RydWN0IGludGVs X3dtX2NvbmZpZyAqY29uZmlnID0gJmRldl9wcml2LT53bS5jb25maWc7Cj4gIAlzdHJ1Y3QgaWxr X3dtX3ZhbHVlcyByZXN1bHRzID0ge307Cj4gIAllbnVtIGludGVsX2RkYl9wYXJ0aXRpb25pbmcg cGFydGl0aW9uaW5nOwo+ICAKPiArCXRvX2ludGVsX2NydGMoY3J0YyktPndtLmFjdGl2ZS5pbGsg PSBjc3RhdGUtPndtLm9wdGltYWwuaWxrOwo+ICsKPiAgCWlsa19jb21wdXRlX3dtX21heGltdW1z KGRldiwgMSwgY29uZmlnLCBJTlRFTF9EREJfUEFSVF8xXzIsICZtYXgpOwo+ICAJaWxrX3dtX21l cmdlKGRldiwgY29uZmlnLCAmbWF4LCAmbHBfd21fMV8yKTsKPiAgCj4gQEAgLTM2NDMsNyArMzY0 Nyw2IEBAIHN0YXRpYyB2b2lkIGlsa19wcm9ncmFtX3dhdGVybWFya3Moc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2KQo+ICAKPiAgc3RhdGljIHZvaWQgaWxrX3VwZGF0ZV93bShzdHJ1 Y3QgZHJtX2NydGMgKmNydGMpCj4gIHsKPiAtCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdiA9IHRvX2k5MTUoY3J0Yy0+ZGV2KTsKPiAgCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9j cnRjID0gdG9faW50ZWxfY3J0YyhjcnRjKTsKPiAgCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpj c3RhdGUgPSB0b19pbnRlbF9jcnRjX3N0YXRlKGNydGMtPnN0YXRlKTsKPiAgCj4gQEAgLTM2NjEs OSArMzY2NCw3IEBAIHN0YXRpYyB2b2lkIGlsa191cGRhdGVfd20oc3RydWN0IGRybV9jcnRjICpj cnRjKQo+ICAJCWludGVsX3dhaXRfZm9yX3ZibGFuayhjcnRjLT5kZXYsIGludGVsX2NydGMtPnBp cGUpOwo+ICAJfQo+ICAKPiAtCWludGVsX2NydGMtPndtLmFjdGl2ZS5pbGsgPSBjc3RhdGUtPndt Lm9wdGltYWwuaWxrOwo+IC0KPiAtCWlsa19wcm9ncmFtX3dhdGVybWFya3MoZGV2X3ByaXYpOwo+ ICsJaWxrX3Byb2dyYW1fd2F0ZXJtYXJrcyhjc3RhdGUpOwo+ICB9Cj4gIAo+ICBzdGF0aWMgdm9p ZCBza2xfcGlwZV93bV9hY3RpdmVfc3RhdGUodWludDMyX3QgdmFsLAo+IEBAIC02OTcxLDYgKzY5 NzIsNyBAQCB2b2lkIGludGVsX2luaXRfcG0oc3RydWN0IGRybV9kZXZpY2UgKmRldikKPiAgCQkg ICAgIGRldl9wcml2LT53bS5zcHJfbGF0ZW5jeVswXSAmJiBkZXZfcHJpdi0+d20uY3VyX2xhdGVu Y3lbMF0pKSB7Cj4gIAkJCWRldl9wcml2LT5kaXNwbGF5LnVwZGF0ZV93bSA9IGlsa191cGRhdGVf d207Cj4gIAkJCWRldl9wcml2LT5kaXNwbGF5LmNvbXB1dGVfcGlwZV93bSA9IGlsa19jb21wdXRl X3BpcGVfd207Cj4gKwkJCWRldl9wcml2LT5kaXNwbGF5LnByb2dyYW1fd2F0ZXJtYXJrcyA9IGls a19wcm9ncmFtX3dhdGVybWFya3M7Cj4gIAkJfSBlbHNlIHsKPiAgCQkJRFJNX0RFQlVHX0tNUygi RmFpbGVkIHRvIHJlYWQgZGlzcGxheSBwbGFuZSBsYXRlbmN5LiAiCj4gIAkJCQkgICAgICAiRGlz YWJsZSBDeFNSXG4iKTsKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9w Lm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwt Z2Z4Cg==