From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: Re: [PATCH 3/3] drm/i915: Don't assume primary & cursor are always on for wm calculation (v4) Date: Tue, 10 Mar 2015 10:51:34 +0000 Message-ID: <54FECCB6.5020604@linux.intel.com> References: <20150309175729.GB11371@intel.com> <1425924362-28582-1-git-send-email-matthew.d.roper@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id B7C936E01F for ; Tue, 10 Mar 2015 03:51:35 -0700 (PDT) In-Reply-To: <1425924362-28582-1-git-send-email-matthew.d.roper@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Matt Roper , intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org Ck9uIDAzLzA5LzIwMTUgMDY6MDYgUE0sIE1hdHQgUm9wZXIgd3JvdGU6Cj4gQ3VycmVudCBJTEst c3R5bGUgd2F0ZXJtYXJrIGNvZGUgYXNzdW1lcyB0aGUgcHJpbWFyeSBwbGFuZSBhbmQgY3Vyc29y Cj4gcGxhbmUgYXJlIGFsd2F5cyBlbmFibGVkLiAgVGhpcyBhc3N1bXB0aW9uLCBhbG9uZyB3aXRo IHRoZSBjb21iaW5hdGlvbgo+IG9mIHR3byBpbmRlcGVuZGVudCBjb21taXRzIHRoYXQgZ290IG1l cmdlZCBhdCB0aGUgc2FtZSB0aW1lLCByZXN1bHRzIGluCj4gYSBOVUxMIGRlcmVmZXJlbmNlLiAg VGhlIG9mZmVuZGluZyBjb21taXRzIGFyZToKPgo+ICAgICAgICAgIGNvbW1pdCBmZDJkNjEzNDFi ZjM5ZDEwNTQyNTZjMDdkNmVkZGQ2MjRlYmM0MjQxCj4gICAgICAgICAgQXV0aG9yOiBNYXR0IFJv cGVyIDxtYXR0aGV3LmQucm9wZXJAaW50ZWwuY29tPgo+ICAgICAgICAgIERhdGU6ICAgRnJpIEZl YiAyNyAxMDoxMjowMSAyMDE1IC0wODAwCj4KPiAgICAgICAgICAgICAgZHJtL2k5MTU6IFVzZSBw bGFuZS0+c3RhdGUtPmZiIGluIHdhdGVybWFyayBjb2RlICh2MikKPgo+IGFuZAo+Cj4gICAgICAg ICAgY29tbWl0IDBmZGE2NTY4MGU5MjU0NWNhZWE1YmU3ODA1YTdmMGE2MTdmYjZjMjAKPiAgICAg ICAgICBBdXRob3I6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+Cj4g ICAgICAgICAgRGF0ZTogICBGcmkgRmViIDI3IDE1OjEyOjM1IDIwMTUgKzAwMDAKPgo+ICAgICAg ICAgICAgICBkcm0vaTkxNS9za2w6IFVwZGF0ZSB3YXRlcm1hcmtzIGZvciBZIHRpbGluZwo+Cj4g VGhlIGZpcnN0IGNvbW1pdCBjYXVzZXMgdXMgdG8gdXNlIHRoZSBGQiBmcm9tIHBsYW5lLT5zdGF0 ZS0+ZmIgcmF0aGVyCj4gdGhhbiB0aGUgbGVnYWN5IHBsYW5lLT5mYiwgd2hpY2ggaXMgdXBkYXRl ZCBhIGJpdCBsYXRlciBpbiB0aGUgcHJvY2Vzcy4KPgo+IFRoZSBzZWNvbmQgY29tbWl0IGluY2x1 ZGVzIGEgY2hhbmdlIHRoYXQgbm93IHRyaWdnZXJzIHdhdGVybWFyawo+IHJlcHJvZ3JhbW1pbmcg b24gcHJpbWFyeSBwbGFuZSBlbmFibGUvZGlzYWJsZSB3aGVyZSB3ZSBkaWRuJ3QgaGF2ZSBvbmUK PiBiZWZvcmUgKHdoaWNoIHdhc24ndCByZWFsbHkgY29ycmVjdCwgYnV0IHdlIGhhZCBiZWVuIGdl dHRpbmcgbHVja3kKPiBiZWNhdXNlIHdlIGFsd2F5cyBjYWxjdWxhdGVkIGFzIGlmIHRoZSBwcmlt YXJ5IHBsYW5lIHdhcyBvbikuCj4KPiBUb2dldGhlciwgdGhlc2UgdHdvIGNvbW1pdHMgY2F1c2Ug dGhlIHdhdGVybWFyayBjYWxjdWxhdGlvbiB0bwo+IChwcm9wZXJseSkgc2VlIHBsYW5lLT5zdGF0 ZS0+ZmIgPSBOVUxMIHdoZW4gd2UncmUgaW4gdGhlIHByb2Nlc3Mgb2YKPiBkaXNhYmxpbmcgdGhl IHByaW1hcnkgcGxhbmUuICBIb3dldmVyIHRoZSBleGlzdGluZyB3YXRlcm1hcmsgY29kZQo+IGFz c3VtZXMgdGhlcmUncyBhbHdheXMgYSBwcmltYXJ5IGZiIGFuZCB0cmllcyB0byBkZXJlZmVyZW5j ZSBpdCB0byBmaW5kCj4gb3V0IHBpeGVsIGZvcm1hdCAvIGJwcCBpbmZvcm1hdGlvbi4KPgo+IFRo ZSBmaXggaXMgdG8gbWFrZSBJTEstc3R5bGUgd2F0ZXJtYXJrIGNhbGN1bGF0aW9uIGFjdHVhbGx5 IGNoZWNrIHRoZQo+IHRydWUgc3RhdHVzIG9mIHByaW1hcnkgJiBjdXJzb3IgcGxhbmVzIGFuZCBh ZGp1c3Qgb3VyIHdhdGVybWFyayBsb2dpYwo+IGFjY29yZGluZ2x5Lgo+Cj4gdjI6IFVwZGF0ZSB1 bmNoZWNrZWQgdXNlcyBvZiBzdGF0ZS0+ZmIgZm9yIG90aGVyIHBsYXRmb3JtcyAocG52LCBza2ws Cj4gICAgICBldGMuKS4gIE5vdGUgdGhhdCB0aGlzIGlzIGp1c3QgYSB0ZW1wb3JhcnkgZml4LiAg VWx0aW1hdGVseSB0aGUKPiAgICAgIHVzZWZ1bCBpbmZvcm1hdGlvbiBpcyBnb2luZyB0byBiZSBj b21wdXRlZCBhdCBjaGVjayB0aW1lIGFuZCBzdG9yZWQKPiAgICAgIHJpZ2h0IGluIHRoZSBzdGF0 ZSBzdHJ1Y3R1cmVzIHNvIHRoYXQgd2UgZG9uJ3QgaGF2ZSB0byBmaWd1cmUgdGhpcwo+ICAgICAg YWxsIG91dCB3aGlsZSB3ZSdyZSBzdXBwb3NlZCB0byBiZSBwcm9ncmFtbWluZyB0aGUgd2F0ZXJt YXJrcy4KPiAgICAgIChjYXVnaHQgYnkgVHZydGtvKQo+Cj4gdjM6IEZpeCBhIGNvdXBsZSBjb3B5 L3Bhc3RlIG1pc3Rha2VzIGluIFNLTCBjb2RlLiAoVHZydGtvKQo+Cj4gdjQ6IE9ubHkgYWRkIEZC IGNoZWNrcyBmb3IgSUxLL1NLTCBjb2RlcGF0aHMuICBPbGRlciBwbGF0Zm9ybXMgc3RpbGwgdXNl Cj4gICAgICBpbnRlbF9jcnRjX2FjdGl2ZSgpIGFuZCB3aWxsIHNob3J0Y2lyY3VpdCBvdXQgb2Yg d2F0ZXJtYXJrCj4gICAgICBjYWxjdWxhdGlvbnMgYmVmb3JlIGV2ZXIgdHJ5aW5nIHRvIGRlcmVm ZXJlbmNlIHRoZSBwcmltYXJ5IHBsYW5lJ3MKPiAgICAgIGZyYW1lYnVmZmVyLgo+Cj4gQ2M6IFR2 cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+Cj4gUmVwb3J0ZWQtYnk6IE1p Y2hhZWwgTGV1Y2h0ZW5idXJnIDxtaWNoYWVsQHNsYXNoaG9tZS5vcmc+Cj4gQnVnemlsbGE6IGh0 dHBzOi8vYnVncy5mcmVlZGVza3RvcC5vcmcvc2hvd19idWcuY2dpP2lkPTg5Mzg4Cj4gU2lnbmVk LW9mZi1ieTogTWF0dCBSb3BlciA8bWF0dGhldy5kLnJvcGVyQGludGVsLmNvbT4KPiAtLS0KPiAg IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgfCA2MiArKysrKysrKysrKysrKysrKysr KysrKysrKy0tLS0tLS0tLS0tLS0tLQo+ICAgMSBmaWxlIGNoYW5nZWQsIDM5IGluc2VydGlvbnMo KyksIDIzIGRlbGV0aW9ucygtKQo+Cj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCj4gaW5kZXggYTA2 YTJjNy4uNzU2NmNlYyAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9w bS5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwo+IEBAIC0xOTYyLDEz ICsxOTYyLDI1IEBAIHN0YXRpYyB2b2lkIGlsa19jb21wdXRlX3dtX3BhcmFtZXRlcnMoc3RydWN0 IGRybV9jcnRjICpjcnRjLAo+ICAgCXAtPmFjdGl2ZSA9IHRydWU7Cj4gICAJcC0+cGlwZV9odG90 YWwgPSBpbnRlbF9jcnRjLT5jb25maWctPmJhc2UuYWRqdXN0ZWRfbW9kZS5jcnRjX2h0b3RhbDsK PiAgIAlwLT5waXhlbF9yYXRlID0gaWxrX3BpcGVfcGl4ZWxfcmF0ZShkZXYsIGNydGMpOwo+IC0J cC0+cHJpLmJ5dGVzX3Blcl9waXhlbCA9IGNydGMtPnByaW1hcnktPnN0YXRlLT5mYi0+Yml0c19w ZXJfcGl4ZWwgLyA4Owo+IC0JcC0+Y3VyLmJ5dGVzX3Blcl9waXhlbCA9IDQ7Cj4gKwo+ICsJaWYg KGNydGMtPnByaW1hcnktPnN0YXRlLT5mYikgewo+ICsJCXAtPnByaS5lbmFibGVkID0gdHJ1ZTsK PiArCQlwLT5wcmkuYnl0ZXNfcGVyX3BpeGVsID0KPiArCQkJY3J0Yy0+cHJpbWFyeS0+c3RhdGUt PmZiLT5iaXRzX3Blcl9waXhlbCAvIDg7Cj4gKwl9IGVsc2Ugewo+ICsJCXAtPnByaS5lbmFibGVk ID0gZmFsc2U7Cj4gKwkJcC0+cHJpLmJ5dGVzX3Blcl9waXhlbCA9IDA7Cj4gKwl9Cj4gKwo+ICsJ aWYgKGNydGMtPmN1cnNvci0+c3RhdGUtPmZiKSB7Cj4gKwkJcC0+Y3VyLmVuYWJsZWQgPSB0cnVl Owo+ICsJCXAtPmN1ci5ieXRlc19wZXJfcGl4ZWwgPSA0Owo+ICsJfSBlbHNlIHsKPiArCQlwLT5j dXIuZW5hYmxlZCA9IGZhbHNlOwo+ICsJCXAtPmN1ci5ieXRlc19wZXJfcGl4ZWwgPSAwOwo+ICsJ fQo+ICAgCXAtPnByaS5ob3Jpel9waXhlbHMgPSBpbnRlbF9jcnRjLT5jb25maWctPnBpcGVfc3Jj X3c7Cj4gICAJcC0+Y3VyLmhvcml6X3BpeGVscyA9IGludGVsX2NydGMtPmJhc2UuY3Vyc29yLT5z dGF0ZS0+Y3J0Y193Owo+IC0JLyogVE9ETzogZm9yIG5vdywgYXNzdW1lIHByaW1hcnkgYW5kIGN1 cnNvciBwbGFuZXMgYXJlIGFsd2F5cyBlbmFibGVkLiAqLwo+IC0JcC0+cHJpLmVuYWJsZWQgPSB0 cnVlOwo+IC0JcC0+Y3VyLmVuYWJsZWQgPSB0cnVlOwo+Cj4gICAJZHJtX2Zvcl9lYWNoX2xlZ2Fj eV9wbGFuZShwbGFuZSwgJmRldi0+bW9kZV9jb25maWcucGxhbmVfbGlzdCkgewo+ICAgCQlzdHJ1 Y3QgaW50ZWxfcGxhbmUgKmludGVsX3BsYW5lID0gdG9faW50ZWxfcGxhbmUocGxhbmUpOwo+IEBA IC0yNzM0LDI3ICsyNzQ2LDMxIEBAIHN0YXRpYyB2b2lkIHNrbF9jb21wdXRlX3dtX3BpcGVfcGFy YW1ldGVycyhzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCj4gICAJCXAtPnBpcGVfaHRvdGFsID0gaW50 ZWxfY3J0Yy0+Y29uZmlnLT5iYXNlLmFkanVzdGVkX21vZGUuY3J0Y19odG90YWw7Cj4gICAJCXAt PnBpeGVsX3JhdGUgPSBza2xfcGlwZV9waXhlbF9yYXRlKGludGVsX2NydGMtPmNvbmZpZyk7Cj4K PiAtCQkvKgo+IC0JCSAqIEZvciBub3csIGFzc3VtZSBwcmltYXJ5IGFuZCBjdXJzb3IgcGxhbmVz IGFyZSBhbHdheXMgZW5hYmxlZC4KPiAtCQkgKi8KPiAtCQlwLT5wbGFuZVswXS5lbmFibGVkID0g dHJ1ZTsKPiAtCQlwLT5wbGFuZVswXS5ieXRlc19wZXJfcGl4ZWwgPQo+IC0JCQljcnRjLT5wcmlt YXJ5LT5zdGF0ZS0+ZmItPmJpdHNfcGVyX3BpeGVsIC8gODsKPiAtCQlwLT5wbGFuZVswXS5ob3Jp el9waXhlbHMgPSBpbnRlbF9jcnRjLT5jb25maWctPnBpcGVfc3JjX3c7Cj4gLQkJcC0+cGxhbmVb MF0udmVydF9waXhlbHMgPSBpbnRlbF9jcnRjLT5jb25maWctPnBpcGVfc3JjX2g7Cj4gLQkJcC0+ cGxhbmVbMF0udGlsaW5nID0gRFJNX0ZPUk1BVF9NT0RfTk9ORTsKPiAgIAkJZmIgPSBjcnRjLT5w cmltYXJ5LT5zdGF0ZS0+ZmI7Cj4gLQkJLyoKPiAtCQkgKiBGcmFtZWJ1ZmZlciBjYW4gYmUgTlVM TCBvbiBwbGFuZSBkaXNhYmxlLCBidXQgaXQgZG9lcyBub3QKPiAtCQkgKiBtYXR0ZXIgZm9yIHdh dGVybWFya3MgaWYgd2UgYXNzdW1lIG5vIHRpbGluZyBpbiB0aGF0IGNhc2UuCj4gLQkJICovCj4g LQkJaWYgKGZiKQo+ICsJCWlmIChmYikgewo+ICsJCQlwLT5wbGFuZVswXS5lbmFibGVkID0gdHJ1 ZTsKPiArCQkJcC0+cGxhbmVbMF0uYnl0ZXNfcGVyX3BpeGVsID0gZmItPmJpdHNfcGVyX3BpeGVs IC8gODsKPiAgIAkJCXAtPnBsYW5lWzBdLnRpbGluZyA9IGZiLT5tb2RpZmllclswXTsKPiArCQl9 IGVsc2Ugewo+ICsJCQlwLT5wbGFuZVswXS5lbmFibGVkID0gZmFsc2U7Cj4gKwkJCXAtPnBsYW5l WzBdLmJ5dGVzX3Blcl9waXhlbCA9IDA7Cj4gKwkJCXAtPnBsYW5lWzBdLnRpbGluZyA9IERSTV9G T1JNQVRfTU9EX05PTkU7Cj4gKwkJfQo+ICsJCXAtPnBsYW5lWzBdLmhvcml6X3BpeGVscyA9IGlu dGVsX2NydGMtPmNvbmZpZy0+cGlwZV9zcmNfdzsKPiArCQlwLT5wbGFuZVswXS52ZXJ0X3BpeGVs cyA9IGludGVsX2NydGMtPmNvbmZpZy0+cGlwZV9zcmNfaDsKPgo+IC0JCXAtPmN1cnNvci5lbmFi bGVkID0gdHJ1ZTsKPiAtCQlwLT5jdXJzb3IuYnl0ZXNfcGVyX3BpeGVsID0gNDsKPiAtCQlwLT5j dXJzb3IuaG9yaXpfcGl4ZWxzID0gaW50ZWxfY3J0Yy0+YmFzZS5jdXJzb3ItPnN0YXRlLT5jcnRj X3cgPwo+IC0JCQkJCSBpbnRlbF9jcnRjLT5iYXNlLmN1cnNvci0+c3RhdGUtPmNydGNfdyA6IDY0 Owo+ICsJCWZiID0gY3J0Yy0+Y3Vyc29yLT5zdGF0ZS0+ZmI7Cj4gKwkJaWYgKGZiKSB7Cj4gKwkJ CXAtPmN1cnNvci5lbmFibGVkID0gdHJ1ZTsKPiArCQkJcC0+Y3Vyc29yLmJ5dGVzX3Blcl9waXhl bCA9IGZiLT5iaXRzX3Blcl9waXhlbCAvIDg7Cj4gKwkJCXAtPmN1cnNvci5ob3Jpel9waXhlbHMg PSBjcnRjLT5jdXJzb3ItPnN0YXRlLT5jcnRjX3c7Cj4gKwkJCXAtPmN1cnNvci52ZXJ0X3BpeGVs cyA9IGNydGMtPmN1cnNvci0+c3RhdGUtPmNydGNfaDsKPiArCQl9IGVsc2Ugewo+ICsJCQlwLT5j dXJzb3IuZW5hYmxlZCA9IGZhbHNlOwo+ICsJCQlwLT5jdXJzb3IuYnl0ZXNfcGVyX3BpeGVsID0g MDsKPiArCQkJcC0+Y3Vyc29yLmhvcml6X3BpeGVscyA9IDY0Owo+ICsJCQlwLT5jdXJzb3IudmVy dF9waXhlbHMgPSA2NDsKPiArCQl9Cj4gICAJfQo+Cj4gICAJbGlzdF9mb3JfZWFjaF9lbnRyeShw bGFuZSwgJmRldi0+bW9kZV9jb25maWcucGxhbmVfbGlzdCwgaGVhZCkgewo+CgpJIHdhcyBuZXJ2 b3VzIGFib3V0IGEgbmV3IHBvc3NpYmlsaXR5IG9mIGJ5dGVzX3Blcl9waXhlbCBiZWluZyB6ZXJv IHNvIApsb29rZWQgaWYgc29tZW9uZSBjb3VsZCBkaXZpZGUgYnkgaXQuIGlsa193bV9mYmMgY2Fu LCBidXQgaXMgZ2F0ZWQgYnkgCnByaS5lbmFibGVkIHNvIHRoYXQgaXMgZmluZSBhbmQgSSBkaWRu J3QgZmluZCBhbnkgb3RoZXIgc2ltaWxhciBwbGFjZXMuCgpHaXZlbiB0aGF0LCBpdCBsb29rcyBm aW5lIHRvIG1lLgoKUmV2aWV3ZWQtYnk6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBp bnRlbC5jb20+CgpSZWdhcmRzLAoKVHZydGtvCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3Rz LmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlz dGluZm8vaW50ZWwtZ2Z4Cg==