From: Maarten Lankhorst Subject: [PATCH v2 04/11] drm/i915/skl+: Remove data_rate from watermark struct, v2. Date: Wed, 26 Oct 2016 15:41:32 +0200 Message-ID: <1477489299-25777-5-git-send-email-maarten.lankhorst@linux.intel.com> References: <1477489299-25777-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 F0F876E02D for ; Wed, 26 Oct 2016 13:41:58 +0000 (UTC) In-Reply-To: <1477489299-25777-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 Cc: Paulo Zanoni List-Id: intel-gfx@lists.freedesktop.org SXQncyBvbmx5IHVzZWQgaW4gb25lIGZ1bmN0aW9uLCBhbmQgY2FuIGJlIGNhbGN1bGF0ZWQgd2l0 aG91dCBjYWNoaW5nIGl0CmluIHRoZSBnbG9iYWwgc3RydWN0IGJ5IHVzaW5nIGRybV9hdG9taWNf Y3J0Y19zdGF0ZV9mb3JfZWFjaF9wbGFuZV9zdGF0ZS4KClRoZXJlIGFyZSBsb29wcyBvdmVyIGFs bCBwbGFuZXMsIGluY2x1ZGluZyBwbGFuZXMgdGhhdCBkb24ndCBleGlzdC4KVGhpcyBpcyBoYXJt bGVzcywgYmVjYXVzZSBkYXRhX3JhdGUgd2lsbCBhbHdheXMgYmUgMCBmb3IgdGhlbSBhbmQgd2UK bmV2ZXIgcHJvZ3JhbSB0aGVtIHdoZW4gdXBkYXRpbmcgd2F0ZXJtYXJrcy4KCkNoYW5nZXMgc2lu Y2UgdjE6Ci0gUmVuYW1lIHJhdGUgYmFjayB0byBkYXRhX3JhdGUsIGFuZCBjaGFuZ2UgYXJyYXkg bmFtZSB0bwogIHBsYW5lX2RhdGFfcmF0ZS4gKE1hdHQpCi0gUmVtb3ZlIHdoaXRlc3BhY2UuIChQ YXVsbykKClNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3Jz dEBsaW51eC5pbnRlbC5jb20+ClJldmlld2VkLWJ5OiBNYXR0IFJvcGVyIDxtYXR0aGV3LmQucm9w ZXJAaW50ZWwuY29tPgpDYzogUGF1bG8gWmFub25pIDxwYXVsby5yLnphbm9uaUBpbnRlbC5jb20+ Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggfCAgNCAtLS0tCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jICB8IDM1ICsrKysrKysrKysrKysrKystLS0tLS0tLS0t LS0tLS0tLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDE2IGluc2VydGlvbnMoKyksIDIzIGRlbGV0aW9u cygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKaW5kZXggN2RkYTc5ZGY1NWQwLi5kMDQ4NTQ1 N2IzMzUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCkBAIC01MDIsMTAgKzUwMiw2IEBAIHN0 cnVjdCBpbnRlbF9jcnRjX3dtX3N0YXRlIHsKIAkJCXN0cnVjdCBza2xfcGlwZV93bSBvcHRpbWFs OwogCQkJc3RydWN0IHNrbF9kZGJfZW50cnkgZGRiOwogCi0JCQkvKiBjYWNoZWQgcGxhbmUgZGF0 YSByYXRlICovCi0JCQl1bnNpZ25lZCBwbGFuZV9kYXRhX3JhdGVbSTkxNV9NQVhfUExBTkVTXTsK LQkJCXVuc2lnbmVkIHBsYW5lX3lfZGF0YV9yYXRlW0k5MTVfTUFYX1BMQU5FU107Ci0KIAkJCS8q IG1pbmltdW0gYmxvY2sgYWxsb2NhdGlvbiAqLwogCQkJdWludDE2X3QgbWluaW11bV9ibG9ja3Nb STkxNV9NQVhfUExBTkVTXTsKIAkJCXVpbnQxNl90IG1pbmltdW1feV9ibG9ja3NbSTkxNV9NQVhf UExBTkVTXTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCmluZGV4IGMxNTIwYWZiMjM2MC4uMGMxOTlj NTFkYWQ5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKQEAgLTMyNjMsMTMgKzMyNjMsMTIgQEAg c2tsX3BsYW5lX3JlbGF0aXZlX2RhdGFfcmF0ZShjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0 ZSAqY3N0YXRlLAogICogICAzICogNDA5NiAqIDgxOTIgICogNCA8IDJeMzIKICAqLwogc3RhdGlj IHVuc2lnbmVkIGludAotc2tsX2dldF90b3RhbF9yZWxhdGl2ZV9kYXRhX3JhdGUoc3RydWN0IGlu dGVsX2NydGNfc3RhdGUgKmludGVsX2NzdGF0ZSkKK3NrbF9nZXRfdG90YWxfcmVsYXRpdmVfZGF0 YV9yYXRlKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICppbnRlbF9jc3RhdGUsCisJCQkJIHVuc2ln bmVkICpwbGFuZV9kYXRhX3JhdGUsCisJCQkJIHVuc2lnbmVkICpwbGFuZV95X2RhdGFfcmF0ZSkK IHsKIAlzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNzdGF0ZSA9ICZpbnRlbF9jc3RhdGUtPmJhc2U7 CiAJc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlID0gY3N0YXRlLT5zdGF0ZTsKLQlzdHJ1 Y3QgZHJtX2NydGMgKmNydGMgPSBjc3RhdGUtPmNydGM7Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRl diA9IGNydGMtPmRldjsKLQlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVs X2NydGMoY3J0Yyk7CiAJc3RydWN0IGRybV9wbGFuZSAqcGxhbmU7CiAJY29uc3Qgc3RydWN0IGlu dGVsX3BsYW5lICppbnRlbF9wbGFuZTsKIAljb25zdCBzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpw c3RhdGU7CkBAIC0zMjg3LDIxICszMjg2LDE2IEBAIHNrbF9nZXRfdG90YWxfcmVsYXRpdmVfZGF0 YV9yYXRlKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICppbnRlbF9jc3RhdGUpCiAJCS8qIHBhY2tl ZC91diAqLwogCQlyYXRlID0gc2tsX3BsYW5lX3JlbGF0aXZlX2RhdGFfcmF0ZShpbnRlbF9jc3Rh dGUsCiAJCQkJCQkgICAgcHN0YXRlLCAwKTsKLQkJaW50ZWxfY3N0YXRlLT53bS5za2wucGxhbmVf ZGF0YV9yYXRlW2lkXSA9IHJhdGU7CisJCXBsYW5lX2RhdGFfcmF0ZVtpZF0gPSByYXRlOworCisJ CXRvdGFsX2RhdGFfcmF0ZSArPSByYXRlOwogCiAJCS8qIHktcGxhbmUgKi8KIAkJcmF0ZSA9IHNr bF9wbGFuZV9yZWxhdGl2ZV9kYXRhX3JhdGUoaW50ZWxfY3N0YXRlLAogCQkJCQkJICAgIHBzdGF0 ZSwgMSk7Ci0JCWludGVsX2NzdGF0ZS0+d20uc2tsLnBsYW5lX3lfZGF0YV9yYXRlW2lkXSA9IHJh dGU7Ci0JfQorCQlwbGFuZV95X2RhdGFfcmF0ZVtpZF0gPSByYXRlOwogCi0JLyogQ2FsY3VsYXRl IENSVEMncyB0b3RhbCBkYXRhIHJhdGUgZnJvbSBjYWNoZWQgdmFsdWVzICovCi0JZm9yX2VhY2hf aW50ZWxfcGxhbmVfb25fY3J0YyhkZXYsIGludGVsX2NydGMsIGludGVsX3BsYW5lKSB7Ci0JCWlu dCBpZCA9IHNrbF93bV9wbGFuZV9pZChpbnRlbF9wbGFuZSk7Ci0KLQkJLyogcGFja2VkL3V2ICov Ci0JCXRvdGFsX2RhdGFfcmF0ZSArPSBpbnRlbF9jc3RhdGUtPndtLnNrbC5wbGFuZV9kYXRhX3Jh dGVbaWRdOwotCQl0b3RhbF9kYXRhX3JhdGUgKz0gaW50ZWxfY3N0YXRlLT53bS5za2wucGxhbmVf eV9kYXRhX3JhdGVbaWRdOworCQl0b3RhbF9kYXRhX3JhdGUgKz0gcmF0ZTsKIAl9CiAKIAlyZXR1 cm4gdG90YWxfZGF0YV9yYXRlOwpAQCAtMzM4OSw2ICszMzgzLDggQEAgc2tsX2FsbG9jYXRlX3Bp cGVfZGRiKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjc3RhdGUsCiAJdW5zaWduZWQgaW50IHRv dGFsX2RhdGFfcmF0ZTsKIAlpbnQgbnVtX2FjdGl2ZTsKIAlpbnQgaWQsIGk7CisJdW5zaWduZWQg cGxhbmVfZGF0YV9yYXRlW0k5MTVfTUFYX1BMQU5FU10gPSB7fTsKKwl1bnNpZ25lZCBwbGFuZV95 X2RhdGFfcmF0ZVtJOTE1X01BWF9QTEFORVNdID0ge307CiAKIAkvKiBDbGVhciB0aGUgcGFydGl0 aW9uaW5nIGZvciBkaXNhYmxlZCBwbGFuZXMuICovCiAJbWVtc2V0KGRkYi0+cGxhbmVbcGlwZV0s IDAsIHNpemVvZihkZGItPnBsYW5lW3BpcGVdKSk7CkBAIC0zNDQ2LDE3ICszNDQyLDE4IEBAIHNr bF9hbGxvY2F0ZV9waXBlX2RkYihzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlLAogCSAq CiAJICogRklYTUU6IHdlIG1heSBub3QgYWxsb2NhdGUgZXZlcnkgc2luZ2xlIGJsb2NrIGhlcmUu CiAJICovCi0JdG90YWxfZGF0YV9yYXRlID0gc2tsX2dldF90b3RhbF9yZWxhdGl2ZV9kYXRhX3Jh dGUoY3N0YXRlKTsKKwl0b3RhbF9kYXRhX3JhdGUgPSBza2xfZ2V0X3RvdGFsX3JlbGF0aXZlX2Rh dGFfcmF0ZShjc3RhdGUsCisJCQkJCQkJICAgcGxhbmVfZGF0YV9yYXRlLAorCQkJCQkJCSAgIHBs YW5lX3lfZGF0YV9yYXRlKTsKIAlpZiAodG90YWxfZGF0YV9yYXRlID09IDApCiAJCXJldHVybiAw OwogCiAJc3RhcnQgPSBhbGxvYy0+c3RhcnQ7Ci0JZm9yX2VhY2hfaW50ZWxfcGxhbmVfb25fY3J0 YyhkZXYsIGludGVsX2NydGMsIGludGVsX3BsYW5lKSB7CisJZm9yIChpZCA9IDA7IGlkIDwgSTkx NV9NQVhfUExBTkVTOyBpZCsrKSB7CiAJCXVuc2lnbmVkIGludCBkYXRhX3JhdGUsIHlfZGF0YV9y YXRlOwogCQl1aW50MTZfdCBwbGFuZV9ibG9ja3MsIHlfcGxhbmVfYmxvY2tzID0gMDsKLQkJaW50 IGlkID0gc2tsX3dtX3BsYW5lX2lkKGludGVsX3BsYW5lKTsKIAotCQlkYXRhX3JhdGUgPSBjc3Rh dGUtPndtLnNrbC5wbGFuZV9kYXRhX3JhdGVbaWRdOworCQlkYXRhX3JhdGUgPSBwbGFuZV9kYXRh X3JhdGVbaWRdOwogCiAJCS8qCiAJCSAqIGFsbG9jYXRpb24gZm9yIChwYWNrZWQgZm9ybWF0cykg b3IgKHV2LXBsYW5lIHBhcnQgb2YgcGxhbmFyIGZvcm1hdCk6CkBAIC0zNDc4LDcgKzM0NzUsNyBA QCBza2xfYWxsb2NhdGVfcGlwZV9kZGIoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSwK IAkJLyoKIAkJICogYWxsb2NhdGlvbiBmb3IgeV9wbGFuZSBwYXJ0IG9mIHBsYW5hciBmb3JtYXQ6 CiAJCSAqLwotCQl5X2RhdGFfcmF0ZSA9IGNzdGF0ZS0+d20uc2tsLnBsYW5lX3lfZGF0YV9yYXRl W2lkXTsKKwkJeV9kYXRhX3JhdGUgPSBwbGFuZV95X2RhdGFfcmF0ZVtpZF07CiAKIAkJeV9wbGFu ZV9ibG9ja3MgPSB5X21pbmltdW1baWRdOwogCQl5X3BsYW5lX2Jsb2NrcyArPSBkaXZfdTY0KCh1 aW50NjRfdClhbGxvY19zaXplICogeV9kYXRhX3JhdGUsCi0tIAoyLjcuNAoKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlz dApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0 b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==