From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matt Roper Subject: Re: [PATCH v2 08/11] drm/i915/gen9+: Use the watermarks from crtc_state for everything, v2. Date: Wed, 26 Oct 2016 16:13:56 -0700 Message-ID: <20161026231356.GC5924@intel.com> References: <1477489299-25777-1-git-send-email-maarten.lankhorst@linux.intel.com> <1477489299-25777-9-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 mga06.intel.com (mga06.intel.com [134.134.136.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id D016B6E95E for ; Wed, 26 Oct 2016 23:13:56 +0000 (UTC) Content-Disposition: inline In-Reply-To: <1477489299-25777-9-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 T24gV2VkLCBPY3QgMjYsIDIwMTYgYXQgMDM6NDE6MzZQTSArMDIwMCwgTWFhcnRlbiBMYW5raG9y c3Qgd3JvdGU6Cj4gVGhlcmUncyBubyBuZWVkIHRvIGtlZXAgYSBkdXBsaWNhdGUgc2tsX3BpcGVf d20gYXJvdW5kIGFueSBtb3JlLAo+IGV2ZXJ5dGhpbmcgY2FuIGJlIGRpc2NvdmVyZWQgZnJvbSBj cnRjX3N0YXRlLCB3aGljaCB3ZSBwYXNzIGFyb3VuZAo+IGNvcnJlY3RseSBub3cgZXZlbiBpbiBj YXNlIG9mIHBsYW5lIGRpc2FibGUuCj4gCj4gVGhlIGNvcHkgaW4gaW50ZWxfY3J0Yy0+d20uc2ts LmFjdGl2ZSBpcyBlcXVhbCB0bwo+IGNydGNfc3RhdGUtPndtLnNrbC5vcHRpbWFsIGFmdGVyIHRo ZSBhdG9taWMgY29tbWl0IGNvbXBsZXRlcy4KPiBJdCdzIHVzZWZ1bCBmb3IgdHdvLXN0ZXAgd2F0 ZXJtYXJrIHByb2dyYW1taW5nLCBidXQgbm90IHJlcXVpcmVkIGZvcgo+IGdlbjkrIHdoaWNoIGRv ZXMgaXQgaW4gYSBzaW5nbGUgc3RlcC4gV2UgY2FuIHB1bGwgdGhlIG9sZCBhbGxvY2F0aW9uCj4g ZnJvbSBvbGRfY3J0Y19zdGF0ZS4KPiAKPiBTaWduZWQtb2ZmLWJ5OiBNYWFydGVuIExhbmtob3Jz dCA8bWFhcnRlbi5sYW5raG9yc3RAbGludXguaW50ZWwuY29tPgo+IENjOiBNYXR0IFJvcGVyIDxt YXR0aGV3LmQucm9wZXJAaW50ZWwuY29tPgo+IFJldmlld2VkLWJ5OiBQYXVsbyBaYW5vbmkgPHBh dWxvLnIuemFub25pQGludGVsLmNvbT4KClJldmlld2VkLWJ5OiBNYXR0IFJvcGVyIDxtYXR0aGV3 LmQucm9wZXJAaW50ZWwuY29tPgoKPiAtLS0KPiAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZGlzcGxheS5jIHwgIDIgKy0KPiAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggICAg IHwgIDEgLQo+ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jICAgICAgfCAxOCArKysr KysrKy0tLS0tLS0tLS0KPiAgMyBmaWxlcyBjaGFuZ2VkLCA5IGluc2VydGlvbnMoKyksIDEyIGRl bGV0aW9ucygtKQo+IAo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k aXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKPiBpbmRleCA0 OGViMDYzNWVjMGYuLjU5MmE2ZWMzNTRhNyAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kaXNwbGF5LmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k aXNwbGF5LmMKPiBAQCAtMTM0NzgsNyArMTM0NzgsNyBAQCBzdGF0aWMgdm9pZCB2ZXJpZnlfd21f c3RhdGUoc3RydWN0IGRybV9jcnRjICpjcnRjLAo+ICAJCXJldHVybjsKPiAgCj4gIAlza2xfcGlw ZV93bV9nZXRfaHdfc3RhdGUoY3J0YywgJmh3X3dtKTsKPiAtCXN3X3dtID0gJmludGVsX2NydGMt PndtLmFjdGl2ZS5za2w7Cj4gKwlzd193bSA9ICZ0b19pbnRlbF9jcnRjX3N0YXRlKG5ld19zdGF0 ZSktPndtLnNrbC5vcHRpbWFsOwo+ICAKPiAgCXNrbF9kZGJfZ2V0X2h3X3N0YXRlKGRldl9wcml2 LCAmaHdfZGRiKTsKPiAgCXN3X2RkYiA9ICZkZXZfcHJpdi0+d20uc2tsX2h3LmRkYjsKPiBkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kcnYuaAo+IGluZGV4IDczYmU2NDBmYWQzNi4uNzdhMGE3M2UzN2IwIDEw MDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCj4gKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKPiBAQCAtNzIzLDcgKzcyMyw2IEBAIHN0cnVj dCBpbnRlbF9jcnRjIHsKPiAgCQkvKiB3YXRlcm1hcmtzIGN1cnJlbnRseSBiZWluZyB1c2VkICAq Lwo+ICAJCXVuaW9uIHsKPiAgCQkJc3RydWN0IGludGVsX3BpcGVfd20gaWxrOwo+IC0JCQlzdHJ1 Y3Qgc2tsX3BpcGVfd20gc2tsOwo+ICAJCX0gYWN0aXZlOwo+ICAKPiAgCQkvKiBhbGxvdyBDeFNS IG9uIHRoaXMgcGlwZSAqLwo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9wbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwo+IGluZGV4IDVmZjM1ODMz YjI1OC4uZmU0YmM5N2VkNTZhIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3BtLmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCj4gQEAgLTM5 MzAsMTEgKzM5MzAsMTEgQEAgYm9vbCBza2xfZGRiX2FsbG9jYXRpb25fb3ZlcmxhcHMoc3RydWN0 IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlLAo+ICB9Cj4gIAo+ICBzdGF0aWMgaW50IHNrbF91cGRh dGVfcGlwZV93bShzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNzdGF0ZSwKPiAtCQkJICAgICAgc3Ry dWN0IHNrbF9kZGJfYWxsb2NhdGlvbiAqZGRiLCAvKiBvdXQgKi8KPiArCQkJICAgICAgY29uc3Qg c3RydWN0IHNrbF9waXBlX3dtICpvbGRfcGlwZV93bSwKPiAgCQkJICAgICAgc3RydWN0IHNrbF9w aXBlX3dtICpwaXBlX3dtLCAvKiBvdXQgKi8KPiArCQkJICAgICAgc3RydWN0IHNrbF9kZGJfYWxs b2NhdGlvbiAqZGRiLCAvKiBvdXQgKi8KPiAgCQkJICAgICAgYm9vbCAqY2hhbmdlZCAvKiBvdXQg Ki8pCj4gIHsKPiAtCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0 Yyhjc3RhdGUtPmNydGMpOwo+ICAJc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmludGVsX2NzdGF0 ZSA9IHRvX2ludGVsX2NydGNfc3RhdGUoY3N0YXRlKTsKPiAgCWludCByZXQ7Cj4gIAo+IEBAIC0z OTQyLDcgKzM5NDIsNyBAQCBzdGF0aWMgaW50IHNrbF91cGRhdGVfcGlwZV93bShzdHJ1Y3QgZHJt X2NydGNfc3RhdGUgKmNzdGF0ZSwKPiAgCWlmIChyZXQpCj4gIAkJcmV0dXJuIHJldDsKPiAgCj4g LQlpZiAoIW1lbWNtcCgmaW50ZWxfY3J0Yy0+d20uYWN0aXZlLnNrbCwgcGlwZV93bSwgc2l6ZW9m KCpwaXBlX3dtKSkpCj4gKwlpZiAoIW1lbWNtcChvbGRfcGlwZV93bSwgcGlwZV93bSwgc2l6ZW9m KCpwaXBlX3dtKSkpCj4gIAkJKmNoYW5nZWQgPSBmYWxzZTsKPiAgCWVsc2UKPiAgCQkqY2hhbmdl ZCA9IHRydWU7Cj4gQEAgLTQxNzcsMTAgKzQxNzcsMTIgQEAgc2tsX2NvbXB1dGVfd20oc3RydWN0 IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlKQo+ICAJZm9yX2VhY2hfY3J0Y19pbl9zdGF0ZShzdGF0 ZSwgY3J0YywgY3N0YXRlLCBpKSB7Cj4gIAkJc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmludGVs X2NzdGF0ZSA9Cj4gIAkJCXRvX2ludGVsX2NydGNfc3RhdGUoY3N0YXRlKTsKPiArCQljb25zdCBz dHJ1Y3Qgc2tsX3BpcGVfd20gKm9sZF9waXBlX3dtID0KPiArCQkJJnRvX2ludGVsX2NydGNfc3Rh dGUoY3J0Yy0+c3RhdGUpLT53bS5za2wub3B0aW1hbDsKPiAgCj4gIAkJcGlwZV93bSA9ICZpbnRl bF9jc3RhdGUtPndtLnNrbC5vcHRpbWFsOwo+IC0JCXJldCA9IHNrbF91cGRhdGVfcGlwZV93bShj c3RhdGUsICZyZXN1bHRzLT5kZGIsIHBpcGVfd20sCj4gLQkJCQkJICZjaGFuZ2VkKTsKPiArCQly ZXQgPSBza2xfdXBkYXRlX3BpcGVfd20oY3N0YXRlLCBvbGRfcGlwZV93bSwgcGlwZV93bSwKPiAr CQkJCQkgJnJlc3VsdHMtPmRkYiwgJmNoYW5nZWQpOwo+ICAJCWlmIChyZXQpCj4gIAkJCXJldHVy biByZXQ7Cj4gIAo+IEBAIC00MjI0LDggKzQyMjYsNiBAQCBzdGF0aWMgdm9pZCBza2xfdXBkYXRl X3dtKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKPiAgCWlmICgocmVzdWx0cy0+ZGlydHlfcGlwZXMg JiBkcm1fY3J0Y19tYXNrKGNydGMpKSA9PSAwKQo+ICAJCXJldHVybjsKPiAgCj4gLQlpbnRlbF9j cnRjLT53bS5hY3RpdmUuc2tsID0gKnBpcGVfd207Cj4gLQo+ICAJbXV0ZXhfbG9jaygmZGV2X3By aXYtPndtLndtX211dGV4KTsKPiAgCj4gIAkvKgo+IEBAIC00Mzk1LDEwICs0Mzk1LDggQEAgdm9p ZCBza2xfd21fZ2V0X2h3X3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCj4gIAo+ICAJCXNr bF9waXBlX3dtX2dldF9od19zdGF0ZShjcnRjLCAmY3N0YXRlLT53bS5za2wub3B0aW1hbCk7Cj4g IAo+IC0JCWlmIChpbnRlbF9jcnRjLT5hY3RpdmUpIHsKPiArCQlpZiAoaW50ZWxfY3J0Yy0+YWN0 aXZlKQo+ICAJCQlody0+ZGlydHlfcGlwZXMgfD0gZHJtX2NydGNfbWFzayhjcnRjKTsKPiAtCQkJ aW50ZWxfY3J0Yy0+d20uYWN0aXZlLnNrbCA9IGNzdGF0ZS0+d20uc2tsLm9wdGltYWw7Cj4gLQkJ fQo+ICAJfQo+ICAKPiAgCWlmIChkZXZfcHJpdi0+YWN0aXZlX2NydGNzKSB7Cj4gLS0gCj4gMi43 LjQKPiAKCi0tIApNYXR0IFJvcGVyCkdyYXBoaWNzIFNvZnR3YXJlIEVuZ2luZWVyCklvVEcgUGxh dGZvcm0gRW5hYmxpbmcgJiBEZXZlbG9wbWVudApJbnRlbCBDb3Jwb3JhdGlvbgooOTE2KSAzNTYt Mjc5NQpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRl bC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6 Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK