From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville Syrjala Subject: [PATCH 10/12] drm/i915: Drop the funky ilk wm setup Date: Wed, 10 Oct 2018 16:04:52 +0300 Message-ID: <20181010130454.28557-11-ville.syrjala@linux.intel.com> References: <20181010130454.28557-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 mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0F0E56E11D for ; Wed, 10 Oct 2018 13:10:14 +0000 (UTC) In-Reply-To: <20181010130454.28557-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 List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCkN1 cnJlbnRseSB3ZSB0cnkgdG8gZGlzYWJsZSB0aGUgd20gY29kZSBlbnRpcmVseSBmb3IgaWxrIGlm IHRoZSBCSU9TCmRvZXNuJ3QgcHJvdmlkZSBwcm9wZXIgbGF0ZW5jeSB2YWx1ZXMuIE5vdyB0aGF0 IHdlIGhhdmUgcmVhbCBmYWxsYmFja3MKaW4gcGxhY2Ugd2Ugc2hvdWxkIGJlIGFibGUgdG8gYWxh d3lzIHJlbHkgb24gdGhlIHdtIGNvZGUgaW5zdGVhZC4KClNpZ25lZC1vZmYtYnk6IFZpbGxlIFN5 cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgIDYgKystLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9wbS5jICAgICAgfCAyMCArKysrLS0tLS0tLS0tLS0tLS0tLQogMiBmaWxlcyBjaGFu Z2VkLCA2IGluc2VydGlvbnMoKyksIDIwIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rpc3BsYXkuYwppbmRleCBlYjMyNGE3ODRmOGYuLjM0OTNkYTdmMTAyYiAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtNTU5MCw4ICs1NTkwLDcgQEAgc3RhdGljIHZv aWQgaXJvbmxha2VfY3J0Y19lbmFibGUoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKnBpcGVfY29u ZmlnLAogCSAqLwogCWludGVsX2NvbG9yX2xvYWRfbHV0cygmcGlwZV9jb25maWctPmJhc2UpOwog Ci0JaWYgKGRldl9wcml2LT5kaXNwbGF5LmluaXRpYWxfd2F0ZXJtYXJrcyAhPSBOVUxMKQotCQlk ZXZfcHJpdi0+ZGlzcGxheS5pbml0aWFsX3dhdGVybWFya3Mob2xkX2ludGVsX3N0YXRlLCBwaXBl X2NvbmZpZyk7CisJZGV2X3ByaXYtPmRpc3BsYXkuaW5pdGlhbF93YXRlcm1hcmtzKG9sZF9pbnRl bF9zdGF0ZSwgcGlwZV9jb25maWcpOwogCWludGVsX2VuYWJsZV9waXBlKHBpcGVfY29uZmlnKTsK IAogCWlmIChwaXBlX2NvbmZpZy0+aGFzX3BjaF9lbmNvZGVyKQpAQCAtNTczOCw4ICs1NzM3LDcg QEAgc3RhdGljIHZvaWQgaGFzd2VsbF9jcnRjX2VuYWJsZShzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0 ZSAqcGlwZV9jb25maWcsCiAJaWYgKCF0cmFuc2NvZGVyX2lzX2RzaShjcHVfdHJhbnNjb2Rlcikp CiAJCWludGVsX2RkaV9lbmFibGVfdHJhbnNjb2Rlcl9mdW5jKHBpcGVfY29uZmlnKTsKIAotCWlm IChkZXZfcHJpdi0+ZGlzcGxheS5pbml0aWFsX3dhdGVybWFya3MgIT0gTlVMTCkKLQkJZGV2X3By aXYtPmRpc3BsYXkuaW5pdGlhbF93YXRlcm1hcmtzKG9sZF9pbnRlbF9zdGF0ZSwgcGlwZV9jb25m aWcpOworCWRldl9wcml2LT5kaXNwbGF5LmluaXRpYWxfd2F0ZXJtYXJrcyhvbGRfaW50ZWxfc3Rh dGUsIHBpcGVfY29uZmlnKTsKIAogCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDExKQogCQlp Y2xfcGlwZV9tYnVzX2VuYWJsZShpbnRlbF9jcnRjKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCmlu ZGV4IDYyMzM0ZTQxMzIyMC4uN2JkMjliYmE4MWMxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9wbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMK QEAgLTkzODksMjIgKzkzODksMTAgQEAgdm9pZCBpbnRlbF9pbml0X3BtKHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdikKIAkJZGV2X3ByaXYtPmRpc3BsYXkuY29tcHV0ZV9nbG9iYWxf d2F0ZXJtYXJrcyA9IHNrbF9jb21wdXRlX3dtOwogCX0gZWxzZSBpZiAoSEFTX1BDSF9TUExJVChk ZXZfcHJpdikpIHsKIAkJaWxrX3NldHVwX3dtX2xhdGVuY3koZGV2X3ByaXYpOwotCi0JCWlmICgo SVNfR0VONShkZXZfcHJpdikgJiYgZGV2X3ByaXYtPndtLnByaV9sYXRlbmN5WzFdICYmCi0JCSAg ICAgZGV2X3ByaXYtPndtLnNwcl9sYXRlbmN5WzFdICYmIGRldl9wcml2LT53bS5jdXJfbGF0ZW5j eVsxXSkgfHwKLQkJICAgICghSVNfR0VONShkZXZfcHJpdikgJiYgZGV2X3ByaXYtPndtLnByaV9s YXRlbmN5WzBdICYmCi0JCSAgICAgZGV2X3ByaXYtPndtLnNwcl9sYXRlbmN5WzBdICYmIGRldl9w cml2LT53bS5jdXJfbGF0ZW5jeVswXSkpIHsKLQkJCWRldl9wcml2LT5kaXNwbGF5LmNvbXB1dGVf cGlwZV93bSA9IGlsa19jb21wdXRlX3BpcGVfd207Ci0JCQlkZXZfcHJpdi0+ZGlzcGxheS5jb21w dXRlX2ludGVybWVkaWF0ZV93bSA9Ci0JCQkJaWxrX2NvbXB1dGVfaW50ZXJtZWRpYXRlX3dtOwot CQkJZGV2X3ByaXYtPmRpc3BsYXkuaW5pdGlhbF93YXRlcm1hcmtzID0KLQkJCQlpbGtfaW5pdGlh bF93YXRlcm1hcmtzOwotCQkJZGV2X3ByaXYtPmRpc3BsYXkub3B0aW1pemVfd2F0ZXJtYXJrcyA9 Ci0JCQkJaWxrX29wdGltaXplX3dhdGVybWFya3M7Ci0JCX0gZWxzZSB7Ci0JCQlEUk1fREVCVUdf S01TKCJGYWlsZWQgdG8gcmVhZCBkaXNwbGF5IHBsYW5lIGxhdGVuY3kuICIKLQkJCQkgICAgICAi RGlzYWJsZSBDeFNSXG4iKTsKLQkJfQorCQlkZXZfcHJpdi0+ZGlzcGxheS5jb21wdXRlX3BpcGVf d20gPSBpbGtfY29tcHV0ZV9waXBlX3dtOworCQlkZXZfcHJpdi0+ZGlzcGxheS5jb21wdXRlX2lu dGVybWVkaWF0ZV93bSA9IGlsa19jb21wdXRlX2ludGVybWVkaWF0ZV93bTsKKwkJZGV2X3ByaXYt PmRpc3BsYXkuaW5pdGlhbF93YXRlcm1hcmtzID0gaWxrX2luaXRpYWxfd2F0ZXJtYXJrczsKKwkJ ZGV2X3ByaXYtPmRpc3BsYXkub3B0aW1pemVfd2F0ZXJtYXJrcyA9IGlsa19vcHRpbWl6ZV93YXRl cm1hcmtzOwogCX0gZWxzZSBpZiAoSVNfVkFMTEVZVklFVyhkZXZfcHJpdikgfHwgSVNfQ0hFUlJZ VklFVyhkZXZfcHJpdikpIHsKIAkJdmx2X3NldHVwX3dtX2xhdGVuY3koZGV2X3ByaXYpOwogCQlk ZXZfcHJpdi0+ZGlzcGxheS5jb21wdXRlX3BpcGVfd20gPSB2bHZfY29tcHV0ZV9waXBlX3dtOwot LSAKMi4xOC4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcK aHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK