From: ville.syrjala@linux.intel.com Subject: [PATCH v2] drm/i915: Beef up the IPS vs. CRC workaround Date: Wed, 16 Aug 2017 17:39:02 +0300 Message-ID: <20170816143902.28641-1-ville.syrjala@linux.intel.com> References: <20161221093105.19120-1-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6DF276E4D1 for ; Wed, 16 Aug 2017 14:39:06 +0000 (UTC) In-Reply-To: <20161221093105.19120-1-ville.syrjala@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org Cc: Daniel Vetter , Paulo Zanoni List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCk9u ZXNob3QgZGlzYWJsaW5nIG9mIElQUyB3aGVuIENSQyBjYXB0dXJpbmcgaXMgc3RhcnRlZCBpcyBp bnN1ZmZpY2llbnQuCklQUyBtYXkgZ2V0IHJlLWVuYWJsZWQgYnkgYW55IHBsYW5lIHVwZGF0ZSwg YW5kIGhlbmNlIHRlc3RzIHRoYXQga2VlcApDUkMgY2FwdHVyaW5nIG9uIGFjcm9zcyBwbGFuZSB1 cGRhdGVzIHdpbGwgc3RhcnQgdG8gc2VlIGluY29uc2lzdGVudApyZXN1bHRzIGFzIHNvb24gYXMg SVBTIGtpY2tzIGJhY2sgaW4uIEFkZCBhIG5ldyBrbm9iIGludG8gdGhlIGNydGMgc3RhdGUKdG8g bWFrZSBzdXJlIElQUyBzdGF5cyBkaXNhYmxlZCBhcyBsb25nIGFzIENSQyBjYXB0dXJpbmcgaXMg ZW5hYmxlZC4KCkZvcmNpbmcgYSBtb2Rlc2V0IGlzIHRoZSBlYXNpZXN0IHdheSB0byBoYW5kbGUg dGhpcyBzaW5jZSB0aGF0J3MgYWxyZWFkeQpob3cgd2UgZG8gdGhlIHBhbmVsIGZpdHRlciB3b3Jr YXJvdW5kLiBJdCdzIGEgbGl0dGxlIGhlYXZ5IGhhbmRlZCBqdXN0CmZvciBJUFMsIGJ1dCBzZWVp bmcgYXMgd2UgbWlnaHQgYWxyZWFkeSBkbyB0aGUgcGFuZWwgZml0dGVyIHdvcmthcm91bmQKSSB0 aGluayBpdCdzIGJldHRlciB0byBmb2xsb3cgdGhhdC4gV2UgbWlndGggd2FudCB0byBvcHRpbWl6 ZSBib3RoIGNhc2VzCmxhdGVyIGlmIHNvbWVvbmUgZ2V0cyB0b28gdXBzZXQgYnkgdGhlIGV4dHJh IGRlbGF5IGZyb20gdGhlIG1vZGVzZXQuCgp2MjogQ2hlY2sgdGhlIHJpZ2h0IHRoaW5nIHdoZW4g ZGVjaWRpbmcgd2hldGhlciB0byBmb3JjZSBhIG1vZGVzZXQKCkNjOiBQYXVsbyBaYW5vbmkgPHBh dWxvLnIuemFub25pQGludGVsLmNvbT4KQ2M6IERhbmllbCBWZXR0ZXIgPGRhbmllbC52ZXR0ZXJA ZmZ3bGwuY2g+CkNjOiBNYWFydGVuIExhbmtob3JzdCA8bWFhcnRlbi5sYW5raG9yc3RAbGludXgu aW50ZWwuY29tPgpDYzogTWFydGEgTG9mc3RlZHQgPG1hcnRhLmxvZnN0ZWR0QGludGVsLmNvbT4K QnVnemlsbGE6IGh0dHBzOi8vYnVncy5mcmVlZGVza3RvcC5vcmcvc2hvd19idWcuY2dpP2lkPTEw MTY2NApSZXZpZXdlZC1ieTogUGF1bG8gWmFub25pIDxwYXVsby5yLnphbm9uaUBpbnRlbC5jb20+ ClNpZ25lZC1vZmYtYnk6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRl bC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jICB8ICA1ICsr Ky0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oICAgICAgfCAgMSArCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9waXBlX2NyYy5jIHwgNDMgKysrKysrKysrKysrKysrKysrKy0t LS0tLS0tLS0tLS0tLS0KIDMgZmlsZXMgY2hhbmdlZCwgMjggaW5zZXJ0aW9ucygrKSwgMjEgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxh eS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IGVmNWRkZTVh YjFjZi4uMWNlNDc5NjE0ZjUyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBA IC03MTg5LDYgKzcxODksNyBAQCBzdGF0aWMgdm9pZCBoc3dfY29tcHV0ZV9pcHNfY29uZmlnKHN0 cnVjdCBpbnRlbF9jcnRjICpjcnRjLAogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp diA9IHRvX2k5MTUoZGV2KTsKIAogCXBpcGVfY29uZmlnLT5pcHNfZW5hYmxlZCA9IGk5MTUuZW5h YmxlX2lwcyAmJgorCQkhcGlwZV9jb25maWctPmlwc19mb3JjZV9kaXNhYmxlICYmCiAJCWhzd19j cnRjX3N1cHBvcnRzX2lwcyhjcnRjKSAmJgogCQlwaXBlX2NvbmZpZ19zdXBwb3J0c19pcHMoZGV2 X3ByaXYsIHBpcGVfY29uZmlnKTsKIH0KQEAgLTEyOTU4LDcgKzEyOTU5LDcgQEAgY2xlYXJfaW50 ZWxfY3J0Y19zdGF0ZShzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSkKIAlzdHJ1 Y3QgaW50ZWxfY3J0Y19zY2FsZXJfc3RhdGUgc2NhbGVyX3N0YXRlOwogCXN0cnVjdCBpbnRlbF9k cGxsX2h3X3N0YXRlIGRwbGxfaHdfc3RhdGU7CiAJc3RydWN0IGludGVsX3NoYXJlZF9kcGxsICpz aGFyZWRfZHBsbDsKLQlib29sIGZvcmNlX3RocnU7CisJYm9vbCBmb3JjZV90aHJ1LCBpcHNfZm9y Y2VfZGlzYWJsZTsKIAogCS8qIEZJWE1FOiBiZWZvcmUgdGhlIHN3aXRjaCB0byBhdG9taWMgc3Rh cnRlZCwgYSBuZXcgcGlwZV9jb25maWcgd2FzCiAJICoga3phbGxvYydkLiBDb2RlIHRoYXQgZGVw ZW5kcyBvbiBhbnkgZmllbGQgYmVpbmcgemVybyBzaG91bGQgYmUKQEAgLTEyOTcwLDYgKzEyOTcx LDcgQEAgY2xlYXJfaW50ZWxfY3J0Y19zdGF0ZShzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0 Y19zdGF0ZSkKIAlzaGFyZWRfZHBsbCA9IGNydGNfc3RhdGUtPnNoYXJlZF9kcGxsOwogCWRwbGxf aHdfc3RhdGUgPSBjcnRjX3N0YXRlLT5kcGxsX2h3X3N0YXRlOwogCWZvcmNlX3RocnUgPSBjcnRj X3N0YXRlLT5wY2hfcGZpdC5mb3JjZV90aHJ1OworCWlwc19mb3JjZV9kaXNhYmxlID0gY3J0Y19z dGF0ZS0+aXBzX2ZvcmNlX2Rpc2FibGU7CiAKIAltZW1zZXQoY3J0Y19zdGF0ZSwgMCwgc2l6ZW9m ICpjcnRjX3N0YXRlKTsKIApAQCAtMTI5NzgsNiArMTI5ODAsNyBAQCBjbGVhcl9pbnRlbF9jcnRj X3N0YXRlKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlKQogCWNydGNfc3RhdGUt PnNoYXJlZF9kcGxsID0gc2hhcmVkX2RwbGw7CiAJY3J0Y19zdGF0ZS0+ZHBsbF9od19zdGF0ZSA9 IGRwbGxfaHdfc3RhdGU7CiAJY3J0Y19zdGF0ZS0+cGNoX3BmaXQuZm9yY2VfdGhydSA9IGZvcmNl X3RocnU7CisJY3J0Y19zdGF0ZS0+aXBzX2ZvcmNlX2Rpc2FibGUgPSBpcHNfZm9yY2VfZGlzYWJs ZTsKIH0KIAogc3RhdGljIGludApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAppbmRleCAwMjVlNGM4 YjNlNjMuLmNhZGJhOWI5MmNjOSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKQEAgLTY1MSw2 ICs2NTEsNyBAQCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSB7CiAJc3RydWN0IGludGVsX2xpbmtf bV9uIGZkaV9tX247CiAKIAlib29sIGlwc19lbmFibGVkOworCWJvb2wgaXBzX2ZvcmNlX2Rpc2Fi bGU7CiAKIAlib29sIGVuYWJsZV9mYmM7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX3BpcGVfY3JjLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9waXBlX2Ny Yy5jCmluZGV4IGVmMGMwZTE5NTE2NC4uNzQ3ODBiMDkwZDFlIDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9waXBlX2NyYy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3BpcGVfY3JjLmMKQEAgLTU0Nyw4ICs1NDcsOCBAQCBzdGF0aWMgaW50IGlsa19waXBl X2NyY19jdGxfcmVnKGVudW0gaW50ZWxfcGlwZV9jcmNfc291cmNlICpzb3VyY2UsCiAJcmV0dXJu IDA7CiB9CiAKLXN0YXRpYyB2b2lkIGhzd190cmFuc19lZHBfcGlwZV9BX2NyY193YShzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCi0JCQkJCWJvb2wgZW5hYmxlKQorc3RhdGljIHZv aWQgaHN3X3BpcGVfQV9jcmNfd2Eoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAor CQkJICAgICAgYm9vbCBlbmFibGUpCiB7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9ICZkZXZf cHJpdi0+ZHJtOwogCXN0cnVjdCBpbnRlbF9jcnRjICpjcnRjID0gaW50ZWxfZ2V0X2NydGNfZm9y X3BpcGUoZGV2X3ByaXYsIFBJUEVfQSk7CkBAIC01NzAsMTEgKzU3MCwyMyBAQCBzdGF0aWMgdm9p ZCBoc3dfdHJhbnNfZWRwX3BpcGVfQV9jcmNfd2Eoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2LAogCQlnb3RvIG91dDsKIAl9CiAKLQlwaXBlX2NvbmZpZy0+cGNoX3BmaXQuZm9yY2Vf dGhydSA9IGVuYWJsZTsKLQlpZiAocGlwZV9jb25maWctPmNwdV90cmFuc2NvZGVyID09IFRSQU5T Q09ERVJfRURQICYmCi0JICAgIHBpcGVfY29uZmlnLT5wY2hfcGZpdC5lbmFibGVkICE9IGVuYWJs ZSkKKwkvKgorCSAqIFdoZW4gSVBTIGdldHMgZW5hYmxlZCwgdGhlIHBpcGUgQ1JDIGNoYW5nZXMu IFNpbmNlIElQUyBnZXRzCisJICogZW5hYmxlZCBhbmQgZGlzYWJsZWQgZHluYW1pY2FsbHkgYmFz ZWQgb24gcGFja2FnZSBDIHN0YXRlcywKKwkgKiB1c2VyIHNwYWNlIGNhbid0IG1ha2UgcmVsaWFi bGUgdXNlIG9mIHRoZSBDUkNzLCBzbyBsZXQncyBqdXN0CisJICogY29tcGxldGVseSBkaXNhYmxl IGl0LgorCSAqLworCXBpcGVfY29uZmlnLT5pcHNfZm9yY2VfZGlzYWJsZSA9IGVuYWJsZTsKKwlp ZiAocGlwZV9jb25maWctPmlwc19lbmFibGVkID09IGVuYWJsZSkKIAkJcGlwZV9jb25maWctPmJh c2UuY29ubmVjdG9yc19jaGFuZ2VkID0gdHJ1ZTsKIAorCWlmIChJU19IQVNXRUxMKGRldl9wcml2 KSkgeworCQlwaXBlX2NvbmZpZy0+cGNoX3BmaXQuZm9yY2VfdGhydSA9IGVuYWJsZTsKKwkJaWYg KHBpcGVfY29uZmlnLT5jcHVfdHJhbnNjb2RlciA9PSBUUkFOU0NPREVSX0VEUCAmJgorCQkgICAg cGlwZV9jb25maWctPnBjaF9wZml0LmVuYWJsZWQgIT0gZW5hYmxlKQorCQkJcGlwZV9jb25maWct PmJhc2UuY29ubmVjdG9yc19jaGFuZ2VkID0gdHJ1ZTsKKwl9CisKIAlyZXQgPSBkcm1fYXRvbWlj X2NvbW1pdChzdGF0ZSk7CiBvdXQ6CiAJV0FSTihyZXQsICJUb2dnbGluZyB3b3JrYXJvdW5kIHRv ICVpIHJldHVybnMgJWlcbiIsIGVuYWJsZSwgcmV0KTsKQEAgLTU5OCw4ICs2MTAsOSBAQCBzdGF0 aWMgaW50IGl2Yl9waXBlX2NyY19jdGxfcmVnKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdiwKIAkJKnZhbCA9IFBJUEVfQ1JDX0VOQUJMRSB8IFBJUEVfQ1JDX1NPVVJDRV9TUFJJVEVf SVZCOwogCQlicmVhazsKIAljYXNlIElOVEVMX1BJUEVfQ1JDX1NPVVJDRV9QRjoKLQkJaWYgKElT X0hBU1dFTEwoZGV2X3ByaXYpICYmIHBpcGUgPT0gUElQRV9BKQotCQkJaHN3X3RyYW5zX2VkcF9w aXBlX0FfY3JjX3dhKGRldl9wcml2LCB0cnVlKTsKKwkJaWYgKChJU19IQVNXRUxMKGRldl9wcml2 KSB8fAorCQkgICAgIElTX0JST0FEV0VMTChkZXZfcHJpdikpICYmIHBpcGUgPT0gUElQRV9BKQor CQkJaHN3X3BpcGVfQV9jcmNfd2EoZGV2X3ByaXYsIHRydWUpOwogCiAJCSp2YWwgPSBQSVBFX0NS Q19FTkFCTEUgfCBQSVBFX0NSQ19TT1VSQ0VfUEZfSVZCOwogCQlicmVhazsKQEAgLTYxOCw3ICs2 MzEsNiBAQCBzdGF0aWMgaW50IHBpcGVfY3JjX3NldF9zb3VyY2Uoc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2LAogCQkJICAgICAgIGVudW0gaW50ZWxfcGlwZV9jcmNfc291cmNlIHNv dXJjZSkKIHsKIAlzdHJ1Y3QgaW50ZWxfcGlwZV9jcmMgKnBpcGVfY3JjID0gJmRldl9wcml2LT5w aXBlX2NyY1twaXBlXTsKLQlzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YyA9IGludGVsX2dldF9jcnRj X2Zvcl9waXBlKGRldl9wcml2LCBwaXBlKTsKIAllbnVtIGludGVsX2Rpc3BsYXlfcG93ZXJfZG9t YWluIHBvd2VyX2RvbWFpbjsKIAl1MzIgdmFsID0gMDsgLyogc2h1dCB1cCBnY2MgKi8KIAlpbnQg cmV0OwpAQCAtNjY1LDE0ICs2NzcsNiBAQCBzdGF0aWMgaW50IHBpcGVfY3JjX3NldF9zb3VyY2Uo c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQkJZ290byBvdXQ7CiAJCX0KIAot CQkvKgotCQkgKiBXaGVuIElQUyBnZXRzIGVuYWJsZWQsIHRoZSBwaXBlIENSQyBjaGFuZ2VzLiBT aW5jZSBJUFMgZ2V0cwotCQkgKiBlbmFibGVkIGFuZCBkaXNhYmxlZCBkeW5hbWljYWxseSBiYXNl ZCBvbiBwYWNrYWdlIEMgc3RhdGVzLAotCQkgKiB1c2VyIHNwYWNlIGNhbid0IG1ha2UgcmVsaWFi bGUgdXNlIG9mIHRoZSBDUkNzLCBzbyBsZXQncyBqdXN0Ci0JCSAqIGNvbXBsZXRlbHkgZGlzYWJs ZSBpdC4KLQkJICovCi0JCWhzd19kaXNhYmxlX2lwcyhjcnRjKTsKLQogCQlzcGluX2xvY2tfaXJx KCZwaXBlX2NyYy0+bG9jayk7CiAJCWtmcmVlKHBpcGVfY3JjLT5lbnRyaWVzKTsKIAkJcGlwZV9j cmMtPmVudHJpZXMgPSBlbnRyaWVzOwpAQCAtNzEzLDEwICs3MTcsOSBAQCBzdGF0aWMgaW50IHBp cGVfY3JjX3NldF9zb3VyY2Uoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQkJ ZzR4X3VuZG9fcGlwZV9zY3JhbWJsZV9yZXNldChkZXZfcHJpdiwgcGlwZSk7CiAJCWVsc2UgaWYg KElTX1ZBTExFWVZJRVcoZGV2X3ByaXYpIHx8IElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpKQogCQkJ dmx2X3VuZG9fcGlwZV9zY3JhbWJsZV9yZXNldChkZXZfcHJpdiwgcGlwZSk7Ci0JCWVsc2UgaWYg KElTX0hBU1dFTEwoZGV2X3ByaXYpICYmIHBpcGUgPT0gUElQRV9BKQotCQkJaHN3X3RyYW5zX2Vk cF9waXBlX0FfY3JjX3dhKGRldl9wcml2LCBmYWxzZSk7Ci0KLQkJaHN3X2VuYWJsZV9pcHMoY3J0 Yyk7CisJCWVsc2UgaWYgKChJU19IQVNXRUxMKGRldl9wcml2KSB8fAorCQkJICBJU19CUk9BRFdF TEwoZGV2X3ByaXYpKSAmJiBwaXBlID09IFBJUEVfQSkKKwkJCWhzd19waXBlX0FfY3JjX3dhKGRl dl9wcml2LCBmYWxzZSk7CiAJfQogCiAJcmV0ID0gMDsKLS0gCjIuMTMuMAoKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlz dApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0 b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==