From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matt Roper Subject: Re: [PATCH 6/8] drm/i915/gen9+: Use the watermarks from crtc_state for everything. Date: Thu, 20 Oct 2016 10:55:54 -0700 Message-ID: <20161020175554.GB22654@intel.com> References: <1476278901-15750-1-git-send-email-maarten.lankhorst@linux.intel.com> <1476278901-15750-7-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 mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id 712FE6EBF6 for ; Thu, 20 Oct 2016 17:55:58 +0000 (UTC) Content-Disposition: inline In-Reply-To: <1476278901-15750-7-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 T24gV2VkLCBPY3QgMTIsIDIwMTYgYXQgMDM6Mjg6MTlQTSArMDIwMCwgTWFhcnRlbiBMYW5raG9y c3Qgd3JvdGU6Cj4gVGhlcmUncyBubyBuZWVkIHRvIGtlZXAgYSBkdXBsaWNhdGUgc2tsX3BpcGVf d20gYXJvdW5kIGFueSBtb3JlLAo+IGV2ZXJ5dGhpbmcgY2FuIGJlIGRpc2NvdmVyZWQgZnJvbSBj cnRjX3N0YXRlLCB3aGljaCB3ZSBwYXNzIGFyb3VuZAo+IGNvcnJlY3RseSBub3cgZXZlbiBpbiBj YXNlIG9mIHBsYW5lIGRpc2FibGUuCgpZb3UgbWlnaHQgd2FudCB0byBhZGQgc29tZSBjbGFyaWZp Y2F0aW9uIHRoYXQKaW50ZWwoY3J0Yy0+c3RhdGUpLT53bS5za2wub3B0aW1hbCBhbmQgaW50ZWxf Y3J0Yy0+d20uYWN0aXZlIGFsd2F5cyBob2xkCnRoZSBzYW1lIHZhbHVlIGJ5IHRoZSB0aW1lIHdl IGZpbmFsbHkgZHJvcCBvdXIgQ1JUQyBsb2Nrcywgc28gdGhlcmUncyBubwpuZWVkIGZvciB0aGUg ZHVwbGljYXRpb24gb24gZ2VuOS4gIFRoZSByZWFzb24gd2UgaGF2ZQppbnRlbF9jcnRjLT53bS5h Y3RpdmUgaW4gZ2VuZXJhbCBpcyBiZWNhdXNlIHRoZSB0d28tc3RlcCBwbGF0Zm9ybXMKKElMSy1z dHlsZSwgVkxWLXN0eWxlKSBuZWVkIGNyb3NzLUNSVEMgaW5mb3JtYXRpb24gZHVyaW5nIHdhdGVy bWFyawp1cGRhdGVzICh3aGljaCBhcmUgcG90ZW50aWFsbHkgcmFjaW5nIGlmIG11bHRpcGxlIENS VEMncyBhcmUgdXBkYXRlZAppbmRlcGVuZGVudGx5IGJ1dCBzaW11bHRhbmVvdXNseSkgYW5kIHRo ZSBpbnRlbF9jcnRjIGRhdGEgaXMgcHJvdGVjdGVkCmJ5IGEgc2VwYXJhdGUgd21fbXV0ZXguICBX YXRlcm1hcmsgY2FsY3VsYXRpb25zIHRyaWdnZXJlZCBieSBvbmUgQ1JUQydzCnVwZGF0ZSBuZWVk IHRvIGtub3cgd2hpY2ggdmFsdWVzIGFyZSBhY3R1YWxseSBhY3RpdmUgb24gdGhlIGhhcmR3YXJl CihvbGQsIGludGVybWVkaWF0ZSwgb3IgZmluYWwpIHdoaWxlIGFub3RoZXIgQ1JUQyB1cGRhdGUg aXMgc3RpbGwgYmVpbmcKcHJvY2Vzc2VkLiAgVGhlIHR5cGVzIG9mIENSVEMgdXBkYXRlcyB0aGF0 IGFyZSBhbGxvd2VkIHRvIHJhY2Ugb24gZ2VuOQpkb24ndCBoYXZlIHRoZSBzYW1lIGtpbmQgb2Yg aW50ZXItQ1JUQyBkYXRhIGRlcGVuZGVuY3kuCgpJIHRoaW5rIHRoaXMgcGF0Y2ggbmVlZHMgc29t ZSBzbGlnaHQgcmViYXNpbmcgdG8gYXBwbHkgY2xlYW5seSBvbiB0b3Agb2YKTHl1ZGUncyBjaGFu Z2VzIHRoYXQgbGFuZGVkIHllc3RlcmRheSwgYnV0IGlmIHlvdSBleHBhbmQgdGhlIGNvbW1pdApt ZXNzYWdlIGp1c3RpZmljYXRpb24gYSBiaXQsCgpSZXZpZXdlZC1ieTogTWF0dCBSb3BlciA8bWF0 dGhldy5kLnJvcGVyQGludGVsLmNvbT4KCgpNYXR0Cgo+IAo+IFNpZ25lZC1vZmYtYnk6IE1hYXJ0 ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+Cj4gLS0tCj4g IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8ICAyICstCj4gIGRyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2Rydi5oICAgICB8ICAxIC0KPiAgZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfcG0uYyAgICAgIHwgMTEgKysrKystLS0tLS0KPiAgMyBmaWxlcyBjaGFuZ2VkLCA2 IGluc2VydGlvbnMoKyksIDggZGVsZXRpb25zKC0pCj4gCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2Rpc3BsYXkuYwo+IGluZGV4IDIzZDhjNzJkYWRlMy4uMzQwODYxODI2YzQ2IDEwMDY0NAo+IC0t LSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwo+ICsrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwo+IEBAIC0xMzQ1NSw3ICsxMzQ1NSw3IEBAIHN0 YXRpYyB2b2lkIHZlcmlmeV93bV9zdGF0ZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCj4gIAkJcmV0 dXJuOwo+ICAKPiAgCXNrbF9waXBlX3dtX2dldF9od19zdGF0ZShjcnRjLCAmaHdfd20pOwo+IC0J c3dfd20gPSAmaW50ZWxfY3J0Yy0+d20uYWN0aXZlLnNrbDsKPiArCXN3X3dtID0gJnRvX2ludGVs X2NydGNfc3RhdGUobmV3X3N0YXRlKS0+d20uc2tsLm9wdGltYWw7Cj4gIAo+ICAJc2tsX2RkYl9n ZXRfaHdfc3RhdGUoZGV2X3ByaXYsICZod19kZGIpOwo+ICAJc3dfZGRiID0gJmRldl9wcml2LT53 bS5za2xfaHcuZGRiOwo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k cnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCj4gaW5kZXggYTE3NmU2Y2Vi YWIzLi45ZjA0ZTI2YzQzNjUgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZHJ2LmgKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAo+IEBAIC03 MjMsNyArNzIzLDYgQEAgc3RydWN0IGludGVsX2NydGMgewo+ICAJCS8qIHdhdGVybWFya3MgY3Vy cmVudGx5IGJlaW5nIHVzZWQgICovCj4gIAkJdW5pb24gewo+ICAJCQlzdHJ1Y3QgaW50ZWxfcGlw ZV93bSBpbGs7Cj4gLQkJCXN0cnVjdCBza2xfcGlwZV93bSBza2w7Cj4gIAkJfSBhY3RpdmU7Cj4g IAo+ICAJCS8qIGFsbG93IEN4U1Igb24gdGhpcyBwaXBlICovCj4gZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9w bS5jCj4gaW5kZXggMDVjY2QyNTNmZDdhLi5iZTNkZDhjZGM3YWUgMTAwNjQ0Cj4gLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3BtLmMKPiBAQCAtMzkwNCw5ICszOTA0LDkgQEAgYm9vbCBza2xfZGRiX2FsbG9jYXRp b25fb3ZlcmxhcHMoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlLAo+ICBzdGF0aWMgaW50 IHNrbF91cGRhdGVfcGlwZV93bShzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNzdGF0ZSwKPiAgCQkJ ICAgICAgc3RydWN0IHNrbF9kZGJfYWxsb2NhdGlvbiAqZGRiLCAvKiBvdXQgKi8KPiAgCQkJICAg ICAgc3RydWN0IHNrbF9waXBlX3dtICpwaXBlX3dtLCAvKiBvdXQgKi8KPiArCQkJICAgICAgY29u c3Qgc3RydWN0IHNrbF9waXBlX3dtICpvbGRfcGlwZV93bSwKPiAgCQkJICAgICAgYm9vbCAqY2hh bmdlZCAvKiBvdXQgKi8pCj4gIHsKPiAtCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0g dG9faW50ZWxfY3J0Yyhjc3RhdGUtPmNydGMpOwo+ICAJc3RydWN0IGludGVsX2NydGNfc3RhdGUg KmludGVsX2NzdGF0ZSA9IHRvX2ludGVsX2NydGNfc3RhdGUoY3N0YXRlKTsKPiAgCWludCByZXQ7 Cj4gIAo+IEBAIC0zOTE0LDcgKzM5MTQsNyBAQCBzdGF0aWMgaW50IHNrbF91cGRhdGVfcGlwZV93 bShzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNzdGF0ZSwKPiAgCWlmIChyZXQpCj4gIAkJcmV0dXJu IHJldDsKPiAgCj4gLQlpZiAoIW1lbWNtcCgmaW50ZWxfY3J0Yy0+d20uYWN0aXZlLnNrbCwgcGlw ZV93bSwgc2l6ZW9mKCpwaXBlX3dtKSkpCj4gKwlpZiAoIW1lbWNtcChvbGRfcGlwZV93bSwgcGlw ZV93bSwgc2l6ZW9mKCpwaXBlX3dtKSkpCj4gIAkJKmNoYW5nZWQgPSBmYWxzZTsKPiAgCWVsc2UK PiAgCQkqY2hhbmdlZCA9IHRydWU7Cj4gQEAgLTQxNTUsMTAgKzQxNTUsMTIgQEAgc2tsX2NvbXB1 dGVfd20oc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlKQo+ICAJZm9yX2VhY2hfY3J0Y19p bl9zdGF0ZShzdGF0ZSwgY3J0YywgY3N0YXRlLCBpKSB7Cj4gIAkJc3RydWN0IGludGVsX2NydGNf c3RhdGUgKmludGVsX2NzdGF0ZSA9Cj4gIAkJCXRvX2ludGVsX2NydGNfc3RhdGUoY3N0YXRlKTsK PiArCQljb25zdCBzdHJ1Y3Qgc2tsX3BpcGVfd20gKm9sZF9waXBlX3dtID0KPiArCQkJJnRvX2lu dGVsX2NydGNfc3RhdGUoY3J0Yy0+c3RhdGUpLT53bS5za2wub3B0aW1hbDsKPiAgCj4gIAkJcGlw ZV93bSA9ICZpbnRlbF9jc3RhdGUtPndtLnNrbC5vcHRpbWFsOwo+ICAJCXJldCA9IHNrbF91cGRh dGVfcGlwZV93bShjc3RhdGUsICZyZXN1bHRzLT5kZGIsIHBpcGVfd20sCj4gLQkJCQkJICZjaGFu Z2VkKTsKPiArCQkJCQkgb2xkX3BpcGVfd20sICZjaGFuZ2VkKTsKPiAgCQlpZiAocmV0KQo+ICAJ CQlyZXR1cm4gcmV0Owo+ICAKPiBAQCAtNDIwMyw4ICs0MjA1LDYgQEAgc3RhdGljIHZvaWQgc2ts X3VwZGF0ZV93bShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCj4gIAlpZiAoKHJlc3VsdHMtPmRpcnR5 X3BpcGVzICYgZHJtX2NydGNfbWFzayhjcnRjKSkgPT0gMCkKPiAgCQlyZXR1cm47Cj4gIAo+IC0J aW50ZWxfY3J0Yy0+d20uYWN0aXZlLnNrbCA9ICpwaXBlX3dtOwo+IC0KPiAgCW11dGV4X2xvY2so JmRldl9wcml2LT53bS53bV9tdXRleCk7Cj4gIAo+ICAJLyoKPiBAQCAtNDM3MSw3ICs0MzcxLDYg QEAgdm9pZCBza2xfd21fZ2V0X2h3X3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCj4gIAkJ Y3N0YXRlID0gdG9faW50ZWxfY3J0Y19zdGF0ZShjcnRjLT5zdGF0ZSk7Cj4gIAo+ICAJCXNrbF9w aXBlX3dtX2dldF9od19zdGF0ZShjcnRjLCAmY3N0YXRlLT53bS5za2wub3B0aW1hbCk7Cj4gLQkJ aW50ZWxfY3J0Yy0+d20uYWN0aXZlLnNrbCA9IGNzdGF0ZS0+d20uc2tsLm9wdGltYWw7Cj4gIAo+ ICAJCWlmICghaW50ZWxfY3J0Yy0+YWN0aXZlKQo+ICAJCQlody0+ZGlydHlfcGlwZXMgfD0gZHJt X2NydGNfbWFzayhjcnRjKTsKPiAtLSAKPiAyLjcuNAo+IAo+IF9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCj4gSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdAo+IElu dGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKPiBodHRwczovL2xpc3RzLmZyZWVkZXNrdG9w Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAoKLS0gCk1hdHQgUm9wZXIKR3JhcGhpY3Mg U29mdHdhcmUgRW5naW5lZXIKSW9URyBQbGF0Zm9ybSBFbmFibGluZyAmIERldmVsb3BtZW50Cklu dGVsIENvcnBvcmF0aW9uCig5MTYpIDM1Ni0yNzk1Cl9fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxp c3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFu L2xpc3RpbmZvL2ludGVsLWdmeAo=