From: Maarten Lankhorst Subject: [PATCH 1/8] drm/i915/skl+: Prepare for removing data rate from skl watermark state Date: Wed, 12 Oct 2016 15:28:14 +0200 Message-ID: <1476278901-15750-2-git-send-email-maarten.lankhorst@linux.intel.com> References: <1476278901-15750-1-git-send-email-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mblankhorst.nl (mblankhorst.nl [IPv6:2a02:2308::216:3eff:fe92:dfa3]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7B8E06E84B for ; Wed, 12 Oct 2016 13:28:26 +0000 (UTC) In-Reply-To: <1476278901-15750-1-git-send-email-maarten.lankhorst@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 Q2FjaGluZyBpcyBub3QgcmVxdWlyZWQsIGRybV9hdG9taWNfY3J0Y19zdGF0ZV9mb3JfZWFjaF9w bGFuZV9zdGF0ZQpjYW4gYmUgdXNlZCB0byBpbnNwZWN0IGFsbCBwbGFuZV9zdGF0ZXMgdGhhdCBh cmUgYXNzaWduZWQgdG8gdGhlCmN1cnJlbnQgY3J0Y19zdGF0ZSwgc28gd2UgY2FuIGp1c3QgcmVj YWxjdWxhdGUgZXZlcnkgdGltZS4KClNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxt YWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfcG0uYyB8IDI3ICsrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNo YW5nZWQsIDEyIGluc2VydGlvbnMoKyksIDE1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9wbS5jCmluZGV4IDZhZjE1ODdlOWQ4NC4uYjk2YTg5OWM4OTlkIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3BtLmMKQEAgLTMxLDYgKzMxLDcgQEAKICNpbmNsdWRlICJpbnRlbF9kcnYuaCIKICNpbmNs dWRlICIuLi8uLi8uLi9wbGF0Zm9ybS94ODYvaW50ZWxfaXBzLmgiCiAjaW5jbHVkZSA8bGludXgv bW9kdWxlLmg+CisjaW5jbHVkZSA8ZHJtL2RybV9hdG9taWNfaGVscGVyLmg+CiAKIC8qKgogICog RE9DOiBSQzYKQEAgLTMyNDIsMTggKzMyNDMsMTcgQEAgc2tsX2dldF90b3RhbF9yZWxhdGl2ZV9k YXRhX3JhdGUoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmludGVsX2NzdGF0ZSkKIAlzdHJ1Y3Qg ZHJtX2NydGMgKmNydGMgPSBjc3RhdGUtPmNydGM7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9 IGNydGMtPmRldjsKIAlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2Ny dGMoY3J0Yyk7Ci0JY29uc3Qgc3RydWN0IGRybV9wbGFuZSAqcGxhbmU7CisJc3RydWN0IGRybV9w bGFuZSAqcGxhbmU7CiAJY29uc3Qgc3RydWN0IGludGVsX3BsYW5lICppbnRlbF9wbGFuZTsKLQlz dHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpwc3RhdGU7CisJY29uc3Qgc3RydWN0IGRybV9wbGFuZV9z dGF0ZSAqcHN0YXRlOwogCXVuc2lnbmVkIGludCByYXRlLCB0b3RhbF9kYXRhX3JhdGUgPSAwOwog CWludCBpZDsKLQlpbnQgaTsKIAogCWlmIChXQVJOX09OKCFzdGF0ZSkpCiAJCXJldHVybiAwOwog CiAJLyogQ2FsY3VsYXRlIGFuZCBjYWNoZSBkYXRhIHJhdGUgZm9yIGVhY2ggcGxhbmUgKi8KLQlm b3JfZWFjaF9wbGFuZV9pbl9zdGF0ZShzdGF0ZSwgcGxhbmUsIHBzdGF0ZSwgaSkgeworCWRybV9h dG9taWNfY3J0Y19zdGF0ZV9mb3JfZWFjaF9wbGFuZV9zdGF0ZShwbGFuZSwgcHN0YXRlLCBjc3Rh dGUpIHsKIAkJaWQgPSBza2xfd21fcGxhbmVfaWQodG9faW50ZWxfcGxhbmUocGxhbmUpKTsKIAkJ aW50ZWxfcGxhbmUgPSB0b19pbnRlbF9wbGFuZShwbGFuZSk7CiAKQEAgLTMzNTYsNyArMzM1Niw3 IEBAIHNrbF9hbGxvY2F0ZV9waXBlX2RkYihzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRl LAogCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjKTsK IAlzdHJ1Y3QgaW50ZWxfcGxhbmUgKmludGVsX3BsYW5lOwogCXN0cnVjdCBkcm1fcGxhbmUgKnBs YW5lOwotCXN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgKnBzdGF0ZTsKKwljb25zdCBzdHJ1Y3QgZHJt X3BsYW5lX3N0YXRlICpwc3RhdGU7CiAJZW51bSBwaXBlIHBpcGUgPSBpbnRlbF9jcnRjLT5waXBl OwogCXN0cnVjdCBza2xfZGRiX2VudHJ5ICphbGxvYyA9ICZjc3RhdGUtPndtLnNrbC5kZGI7CiAJ dWludDE2X3QgYWxsb2Nfc2l6ZSwgc3RhcnQsIGN1cnNvcl9ibG9ja3M7CkBAIC0zMzkyLDE0ICsz MzkyLDE0IEBAIHNrbF9hbGxvY2F0ZV9waXBlX2RkYihzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAq Y3N0YXRlLAogCWFsbG9jX3NpemUgLT0gY3Vyc29yX2Jsb2NrczsKIAogCS8qIDEuIEFsbG9jYXRl IHRoZSBtaW5pbnVtIHJlcXVpcmVkIGJsb2NrcyBmb3IgZWFjaCBhY3RpdmUgcGxhbmUgKi8KLQlm b3JfZWFjaF9wbGFuZV9pbl9zdGF0ZShzdGF0ZSwgcGxhbmUsIHBzdGF0ZSwgaSkgeworCWRybV9h dG9taWNfY3J0Y19zdGF0ZV9mb3JfZWFjaF9wbGFuZV9zdGF0ZShwbGFuZSwgcHN0YXRlLCAmY3N0 YXRlLT5iYXNlKSB7CiAJCWludGVsX3BsYW5lID0gdG9faW50ZWxfcGxhbmUocGxhbmUpOwogCQlp ZCA9IHNrbF93bV9wbGFuZV9pZChpbnRlbF9wbGFuZSk7CiAKIAkJaWYgKGludGVsX3BsYW5lLT5w aXBlICE9IHBpcGUpCiAJCQljb250aW51ZTsKIAotCQlpZiAoIXRvX2ludGVsX3BsYW5lX3N0YXRl KHBzdGF0ZSktPmJhc2UudmlzaWJsZSkgeworCQlpZiAoIXBzdGF0ZS0+dmlzaWJsZSkgewogCQkJ bWluaW11bVtpZF0gPSAwOwogCQkJeV9taW5pbXVtW2lkXSA9IDA7CiAJCQljb250aW51ZTsKQEAg LTM5NDgsNyArMzk0OCw3IEBAIHNrbF9kZGJfYWRkX2FmZmVjdGVkX3BsYW5lcyhzdHJ1Y3QgaW50 ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlKQogCiAJV0FSTl9PTighZHJtX2F0b21pY19nZXRfZXhpc3Rp bmdfY3J0Y19zdGF0ZShzdGF0ZSwgY3J0YykpOwogCi0JZHJtX2Zvcl9lYWNoX3BsYW5lX21hc2so cGxhbmUsIGRldiwgY3J0Yy0+c3RhdGUtPnBsYW5lX21hc2spIHsKKwlkcm1fZm9yX2VhY2hfcGxh bmVfbWFzayhwbGFuZSwgZGV2LCBjc3RhdGUtPmJhc2UucGxhbmVfbWFzaykgewogCQlpZCA9IHNr bF93bV9wbGFuZV9pZCh0b19pbnRlbF9wbGFuZShwbGFuZSkpOwogCiAJCWlmIChza2xfZGRiX2Vu dHJ5X2VxdWFsKCZjdXJfZGRiLT5wbGFuZVtwaXBlXVtpZF0sCkBAIC00MDYzLDE0ICs0MDYzLDEy IEBAIHNrbF9wcmludF93bV9jaGFuZ2VzKGNvbnN0IHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpz dGF0ZSkKIAkJdG9faW50ZWxfYXRvbWljX3N0YXRlKHN0YXRlKTsKIAljb25zdCBzdHJ1Y3QgZHJt X2NydGMgKmNydGM7CiAJY29uc3Qgc3RydWN0IGRybV9jcnRjX3N0YXRlICpjc3RhdGU7Ci0JY29u c3Qgc3RydWN0IGRybV9wbGFuZSAqcGxhbmU7CiAJY29uc3Qgc3RydWN0IGludGVsX3BsYW5lICpp bnRlbF9wbGFuZTsKLQljb25zdCBzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpwc3RhdGU7CiAJY29u c3Qgc3RydWN0IHNrbF9kZGJfYWxsb2NhdGlvbiAqb2xkX2RkYiA9ICZkZXZfcHJpdi0+d20uc2ts X2h3LmRkYjsKIAljb25zdCBzdHJ1Y3Qgc2tsX2RkYl9hbGxvY2F0aW9uICpuZXdfZGRiID0gJmlu dGVsX3N0YXRlLT53bV9yZXN1bHRzLmRkYjsKIAllbnVtIHBpcGUgcGlwZTsKIAlpbnQgaWQ7Ci0J aW50IGksIGo7CisJaW50IGk7CiAKIAlmb3JfZWFjaF9jcnRjX2luX3N0YXRlKHN0YXRlLCBjcnRj LCBjc3RhdGUsIGkpIHsKIAkJaWYgKCFjcnRjLT5zdGF0ZSkKQEAgLTQwNzgsMTAgKzQwNzYsOSBA QCBza2xfcHJpbnRfd21fY2hhbmdlcyhjb25zdCBzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3Rh dGUpCiAKIAkJcGlwZSA9IHRvX2ludGVsX2NydGMoY3J0YyktPnBpcGU7CiAKLQkJZm9yX2VhY2hf cGxhbmVfaW5fc3RhdGUoc3RhdGUsIHBsYW5lLCBwc3RhdGUsIGopIHsKKwkJZm9yX2VhY2hfaW50 ZWxfcGxhbmVfb25fY3J0YyhkZXYsIHRvX2ludGVsX2NydGMoY3J0YyksIGludGVsX3BsYW5lKSB7 CiAJCQljb25zdCBzdHJ1Y3Qgc2tsX2RkYl9lbnRyeSAqb2xkLCAqbmV3OwogCi0JCQlpbnRlbF9w bGFuZSA9IHRvX2ludGVsX3BsYW5lKHBsYW5lKTsKIAkJCWlkID0gc2tsX3dtX3BsYW5lX2lkKGlu dGVsX3BsYW5lKTsKIAkJCW9sZCA9ICZvbGRfZGRiLT5wbGFuZVtwaXBlXVtpZF07CiAJCQluZXcg PSAmbmV3X2RkYi0+cGxhbmVbcGlwZV1baWRdOwpAQCAtNDA5NCwxMyArNDA5MSwxMyBAQCBza2xf cHJpbnRfd21fY2hhbmdlcyhjb25zdCBzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUpCiAK IAkJCWlmIChpZCAhPSBQTEFORV9DVVJTT1IpIHsKIAkJCQlEUk1fREVCVUdfQVRPTUlDKCJbUExB TkU6JWQ6cGxhbmUgJWQlY10gZGRiICglZCAtICVkKSAtPiAoJWQgLSAlZClcbiIsCi0JCQkJCQkg cGxhbmUtPmJhc2UuaWQsIGlkICsgMSwKKwkJCQkJCSBpbnRlbF9wbGFuZS0+YmFzZS5iYXNlLmlk LCBpZCArIDEsCiAJCQkJCQkgcGlwZV9uYW1lKHBpcGUpLAogCQkJCQkJIG9sZC0+c3RhcnQsIG9s ZC0+ZW5kLAogCQkJCQkJIG5ldy0+c3RhcnQsIG5ldy0+ZW5kKTsKIAkJCX0gZWxzZSB7CiAJCQkJ RFJNX0RFQlVHX0FUT01JQygiW1BMQU5FOiVkOmN1cnNvciAlY10gZGRiICglZCAtICVkKSAtPiAo JWQgLSAlZClcbiIsCi0JCQkJCQkgcGxhbmUtPmJhc2UuaWQsCisJCQkJCQkgaW50ZWxfcGxhbmUt PmJhc2UuYmFzZS5pZCwKIAkJCQkJCSBwaXBlX25hbWUocGlwZSksCiAJCQkJCQkgb2xkLT5zdGFy dCwgb2xkLT5lbmQsCiAJCQkJCQkgbmV3LT5zdGFydCwgbmV3LT5lbmQpOwotLSAKMi43LjQKCl9f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBt YWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3Rz LmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=