From: Daniel Vetter Subject: Re: [PATCH 3/3] drm/i915: Don't assume primary & cursor are always on for wm calculation (v4) Date: Tue, 10 Mar 2015 14:09:57 +0100 Message-ID: <20150310130957.GR3800@phenom.ffwll.local> References: <20150309175729.GB11371@intel.com> <1425924362-28582-1-git-send-email-matthew.d.roper@intel.com> <54FECCB6.5020604@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wi0-f176.google.com (mail-wi0-f176.google.com [209.85.212.176]) by gabe.freedesktop.org (Postfix) with ESMTP id 3DF72720A2 for ; Tue, 10 Mar 2015 06:08:18 -0700 (PDT) Received: by wivr20 with SMTP id r20so2809122wiv.3 for ; Tue, 10 Mar 2015 06:08:17 -0700 (PDT) Content-Disposition: inline In-Reply-To: <54FECCB6.5020604@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: Tvrtko Ursulin Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org T24gVHVlLCBNYXIgMTAsIDIwMTUgYXQgMTA6NTE6MzRBTSArMDAwMCwgVHZydGtvIFVyc3VsaW4g d3JvdGU6Cj4gCj4gT24gMDMvMDkvMjAxNSAwNjowNiBQTSwgTWF0dCBSb3BlciB3cm90ZToKPiA+ Q3VycmVudCBJTEstc3R5bGUgd2F0ZXJtYXJrIGNvZGUgYXNzdW1lcyB0aGUgcHJpbWFyeSBwbGFu ZSBhbmQgY3Vyc29yCj4gPnBsYW5lIGFyZSBhbHdheXMgZW5hYmxlZC4gIFRoaXMgYXNzdW1wdGlv biwgYWxvbmcgd2l0aCB0aGUgY29tYmluYXRpb24KPiA+b2YgdHdvIGluZGVwZW5kZW50IGNvbW1p dHMgdGhhdCBnb3QgbWVyZ2VkIGF0IHRoZSBzYW1lIHRpbWUsIHJlc3VsdHMgaW4KPiA+YSBOVUxM IGRlcmVmZXJlbmNlLiAgVGhlIG9mZmVuZGluZyBjb21taXRzIGFyZToKPiA+Cj4gPiAgICAgICAg IGNvbW1pdCBmZDJkNjEzNDFiZjM5ZDEwNTQyNTZjMDdkNmVkZGQ2MjRlYmM0MjQxCj4gPiAgICAg ICAgIEF1dGhvcjogTWF0dCBSb3BlciA8bWF0dGhldy5kLnJvcGVyQGludGVsLmNvbT4KPiA+ICAg ICAgICAgRGF0ZTogICBGcmkgRmViIDI3IDEwOjEyOjAxIDIwMTUgLTA4MDAKPiA+Cj4gPiAgICAg ICAgICAgICBkcm0vaTkxNTogVXNlIHBsYW5lLT5zdGF0ZS0+ZmIgaW4gd2F0ZXJtYXJrIGNvZGUg KHYyKQo+ID4KPiA+YW5kCj4gPgo+ID4gICAgICAgICBjb21taXQgMGZkYTY1NjgwZTkyNTQ1Y2Fl YTViZTc4MDVhN2YwYTYxN2ZiNmMyMAo+ID4gICAgICAgICBBdXRob3I6IFR2cnRrbyBVcnN1bGlu IDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+Cj4gPiAgICAgICAgIERhdGU6ICAgRnJpIEZlYiAy NyAxNToxMjozNSAyMDE1ICswMDAwCj4gPgo+ID4gICAgICAgICAgICAgZHJtL2k5MTUvc2tsOiBV cGRhdGUgd2F0ZXJtYXJrcyBmb3IgWSB0aWxpbmcKPiA+Cj4gPlRoZSBmaXJzdCBjb21taXQgY2F1 c2VzIHVzIHRvIHVzZSB0aGUgRkIgZnJvbSBwbGFuZS0+c3RhdGUtPmZiIHJhdGhlcgo+ID50aGFu IHRoZSBsZWdhY3kgcGxhbmUtPmZiLCB3aGljaCBpcyB1cGRhdGVkIGEgYml0IGxhdGVyIGluIHRo ZSBwcm9jZXNzLgo+ID4KPiA+VGhlIHNlY29uZCBjb21taXQgaW5jbHVkZXMgYSBjaGFuZ2UgdGhh dCBub3cgdHJpZ2dlcnMgd2F0ZXJtYXJrCj4gPnJlcHJvZ3JhbW1pbmcgb24gcHJpbWFyeSBwbGFu ZSBlbmFibGUvZGlzYWJsZSB3aGVyZSB3ZSBkaWRuJ3QgaGF2ZSBvbmUKPiA+YmVmb3JlICh3aGlj aCB3YXNuJ3QgcmVhbGx5IGNvcnJlY3QsIGJ1dCB3ZSBoYWQgYmVlbiBnZXR0aW5nIGx1Y2t5Cj4g PmJlY2F1c2Ugd2UgYWx3YXlzIGNhbGN1bGF0ZWQgYXMgaWYgdGhlIHByaW1hcnkgcGxhbmUgd2Fz IG9uKS4KPiA+Cj4gPlRvZ2V0aGVyLCB0aGVzZSB0d28gY29tbWl0cyBjYXVzZSB0aGUgd2F0ZXJt YXJrIGNhbGN1bGF0aW9uIHRvCj4gPihwcm9wZXJseSkgc2VlIHBsYW5lLT5zdGF0ZS0+ZmIgPSBO VUxMIHdoZW4gd2UncmUgaW4gdGhlIHByb2Nlc3Mgb2YKPiA+ZGlzYWJsaW5nIHRoZSBwcmltYXJ5 IHBsYW5lLiAgSG93ZXZlciB0aGUgZXhpc3Rpbmcgd2F0ZXJtYXJrIGNvZGUKPiA+YXNzdW1lcyB0 aGVyZSdzIGFsd2F5cyBhIHByaW1hcnkgZmIgYW5kIHRyaWVzIHRvIGRlcmVmZXJlbmNlIGl0IHRv IGZpbmQKPiA+b3V0IHBpeGVsIGZvcm1hdCAvIGJwcCBpbmZvcm1hdGlvbi4KPiA+Cj4gPlRoZSBm aXggaXMgdG8gbWFrZSBJTEstc3R5bGUgd2F0ZXJtYXJrIGNhbGN1bGF0aW9uIGFjdHVhbGx5IGNo ZWNrIHRoZQo+ID50cnVlIHN0YXR1cyBvZiBwcmltYXJ5ICYgY3Vyc29yIHBsYW5lcyBhbmQgYWRq dXN0IG91ciB3YXRlcm1hcmsgbG9naWMKPiA+YWNjb3JkaW5nbHkuCj4gPgo+ID52MjogVXBkYXRl IHVuY2hlY2tlZCB1c2VzIG9mIHN0YXRlLT5mYiBmb3Igb3RoZXIgcGxhdGZvcm1zIChwbnYsIHNr bCwKPiA+ICAgICBldGMuKS4gIE5vdGUgdGhhdCB0aGlzIGlzIGp1c3QgYSB0ZW1wb3JhcnkgZml4 LiAgVWx0aW1hdGVseSB0aGUKPiA+ICAgICB1c2VmdWwgaW5mb3JtYXRpb24gaXMgZ29pbmcgdG8g YmUgY29tcHV0ZWQgYXQgY2hlY2sgdGltZSBhbmQgc3RvcmVkCj4gPiAgICAgcmlnaHQgaW4gdGhl IHN0YXRlIHN0cnVjdHVyZXMgc28gdGhhdCB3ZSBkb24ndCBoYXZlIHRvIGZpZ3VyZSB0aGlzCj4g PiAgICAgYWxsIG91dCB3aGlsZSB3ZSdyZSBzdXBwb3NlZCB0byBiZSBwcm9ncmFtbWluZyB0aGUg d2F0ZXJtYXJrcy4KPiA+ICAgICAoY2F1Z2h0IGJ5IFR2cnRrbykKPiA+Cj4gPnYzOiBGaXggYSBj b3VwbGUgY29weS9wYXN0ZSBtaXN0YWtlcyBpbiBTS0wgY29kZS4gKFR2cnRrbykKPiA+Cj4gPnY0 OiBPbmx5IGFkZCBGQiBjaGVja3MgZm9yIElMSy9TS0wgY29kZXBhdGhzLiAgT2xkZXIgcGxhdGZv cm1zIHN0aWxsIHVzZQo+ID4gICAgIGludGVsX2NydGNfYWN0aXZlKCkgYW5kIHdpbGwgc2hvcnRj aXJjdWl0IG91dCBvZiB3YXRlcm1hcmsKPiA+ICAgICBjYWxjdWxhdGlvbnMgYmVmb3JlIGV2ZXIg dHJ5aW5nIHRvIGRlcmVmZXJlbmNlIHRoZSBwcmltYXJ5IHBsYW5lJ3MKPiA+ICAgICBmcmFtZWJ1 ZmZlci4KPiA+Cj4gPkNjOiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29t Pgo+ID5SZXBvcnRlZC1ieTogTWljaGFlbCBMZXVjaHRlbmJ1cmcgPG1pY2hhZWxAc2xhc2hob21l Lm9yZz4KPiA+QnVnemlsbGE6IGh0dHBzOi8vYnVncy5mcmVlZGVza3RvcC5vcmcvc2hvd19idWcu Y2dpP2lkPTg5Mzg4Cj4gPlNpZ25lZC1vZmYtYnk6IE1hdHQgUm9wZXIgPG1hdHRoZXcuZC5yb3Bl ckBpbnRlbC5jb20+Cj4gPi0tLQo+ID4gIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMg fCA2MiArKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLQo+ID4gIDEgZmls ZSBjaGFuZ2VkLCAzOSBpbnNlcnRpb25zKCspLCAyMyBkZWxldGlvbnMoLSkKPiA+Cj4gPmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfcG0uYwo+ID5pbmRleCBhMDZhMmM3Li43NTY2Y2VjIDEwMDY0NAo+ID4tLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCj4gPisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX3BtLmMKPiA+QEAgLTE5NjIsMTMgKzE5NjIsMjUgQEAgc3RhdGljIHZvaWQg aWxrX2NvbXB1dGVfd21fcGFyYW1ldGVycyhzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCj4gPiAgCXAt PmFjdGl2ZSA9IHRydWU7Cj4gPiAgCXAtPnBpcGVfaHRvdGFsID0gaW50ZWxfY3J0Yy0+Y29uZmln LT5iYXNlLmFkanVzdGVkX21vZGUuY3J0Y19odG90YWw7Cj4gPiAgCXAtPnBpeGVsX3JhdGUgPSBp bGtfcGlwZV9waXhlbF9yYXRlKGRldiwgY3J0Yyk7Cj4gPi0JcC0+cHJpLmJ5dGVzX3Blcl9waXhl bCA9IGNydGMtPnByaW1hcnktPnN0YXRlLT5mYi0+Yml0c19wZXJfcGl4ZWwgLyA4Owo+ID4tCXAt PmN1ci5ieXRlc19wZXJfcGl4ZWwgPSA0Owo+ID4rCj4gPisJaWYgKGNydGMtPnByaW1hcnktPnN0 YXRlLT5mYikgewo+ID4rCQlwLT5wcmkuZW5hYmxlZCA9IHRydWU7Cj4gPisJCXAtPnByaS5ieXRl c19wZXJfcGl4ZWwgPQo+ID4rCQkJY3J0Yy0+cHJpbWFyeS0+c3RhdGUtPmZiLT5iaXRzX3Blcl9w aXhlbCAvIDg7Cj4gPisJfSBlbHNlIHsKPiA+KwkJcC0+cHJpLmVuYWJsZWQgPSBmYWxzZTsKPiA+ KwkJcC0+cHJpLmJ5dGVzX3Blcl9waXhlbCA9IDA7Cj4gPisJfQo+ID4rCj4gPisJaWYgKGNydGMt PmN1cnNvci0+c3RhdGUtPmZiKSB7Cj4gPisJCXAtPmN1ci5lbmFibGVkID0gdHJ1ZTsKPiA+KwkJ cC0+Y3VyLmJ5dGVzX3Blcl9waXhlbCA9IDQ7Cj4gPisJfSBlbHNlIHsKPiA+KwkJcC0+Y3VyLmVu YWJsZWQgPSBmYWxzZTsKPiA+KwkJcC0+Y3VyLmJ5dGVzX3Blcl9waXhlbCA9IDA7Cj4gPisJfQo+ ID4gIAlwLT5wcmkuaG9yaXpfcGl4ZWxzID0gaW50ZWxfY3J0Yy0+Y29uZmlnLT5waXBlX3NyY193 Owo+ID4gIAlwLT5jdXIuaG9yaXpfcGl4ZWxzID0gaW50ZWxfY3J0Yy0+YmFzZS5jdXJzb3ItPnN0 YXRlLT5jcnRjX3c7Cj4gPi0JLyogVE9ETzogZm9yIG5vdywgYXNzdW1lIHByaW1hcnkgYW5kIGN1 cnNvciBwbGFuZXMgYXJlIGFsd2F5cyBlbmFibGVkLiAqLwo+ID4tCXAtPnByaS5lbmFibGVkID0g dHJ1ZTsKPiA+LQlwLT5jdXIuZW5hYmxlZCA9IHRydWU7Cj4gPgo+ID4gIAlkcm1fZm9yX2VhY2hf bGVnYWN5X3BsYW5lKHBsYW5lLCAmZGV2LT5tb2RlX2NvbmZpZy5wbGFuZV9saXN0KSB7Cj4gPiAg CQlzdHJ1Y3QgaW50ZWxfcGxhbmUgKmludGVsX3BsYW5lID0gdG9faW50ZWxfcGxhbmUocGxhbmUp Owo+ID5AQCAtMjczNCwyNyArMjc0NiwzMSBAQCBzdGF0aWMgdm9pZCBza2xfY29tcHV0ZV93bV9w aXBlX3BhcmFtZXRlcnMoc3RydWN0IGRybV9jcnRjICpjcnRjLAo+ID4gIAkJcC0+cGlwZV9odG90 YWwgPSBpbnRlbF9jcnRjLT5jb25maWctPmJhc2UuYWRqdXN0ZWRfbW9kZS5jcnRjX2h0b3RhbDsK PiA+ICAJCXAtPnBpeGVsX3JhdGUgPSBza2xfcGlwZV9waXhlbF9yYXRlKGludGVsX2NydGMtPmNv bmZpZyk7Cj4gPgo+ID4tCQkvKgo+ID4tCQkgKiBGb3Igbm93LCBhc3N1bWUgcHJpbWFyeSBhbmQg Y3Vyc29yIHBsYW5lcyBhcmUgYWx3YXlzIGVuYWJsZWQuCj4gPi0JCSAqLwo+ID4tCQlwLT5wbGFu ZVswXS5lbmFibGVkID0gdHJ1ZTsKPiA+LQkJcC0+cGxhbmVbMF0uYnl0ZXNfcGVyX3BpeGVsID0K PiA+LQkJCWNydGMtPnByaW1hcnktPnN0YXRlLT5mYi0+Yml0c19wZXJfcGl4ZWwgLyA4Owo+ID4t CQlwLT5wbGFuZVswXS5ob3Jpel9waXhlbHMgPSBpbnRlbF9jcnRjLT5jb25maWctPnBpcGVfc3Jj X3c7Cj4gPi0JCXAtPnBsYW5lWzBdLnZlcnRfcGl4ZWxzID0gaW50ZWxfY3J0Yy0+Y29uZmlnLT5w aXBlX3NyY19oOwo+ID4tCQlwLT5wbGFuZVswXS50aWxpbmcgPSBEUk1fRk9STUFUX01PRF9OT05F Owo+ID4gIAkJZmIgPSBjcnRjLT5wcmltYXJ5LT5zdGF0ZS0+ZmI7Cj4gPi0JCS8qCj4gPi0JCSAq IEZyYW1lYnVmZmVyIGNhbiBiZSBOVUxMIG9uIHBsYW5lIGRpc2FibGUsIGJ1dCBpdCBkb2VzIG5v dAo+ID4tCQkgKiBtYXR0ZXIgZm9yIHdhdGVybWFya3MgaWYgd2UgYXNzdW1lIG5vIHRpbGluZyBp biB0aGF0IGNhc2UuCj4gPi0JCSAqLwo+ID4tCQlpZiAoZmIpCj4gPisJCWlmIChmYikgewo+ID4r CQkJcC0+cGxhbmVbMF0uZW5hYmxlZCA9IHRydWU7Cj4gPisJCQlwLT5wbGFuZVswXS5ieXRlc19w ZXJfcGl4ZWwgPSBmYi0+Yml0c19wZXJfcGl4ZWwgLyA4Owo+ID4gIAkJCXAtPnBsYW5lWzBdLnRp bGluZyA9IGZiLT5tb2RpZmllclswXTsKPiA+KwkJfSBlbHNlIHsKPiA+KwkJCXAtPnBsYW5lWzBd LmVuYWJsZWQgPSBmYWxzZTsKPiA+KwkJCXAtPnBsYW5lWzBdLmJ5dGVzX3Blcl9waXhlbCA9IDA7 Cj4gPisJCQlwLT5wbGFuZVswXS50aWxpbmcgPSBEUk1fRk9STUFUX01PRF9OT05FOwo+ID4rCQl9 Cj4gPisJCXAtPnBsYW5lWzBdLmhvcml6X3BpeGVscyA9IGludGVsX2NydGMtPmNvbmZpZy0+cGlw ZV9zcmNfdzsKPiA+KwkJcC0+cGxhbmVbMF0udmVydF9waXhlbHMgPSBpbnRlbF9jcnRjLT5jb25m aWctPnBpcGVfc3JjX2g7Cj4gPgo+ID4tCQlwLT5jdXJzb3IuZW5hYmxlZCA9IHRydWU7Cj4gPi0J CXAtPmN1cnNvci5ieXRlc19wZXJfcGl4ZWwgPSA0Owo+ID4tCQlwLT5jdXJzb3IuaG9yaXpfcGl4 ZWxzID0gaW50ZWxfY3J0Yy0+YmFzZS5jdXJzb3ItPnN0YXRlLT5jcnRjX3cgPwo+ID4tCQkJCQkg aW50ZWxfY3J0Yy0+YmFzZS5jdXJzb3ItPnN0YXRlLT5jcnRjX3cgOiA2NDsKPiA+KwkJZmIgPSBj cnRjLT5jdXJzb3ItPnN0YXRlLT5mYjsKPiA+KwkJaWYgKGZiKSB7Cj4gPisJCQlwLT5jdXJzb3Iu ZW5hYmxlZCA9IHRydWU7Cj4gPisJCQlwLT5jdXJzb3IuYnl0ZXNfcGVyX3BpeGVsID0gZmItPmJp dHNfcGVyX3BpeGVsIC8gODsKPiA+KwkJCXAtPmN1cnNvci5ob3Jpel9waXhlbHMgPSBjcnRjLT5j dXJzb3ItPnN0YXRlLT5jcnRjX3c7Cj4gPisJCQlwLT5jdXJzb3IudmVydF9waXhlbHMgPSBjcnRj LT5jdXJzb3ItPnN0YXRlLT5jcnRjX2g7Cj4gPisJCX0gZWxzZSB7Cj4gPisJCQlwLT5jdXJzb3Iu ZW5hYmxlZCA9IGZhbHNlOwo+ID4rCQkJcC0+Y3Vyc29yLmJ5dGVzX3Blcl9waXhlbCA9IDA7Cj4g PisJCQlwLT5jdXJzb3IuaG9yaXpfcGl4ZWxzID0gNjQ7Cj4gPisJCQlwLT5jdXJzb3IudmVydF9w aXhlbHMgPSA2NDsKPiA+KwkJfQo+ID4gIAl9Cj4gPgo+ID4gIAlsaXN0X2Zvcl9lYWNoX2VudHJ5 KHBsYW5lLCAmZGV2LT5tb2RlX2NvbmZpZy5wbGFuZV9saXN0LCBoZWFkKSB7Cj4gPgo+IAo+IEkg d2FzIG5lcnZvdXMgYWJvdXQgYSBuZXcgcG9zc2liaWxpdHkgb2YgYnl0ZXNfcGVyX3BpeGVsIGJl aW5nIHplcm8gc28KPiBsb29rZWQgaWYgc29tZW9uZSBjb3VsZCBkaXZpZGUgYnkgaXQuIGlsa193 bV9mYmMgY2FuLCBidXQgaXMgZ2F0ZWQgYnkKPiBwcmkuZW5hYmxlZCBzbyB0aGF0IGlzIGZpbmUg YW5kIEkgZGlkbid0IGZpbmQgYW55IG90aGVyIHNpbWlsYXIgcGxhY2VzLgo+IAo+IEdpdmVuIHRo YXQsIGl0IGxvb2tzIGZpbmUgdG8gbWUuCj4gCj4gUmV2aWV3ZWQtYnk6IFR2cnRrbyBVcnN1bGlu IDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+CgpRdWV1ZWQgZm9yIC1uZXh0LCB0aGFua3MgZm9y IHRoZSBwYXRjaC4KLURhbmllbAotLSAKRGFuaWVsIFZldHRlcgpTb2Z0d2FyZSBFbmdpbmVlciwg SW50ZWwgQ29ycG9yYXRpb24KKzQxICgwKSA3OSAzNjUgNTcgNDggLSBodHRwOi8vYmxvZy5mZnds bC5jaApfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRl bC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDov L2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=