From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matt Roper Subject: Re: [PATCH 2/8] drm/i915/skl+: Remove data_rate from watermark struct. Date: Wed, 19 Oct 2016 15:13:38 -0700 Message-ID: <20161019221338.GX19156@intel.com> References: <1476278901-15750-1-git-send-email-maarten.lankhorst@linux.intel.com> <1476278901-15750-3-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 mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8A4936E1D3 for ; Wed, 19 Oct 2016 22:13:39 +0000 (UTC) Content-Disposition: inline In-Reply-To: <1476278901-15750-3-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: Maarten Lankhorst Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org T24gV2VkLCBPY3QgMTIsIDIwMTYgYXQgMDM6Mjg6MTVQTSArMDIwMCwgTWFhcnRlbiBMYW5raG9y c3Qgd3JvdGU6Cj4gSXQncyBvbmx5IHVzZWQgaW4gb25lIGZ1bmN0aW9uLCBhbmQgY2FuIGJlIGNh bGN1bGF0ZWQgd2l0aG91dCBjYWNoaW5nIGl0Cj4gaW4gdGhlIGdsb2JhbCBzdHJ1Y3QgYnkgdXNp bmcgZHJtX2F0b21pY19jcnRjX3N0YXRlX2Zvcl9lYWNoX3BsYW5lX3N0YXRlLgo+IAo+IFNpZ25l ZC1vZmYtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRl bC5jb20+Cj4gLS0tCj4gIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oIHwgIDQgLS0t LQo+ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jICB8IDQ0ICsrKysrKysrKysrKysr KysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0KPiAgMiBmaWxlcyBjaGFuZ2VkLCAyMSBpbnNlcnRp b25zKCspLCAyNyBkZWxldGlvbnMoLSkKPiAKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAo+IGlu ZGV4IGJiNDY4Yzk3NGUxNC4uODg4MDU0NTE4ZjNjIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Rydi5oCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZHJ2LmgKPiBAQCAtNTAyLDEwICs1MDIsNiBAQCBzdHJ1Y3QgaW50ZWxfY3J0Y193bV9zdGF0ZSB7 Cj4gIAkJCXN0cnVjdCBza2xfcGlwZV93bSBvcHRpbWFsOwo+ICAJCQlzdHJ1Y3Qgc2tsX2RkYl9l bnRyeSBkZGI7Cj4gIAo+IC0JCQkvKiBjYWNoZWQgcGxhbmUgZGF0YSByYXRlICovCj4gLQkJCXVu c2lnbmVkIHBsYW5lX2RhdGFfcmF0ZVtJOTE1X01BWF9QTEFORVNdOwo+IC0JCQl1bnNpZ25lZCBw bGFuZV95X2RhdGFfcmF0ZVtJOTE1X01BWF9QTEFORVNdOwo+IC0KPiAgCQkJLyogbWluaW11bSBi bG9jayBhbGxvY2F0aW9uICovCj4gIAkJCXVpbnQxNl90IG1pbmltdW1fYmxvY2tzW0k5MTVfTUFY X1BMQU5FU107Cj4gIAkJCXVpbnQxNl90IG1pbmltdW1feV9ibG9ja3NbSTkxNV9NQVhfUExBTkVT XTsKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKPiBpbmRleCBiOTZhODk5Yzg5OWQuLjk3YjYyMDJj NDA5NyAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCj4gKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwo+IEBAIC0zMjM2LDEyICszMjM2LDEz IEBAIHNrbF9wbGFuZV9yZWxhdGl2ZV9kYXRhX3JhdGUoY29uc3Qgc3RydWN0IGludGVsX2NydGNf c3RhdGUgKmNzdGF0ZSwKPiAgICogICAzICogNDA5NiAqIDgxOTIgICogNCA8IDJeMzIKPiAgICov Cj4gIHN0YXRpYyB1bnNpZ25lZCBpbnQKPiAtc2tsX2dldF90b3RhbF9yZWxhdGl2ZV9kYXRhX3Jh dGUoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmludGVsX2NzdGF0ZSkKPiArc2tsX2dldF90b3Rh bF9yZWxhdGl2ZV9kYXRhX3JhdGUoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmludGVsX2NzdGF0 ZSwKPiArCQkJCSB1bnNpZ25lZCAqcGxhbmVfZGF0YV9yYXRlLAo+ICsJCQkJIHVuc2lnbmVkICpw bGFuZV95X2RhdGFfcmF0ZSkKPiAgewo+ICAJc3RydWN0IGRybV9jcnRjX3N0YXRlICpjc3RhdGUg PSAmaW50ZWxfY3N0YXRlLT5iYXNlOwo+ICAJc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRl ID0gY3N0YXRlLT5zdGF0ZTsKPiAgCXN0cnVjdCBkcm1fY3J0YyAqY3J0YyA9IGNzdGF0ZS0+Y3J0 YzsKPiAtCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBjcnRjLT5kZXY7Cj4gIAlzdHJ1Y3QgaW50 ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7Cj4gIAlzdHJ1Y3QgZHJt X3BsYW5lICpwbGFuZTsKPiAgCWNvbnN0IHN0cnVjdCBpbnRlbF9wbGFuZSAqaW50ZWxfcGxhbmU7 Cj4gQEAgLTMyNjMsMjEgKzMyNjQsMTYgQEAgc2tsX2dldF90b3RhbF9yZWxhdGl2ZV9kYXRhX3Jh dGUoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmludGVsX2NzdGF0ZSkKPiAgCQkvKiBwYWNrZWQv dXYgKi8KPiAgCQlyYXRlID0gc2tsX3BsYW5lX3JlbGF0aXZlX2RhdGFfcmF0ZShpbnRlbF9jc3Rh dGUsCj4gIAkJCQkJCSAgICBwc3RhdGUsIDApOwo+IC0JCWludGVsX2NzdGF0ZS0+d20uc2tsLnBs YW5lX2RhdGFfcmF0ZVtpZF0gPSByYXRlOwo+ICsJCXBsYW5lX2RhdGFfcmF0ZVtpZF0gPSByYXRl Owo+ICsKPiArCQl0b3RhbF9kYXRhX3JhdGUgKz0gcmF0ZTsKPiAgCj4gIAkJLyogeS1wbGFuZSAq Lwo+ICAJCXJhdGUgPSBza2xfcGxhbmVfcmVsYXRpdmVfZGF0YV9yYXRlKGludGVsX2NzdGF0ZSwK PiAgCQkJCQkJICAgIHBzdGF0ZSwgMSk7Cj4gLQkJaW50ZWxfY3N0YXRlLT53bS5za2wucGxhbmVf eV9kYXRhX3JhdGVbaWRdID0gcmF0ZTsKPiAtCX0KPiAtCj4gLQkvKiBDYWxjdWxhdGUgQ1JUQydz IHRvdGFsIGRhdGEgcmF0ZSBmcm9tIGNhY2hlZCB2YWx1ZXMgKi8KPiAtCWZvcl9lYWNoX2ludGVs X3BsYW5lX29uX2NydGMoZGV2LCBpbnRlbF9jcnRjLCBpbnRlbF9wbGFuZSkgewo+IC0JCWludCBp ZCA9IHNrbF93bV9wbGFuZV9pZChpbnRlbF9wbGFuZSk7Cj4gKwkJcGxhbmVfeV9kYXRhX3JhdGVb aWRdID0gcmF0ZTsKPiAgCj4gLQkJLyogcGFja2VkL3V2ICovCj4gLQkJdG90YWxfZGF0YV9yYXRl ICs9IGludGVsX2NzdGF0ZS0+d20uc2tsLnBsYW5lX2RhdGFfcmF0ZVtpZF07Cj4gLQkJdG90YWxf ZGF0YV9yYXRlICs9IGludGVsX2NzdGF0ZS0+d20uc2tsLnBsYW5lX3lfZGF0YV9yYXRlW2lkXTsK PiArCQl0b3RhbF9kYXRhX3JhdGUgKz0gcmF0ZTsKPiAgCX0KPiAgCj4gIAlyZXR1cm4gdG90YWxf ZGF0YV9yYXRlOwo+IEBAIC0zMzY2LDYgKzMzNjIsOSBAQCBza2xfYWxsb2NhdGVfcGlwZV9kZGIo c3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSwKPiAgCWludCBudW1fYWN0aXZlOwo+ICAJ aW50IGlkLCBpOwo+ICAKPiArCXVuc2lnbmVkIGRhdGFfcmF0ZVtJOTE1X01BWF9QTEFORVNdID0g e307Cj4gKwl1bnNpZ25lZCB5X2RhdGFfcmF0ZVtJOTE1X01BWF9QTEFORVNdID0ge307Cj4gKwoK TWlub3Igbml0cGljazsgaWYgeW91IHBpY2tlZCBhIGRpZmZlcmVudCBuYW1lcyBoZXJlIChlLmcu LApwbGFuZV9kYXRhX3JhdGVbXSkgdGhlbiB5b3UgY291bGQgbGVhdmUgdGhlIGxvY2FsIHZhcmlh YmxlcyBmYXJ0aGVyIGRvd24KbmFtZWQgJ2RhdGFfcmF0ZScgYW5kICd5X2RhdGFfcmF0ZScgd2hp Y2ggd291bGQgcmVkdWNlIHRoZSBkaWZmIGNoYW5nZXMKYW5kIHJlc3VsdCBpbiBhIHNsaWdodGx5 IHNtYWxsZXIgcGF0Y2guCgpXaGV0aGVyIG9yIG5vdCB5b3UgZmVlbCBsaWtlIG1ha2luZyB0aGF0 IGNoYW5nZSwga2lsbGluZyB0aGUgY2FjaGluZyBpcwpnb29kIHNvLAoKUmV2aWV3ZWQtYnk6IE1h dHQgUm9wZXIgPG1hdHRoZXcuZC5yb3BlckBpbnRlbC5jb20+CgoKPiAgCS8qIENsZWFyIHRoZSBw YXJ0aXRpb25pbmcgZm9yIGRpc2FibGVkIHBsYW5lcy4gKi8KPiAgCW1lbXNldChkZGItPnBsYW5l W3BpcGVdLCAwLCBzaXplb2YoZGRiLT5wbGFuZVtwaXBlXSkpOwo+ICAJbWVtc2V0KGRkYi0+eV9w bGFuZVtwaXBlXSwgMCwgc2l6ZW9mKGRkYi0+eV9wbGFuZVtwaXBlXSkpOwo+IEBAIC0zNDI1LDI5 ICszNDI0LDI4IEBAIHNrbF9hbGxvY2F0ZV9waXBlX2RkYihzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0 ZSAqY3N0YXRlLAo+ICAJICoKPiAgCSAqIEZJWE1FOiB3ZSBtYXkgbm90IGFsbG9jYXRlIGV2ZXJ5 IHNpbmdsZSBibG9jayBoZXJlLgo+ICAJICovCj4gLQl0b3RhbF9kYXRhX3JhdGUgPSBza2xfZ2V0 X3RvdGFsX3JlbGF0aXZlX2RhdGFfcmF0ZShjc3RhdGUpOwo+ICsJdG90YWxfZGF0YV9yYXRlID0g c2tsX2dldF90b3RhbF9yZWxhdGl2ZV9kYXRhX3JhdGUoY3N0YXRlLCBkYXRhX3JhdGUsIHlfZGF0 YV9yYXRlKTsKPiAgCWlmICh0b3RhbF9kYXRhX3JhdGUgPT0gMCkKPiAgCQlyZXR1cm4gMDsKPiAg Cj4gIAlzdGFydCA9IGFsbG9jLT5zdGFydDsKPiAtCWZvcl9lYWNoX2ludGVsX3BsYW5lX29uX2Ny dGMoZGV2LCBpbnRlbF9jcnRjLCBpbnRlbF9wbGFuZSkgewo+IC0JCXVuc2lnbmVkIGludCBkYXRh X3JhdGUsIHlfZGF0YV9yYXRlOwo+ICsJZm9yIChpZCA9IDA7IGlkIDwgSTkxNV9NQVhfUExBTkVT OyBpZCsrKSB7Cj4gKwkJdW5zaWduZWQgcmF0ZTsKPiAgCQl1aW50MTZfdCBwbGFuZV9ibG9ja3Ms IHlfcGxhbmVfYmxvY2tzID0gMDsKPiAtCQlpbnQgaWQgPSBza2xfd21fcGxhbmVfaWQoaW50ZWxf cGxhbmUpOwo+ICAKPiAtCQlkYXRhX3JhdGUgPSBjc3RhdGUtPndtLnNrbC5wbGFuZV9kYXRhX3Jh dGVbaWRdOwo+ICsJCXJhdGUgPSBkYXRhX3JhdGVbaWRdOwo+ICAKPiAgCQkvKgo+ICAJCSAqIGFs bG9jYXRpb24gZm9yIChwYWNrZWQgZm9ybWF0cykgb3IgKHV2LXBsYW5lIHBhcnQgb2YgcGxhbmFy IGZvcm1hdCk6Cj4gIAkJICogcHJvbW90ZSB0aGUgZXhwcmVzc2lvbiB0byA2NCBiaXRzIHRvIGF2 b2lkIG92ZXJmbG93aW5nLCB0aGUKPiAtCQkgKiByZXN1bHQgaXMgPCBhdmFpbGFibGUgYXMgZGF0 YV9yYXRlIC8gdG90YWxfZGF0YV9yYXRlIDwgMQo+ICsJCSAqIHJlc3VsdCBpcyA8IGF2YWlsYWJs ZSBhcyByYXRlIC8gdG90YWxfZGF0YV9yYXRlIDwgMQo+ICAJCSAqLwo+ICAJCXBsYW5lX2Jsb2Nr cyA9IG1pbmltdW1baWRdOwo+IC0JCXBsYW5lX2Jsb2NrcyArPSBkaXZfdTY0KCh1aW50NjRfdClh bGxvY19zaXplICogZGF0YV9yYXRlLAo+ICsJCXBsYW5lX2Jsb2NrcyArPSBkaXZfdTY0KCh1aW50 NjRfdClhbGxvY19zaXplICogcmF0ZSwKPiAgCQkJCQl0b3RhbF9kYXRhX3JhdGUpOwo+ICAKPiAg CQkvKiBMZWF2ZSBkaXNhYmxlZCBwbGFuZXMgYXQgKDAsMCkgKi8KPiAtCQlpZiAoZGF0YV9yYXRl KSB7Cj4gKwkJaWYgKHJhdGUpIHsKPiAgCQkJZGRiLT5wbGFuZVtwaXBlXVtpZF0uc3RhcnQgPSBz dGFydDsKPiAgCQkJZGRiLT5wbGFuZVtwaXBlXVtpZF0uZW5kID0gc3RhcnQgKyBwbGFuZV9ibG9j a3M7Cj4gIAkJfQo+IEBAIC0zNDU3LDEzICszNDU1LDEzIEBAIHNrbF9hbGxvY2F0ZV9waXBlX2Rk YihzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlLAo+ICAJCS8qCj4gIAkJICogYWxsb2Nh dGlvbiBmb3IgeV9wbGFuZSBwYXJ0IG9mIHBsYW5hciBmb3JtYXQ6Cj4gIAkJICovCj4gLQkJeV9k YXRhX3JhdGUgPSBjc3RhdGUtPndtLnNrbC5wbGFuZV95X2RhdGFfcmF0ZVtpZF07Cj4gKwkJcmF0 ZSA9IHlfZGF0YV9yYXRlW2lkXTsKPiAgCj4gIAkJeV9wbGFuZV9ibG9ja3MgPSB5X21pbmltdW1b aWRdOwo+IC0JCXlfcGxhbmVfYmxvY2tzICs9IGRpdl91NjQoKHVpbnQ2NF90KWFsbG9jX3NpemUg KiB5X2RhdGFfcmF0ZSwKPiArCQl5X3BsYW5lX2Jsb2NrcyArPSBkaXZfdTY0KCh1aW50NjRfdClh bGxvY19zaXplICogcmF0ZSwKPiAgCQkJCQl0b3RhbF9kYXRhX3JhdGUpOwo+ICAKPiAtCQlpZiAo eV9kYXRhX3JhdGUpIHsKPiArCQlpZiAocmF0ZSkgewo+ICAJCQlkZGItPnlfcGxhbmVbcGlwZV1b aWRdLnN0YXJ0ID0gc3RhcnQ7Cj4gIAkJCWRkYi0+eV9wbGFuZVtwaXBlXVtpZF0uZW5kID0gc3Rh cnQgKyB5X3BsYW5lX2Jsb2NrczsKPiAgCQl9Cj4gLS0gCj4gMi43LjQKPiAKPiBfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwo+IEludGVsLWdmeCBtYWlsaW5n IGxpc3QKPiBJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCj4gaHR0cHM6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngKCi0tIApNYXR0IFJvcGVy CkdyYXBoaWNzIFNvZnR3YXJlIEVuZ2luZWVyCklvVEcgUGxhdGZvcm0gRW5hYmxpbmcgJiBEZXZl bG9wbWVudApJbnRlbCBDb3Jwb3JhdGlvbgooOTE2KSAzNTYtMjc5NQpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0Cklu dGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK