From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH AUTOSEL 4.14 49/95] drm/i915: Disable LP3 watermarks on all SNB machines Date: Tue, 7 May 2019 01:37:38 -0400 Message-ID: <20190507053826.31622-49-sashal@kernel.org> References: <20190507053826.31622-1-sashal@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20190507053826.31622-1-sashal@kernel.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sasha Levin , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClsg VXBzdHJlYW0gY29tbWl0IDAzOTgxYzZlYmVjNGZjNzA1NmI5YjQ1Zjg0NzM5M2FlYWM5MGQwNjAg XQoKSSBoYXZlIGEgVGhpbmtwYWQgWDIyMCBUYWJsZXQgaW4gbXkgaGFuZHMgdGhhdCBpcyBsb3Np bmcgdmJsYW5rCmludGVycnVwdHMgd2hlbmV2ZXIgTFAzIHdhdGVybWFya3MgYXJlIHVzZWQuCgpJ ZiBJIG51ZGdlIHRoZSBsYXRlbmN5IHZhbHVlIHdyaXR0ZW4gdG8gdGhlIFdNMyByZWdpc3RlciBq dXN0CmJ5IG9uZSBpbiBlaXRoZXIgZGlyZWN0aW9uIHRoZSBwcm9ibGVtIGRpc2FwcGVhcnMuIFRo YXQgdG8gbWUKc3VnZ2VzdHMgdGhhdCB0aGUgcHVuaXQgd2lsbCBub3QgZW50ZXIgdGhlIGNvcnJz cG9uZGluZwpwb3dlcnNhdmUgbW9kZSAoTVBMTCBzaHV0ZG93biBJSVJDKSB1bmxlc3MgdGhlIGxh dGVuY3kgdmFsdWUKaW4gdGhlIHJlZ2lzdGVyIG1hdGNoZXMgZXhhY3RseSB3aGF0IHdlIHJlYWQg ZnJvbSBTU0tQRC4gSWUuCml0J3Mgbm90IHJlYWxseSBhIGxhdGVuY3kgdmFsdWUgYnV0IHJhdGhl ciBqdXN0IGEgY29va2llCmJ5IHdoaWNoIHRoZSBwdW5pdCBjYW4gaWRlbnRpZnkgdGhlIGRlc2ly ZWQgcG93ZXIgc2F2aW5nIHN0YXRlLgpPbiBIU1cvQkRXIHRoaXMgd2FzIGNoYW5nZWQgc3VjaCB0 aGF0IHdlIGFjdHVhbGx5IGp1c3Qgd3JpdGUKdGhlIFdNIGxldmVsIG51bWJlciBpbnRvIHRob3Nl IGJpdHMsIHdoaWNoIG1ha2VzIG11Y2ggbW9yZQpzZW5zZSBnaXZlbiB0aGUgb2JzZXJ2ZWQgYmVo YXZpb3VyLgoKV2UgY291bGQgdHJ5IHRvIGhhbmRsZSB0aGlzIGJ5IGRpc2FsbG93aW5nIExQMyB3 YXRlcm1hcmtzCm9ubHkgd2hlbiB2YmxhbmsgaW50ZXJydXB0cyBhcmUgZW5hYmxlZCBidXQgd2Un ZCBmaXJzdCBoYXZlCnRvIHByb3ZlIHRoYXQgb25seSB2YmxhbmsgaW50ZXJydXB0cyBhcmUgYWZm ZWN0ZWQsIHdoaWNoCnNlZW1zIHVubGlrZWx5LiBBbHNvIHdlIGNhbid0IGdyYWIgdGhlIHdtIG11 dGV4IGZyb20gdGhlCnZibGFuayBlbmFibGUvZGlzYWJsZSBob29rcyBiZWNhdXNlIHRob3NlIGFy ZSBjYWxsZWQgd2l0aAp2YXJpb3VzIHNwaW5sb2NrcyBoZWxkLiBUaHVzIHdlJ2QgaGF2ZSB0byBy ZWRlc2lnbmUgdGhlCndhdGVybWFyayBsb2NraW5nLiBTbyB0byBwbGF5IGl0IHNhZmUgYW5kIGtl ZXAgdGhlIGNvZGUKc2ltcGxlIHdlIHNpbXBseSBkaXNhYmxlIExQMyB3YXRlcm1hcmtzIG9uIGFs bCBTTkIgbWFjaGluZXMuCgpUbyBkbyB0aGF0IHdlIHNpbXBseSB6ZXJvIG91dCB0aGUgbGF0ZW5j eSB2YWx1ZXMgZm9yCndhdGVybWFyayBsZXZlbCAzLCBhbmQgd2UgYWRqdXN0IHRoZSB3YXRlcm1h cmsgY29tcHV0YXRpb24KdG8gY2hlY2sgZm9yIHRoYXQuIFRoZSBiZWhhdmlvdXIgbm93IG1hdGNo ZXMgdGhhdCBvZiB0aGUKZzR4L3Zsdi9za2wgd20gY29kZSBpbiB0aGUgcHJlc2VuY2Ugb2YgYSB6 ZXJvZWQgbGF0ZW5jeQp2YWx1ZS4KCnYyOiBzL1VTSFJUX01BWC9VMzJfTUFYLyBmb3IgY29uc2lz dGVuY3kgd2l0aCB0aGUgdHlwZXMgKENocmlzKQoKQ2M6IHN0YWJsZUB2Z2VyLmtlcm5lbC5vcmcK Q2M6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgpBY2tlZC1ieTogQ2hy aXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+CkJ1Z3ppbGxhOiBodHRwczovL2J1 Z3MuZnJlZWRlc2t0b3Aub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDEyNjkKQnVnemlsbGE6IGh0dHBz Oi8vYnVncy5mcmVlZGVza3RvcC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMzcxMwpTaWduZWQtb2Zm LWJ5OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tPgpMaW5r OiBodHRwczovL3BhdGNod29yay5mcmVlZGVza3RvcC5vcmcvcGF0Y2gvbXNnaWQvMjAxODExMTQx NzM0NDAuNjczMC0xLXZpbGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tClNpZ25lZC1vZmYtYnk6 IFNhc2hhIExldmluIDxhbGV4YW5kZXIubGV2aW5AbWljcm9zb2Z0LmNvbT4KLS0tCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jIHwgNDEgKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKystCiAxIGZpbGUgY2hhbmdlZCwgNDAgaW5zZXJ0aW9ucygrKSwgMSBkZWxldGlvbigtKQoK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9wbS5jCmluZGV4IDg3Y2NjYjVmOGM1ZC4uOTZhNTIzNzc0MWUwIDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3BtLmMKQEAgLTI0NzEsNiArMjQ3MSw5IEBAIHN0YXRpYyB1aW50 MzJfdCBpbGtfY29tcHV0ZV9wcmlfd20oY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNz dGF0ZSwKIAl1aW50MzJfdCBtZXRob2QxLCBtZXRob2QyOwogCWludCBjcHA7CiAKKwlpZiAobWVt X3ZhbHVlID09IDApCisJCXJldHVybiBVMzJfTUFYOworCiAJaWYgKCFpbnRlbF93bV9wbGFuZV92 aXNpYmxlKGNzdGF0ZSwgcHN0YXRlKSkKIAkJcmV0dXJuIDA7CiAKQEAgLTI1MDAsNiArMjUwMyw5 IEBAIHN0YXRpYyB1aW50MzJfdCBpbGtfY29tcHV0ZV9zcHJfd20oY29uc3Qgc3RydWN0IGludGVs X2NydGNfc3RhdGUgKmNzdGF0ZSwKIAl1aW50MzJfdCBtZXRob2QxLCBtZXRob2QyOwogCWludCBj cHA7CiAKKwlpZiAobWVtX3ZhbHVlID09IDApCisJCXJldHVybiBVMzJfTUFYOworCiAJaWYgKCFp bnRlbF93bV9wbGFuZV92aXNpYmxlKGNzdGF0ZSwgcHN0YXRlKSkKIAkJcmV0dXJuIDA7CiAKQEAg LTI1MjMsNiArMjUyOSw5IEBAIHN0YXRpYyB1aW50MzJfdCBpbGtfY29tcHV0ZV9jdXJfd20oY29u c3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSwKIHsKIAlpbnQgY3BwOwogCisJaWYg KG1lbV92YWx1ZSA9PSAwKQorCQlyZXR1cm4gVTMyX01BWDsKKwogCWlmICghaW50ZWxfd21fcGxh bmVfdmlzaWJsZShjc3RhdGUsIHBzdGF0ZSkpCiAJCXJldHVybiAwOwogCkBAIC0yOTgxLDYgKzI5 OTAsMzQgQEAgc3RhdGljIHZvaWQgc25iX3dtX2xhdGVuY3lfcXVpcmsoc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2KQogCWludGVsX3ByaW50X3dtX2xhdGVuY3koZGV2X3ByaXYsICJD dXJzb3IiLCBkZXZfcHJpdi0+d20uY3VyX2xhdGVuY3kpOwogfQogCitzdGF0aWMgdm9pZCBzbmJf d21fbHAzX2lycV9xdWlyayhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCit7CisJ LyoKKwkgKiBPbiBzb21lIFNOQiBtYWNoaW5lcyAoVGhpbmtwYWQgWDIyMCBUYWJsZXQgYXQgbGVh c3QpCisJICogTFAzIHVzYWdlIGNhbiBjYXVzZSB2YmxhbmsgaW50ZXJydXB0cyB0byBiZSBsb3N0 LgorCSAqIFRoZSBERUlJUiBiaXQgd2lsbCBnbyBoaWdoIGJ1dCBpdCBsb29rcyBsaWtlIHRoZSBD UFUKKwkgKiBuZXZlciBnZXRzIGludGVycnVwdGVkLgorCSAqCisJICogSXQncyBub3QgY2xlYXIg d2hldGhlciBvdGhlciBpbnRlcnJ1cHQgc291cmNlIGNvdWxkCisJICogYmUgYWZmZWN0ZWQgb3Ig aWYgdGhpcyBpcyBzb21laG93IGxpbWl0ZWQgdG8gdmJsYW5rCisJICogaW50ZXJydXB0cyBvbmx5 LiBUbyBwbGF5IGl0IHNhZmUgd2UgZGlzYWJsZSBMUDMKKwkgKiB3YXRlcm1hcmtzIGVudGlyZWx5 LgorCSAqLworCWlmIChkZXZfcHJpdi0+d20ucHJpX2xhdGVuY3lbM10gPT0gMCAmJgorCSAgICBk ZXZfcHJpdi0+d20uc3ByX2xhdGVuY3lbM10gPT0gMCAmJgorCSAgICBkZXZfcHJpdi0+d20uY3Vy X2xhdGVuY3lbM10gPT0gMCkKKwkJcmV0dXJuOworCisJZGV2X3ByaXYtPndtLnByaV9sYXRlbmN5 WzNdID0gMDsKKwlkZXZfcHJpdi0+d20uc3ByX2xhdGVuY3lbM10gPSAwOworCWRldl9wcml2LT53 bS5jdXJfbGF0ZW5jeVszXSA9IDA7CisKKwlEUk1fREVCVUdfS01TKCJMUDMgd2F0ZXJtYXJrcyBk aXNhYmxlZCBkdWUgdG8gcG90ZW50aWFsIGZvciBsb3N0IGludGVycnVwdHNcbiIpOworCWludGVs X3ByaW50X3dtX2xhdGVuY3koZGV2X3ByaXYsICJQcmltYXJ5IiwgZGV2X3ByaXYtPndtLnByaV9s YXRlbmN5KTsKKwlpbnRlbF9wcmludF93bV9sYXRlbmN5KGRldl9wcml2LCAiU3ByaXRlIiwgZGV2 X3ByaXYtPndtLnNwcl9sYXRlbmN5KTsKKwlpbnRlbF9wcmludF93bV9sYXRlbmN5KGRldl9wcml2 LCAiQ3Vyc29yIiwgZGV2X3ByaXYtPndtLmN1cl9sYXRlbmN5KTsKK30KKwogc3RhdGljIHZvaWQg aWxrX3NldHVwX3dtX2xhdGVuY3koc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQog ewogCWludGVsX3JlYWRfd21fbGF0ZW5jeShkZXZfcHJpdiwgZGV2X3ByaXYtPndtLnByaV9sYXRl bmN5KTsKQEAgLTI5OTcsOCArMzAzNCwxMCBAQCBzdGF0aWMgdm9pZCBpbGtfc2V0dXBfd21fbGF0 ZW5jeShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJaW50ZWxfcHJpbnRfd21f bGF0ZW5jeShkZXZfcHJpdiwgIlNwcml0ZSIsIGRldl9wcml2LT53bS5zcHJfbGF0ZW5jeSk7CiAJ aW50ZWxfcHJpbnRfd21fbGF0ZW5jeShkZXZfcHJpdiwgIkN1cnNvciIsIGRldl9wcml2LT53bS5j dXJfbGF0ZW5jeSk7CiAKLQlpZiAoSVNfR0VONihkZXZfcHJpdikpCisJaWYgKElTX0dFTjYoZGV2 X3ByaXYpKSB7CiAJCXNuYl93bV9sYXRlbmN5X3F1aXJrKGRldl9wcml2KTsKKwkJc25iX3dtX2xw M19pcnFfcXVpcmsoZGV2X3ByaXYpOworCX0KIH0KIAogc3RhdGljIHZvaWQgc2tsX3NldHVwX3dt X2xhdGVuY3koc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQotLSAKMi4yMC4xCgpf X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwg bWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWw=