From: Matt Roper Subject: [PATCH 3/3] drm/i915: Don't assume primary & cursor are always on for wm calculation (v4) Date: Mon, 9 Mar 2015 11:06:02 -0700 Message-ID: <1425924362-28582-1-git-send-email-matthew.d.roper@intel.com> References: <20150309175729.GB11371@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 4ECCF6E569 for ; Mon, 9 Mar 2015 11:09:54 -0700 (PDT) In-Reply-To: <20150309175729.GB11371@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org Q3VycmVudCBJTEstc3R5bGUgd2F0ZXJtYXJrIGNvZGUgYXNzdW1lcyB0aGUgcHJpbWFyeSBwbGFu ZSBhbmQgY3Vyc29yCnBsYW5lIGFyZSBhbHdheXMgZW5hYmxlZC4gIFRoaXMgYXNzdW1wdGlvbiwg YWxvbmcgd2l0aCB0aGUgY29tYmluYXRpb24Kb2YgdHdvIGluZGVwZW5kZW50IGNvbW1pdHMgdGhh dCBnb3QgbWVyZ2VkIGF0IHRoZSBzYW1lIHRpbWUsIHJlc3VsdHMgaW4KYSBOVUxMIGRlcmVmZXJl bmNlLiAgVGhlIG9mZmVuZGluZyBjb21taXRzIGFyZToKCiAgICAgICAgY29tbWl0IGZkMmQ2MTM0 MWJmMzlkMTA1NDI1NmMwN2Q2ZWRkZDYyNGViYzQyNDEKICAgICAgICBBdXRob3I6IE1hdHQgUm9w ZXIgPG1hdHRoZXcuZC5yb3BlckBpbnRlbC5jb20+CiAgICAgICAgRGF0ZTogICBGcmkgRmViIDI3 IDEwOjEyOjAxIDIwMTUgLTA4MDAKCiAgICAgICAgICAgIGRybS9pOTE1OiBVc2UgcGxhbmUtPnN0 YXRlLT5mYiBpbiB3YXRlcm1hcmsgY29kZSAodjIpCgphbmQKCiAgICAgICAgY29tbWl0IDBmZGE2 NTY4MGU5MjU0NWNhZWE1YmU3ODA1YTdmMGE2MTdmYjZjMjAKICAgICAgICBBdXRob3I6IFR2cnRr byBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+CiAgICAgICAgRGF0ZTogICBGcmkg RmViIDI3IDE1OjEyOjM1IDIwMTUgKzAwMDAKCiAgICAgICAgICAgIGRybS9pOTE1L3NrbDogVXBk YXRlIHdhdGVybWFya3MgZm9yIFkgdGlsaW5nCgpUaGUgZmlyc3QgY29tbWl0IGNhdXNlcyB1cyB0 byB1c2UgdGhlIEZCIGZyb20gcGxhbmUtPnN0YXRlLT5mYiByYXRoZXIKdGhhbiB0aGUgbGVnYWN5 IHBsYW5lLT5mYiwgd2hpY2ggaXMgdXBkYXRlZCBhIGJpdCBsYXRlciBpbiB0aGUgcHJvY2Vzcy4K ClRoZSBzZWNvbmQgY29tbWl0IGluY2x1ZGVzIGEgY2hhbmdlIHRoYXQgbm93IHRyaWdnZXJzIHdh dGVybWFyawpyZXByb2dyYW1taW5nIG9uIHByaW1hcnkgcGxhbmUgZW5hYmxlL2Rpc2FibGUgd2hl cmUgd2UgZGlkbid0IGhhdmUgb25lCmJlZm9yZSAod2hpY2ggd2Fzbid0IHJlYWxseSBjb3JyZWN0 LCBidXQgd2UgaGFkIGJlZW4gZ2V0dGluZyBsdWNreQpiZWNhdXNlIHdlIGFsd2F5cyBjYWxjdWxh dGVkIGFzIGlmIHRoZSBwcmltYXJ5IHBsYW5lIHdhcyBvbikuCgpUb2dldGhlciwgdGhlc2UgdHdv IGNvbW1pdHMgY2F1c2UgdGhlIHdhdGVybWFyayBjYWxjdWxhdGlvbiB0bwoocHJvcGVybHkpIHNl ZSBwbGFuZS0+c3RhdGUtPmZiID0gTlVMTCB3aGVuIHdlJ3JlIGluIHRoZSBwcm9jZXNzIG9mCmRp c2FibGluZyB0aGUgcHJpbWFyeSBwbGFuZS4gIEhvd2V2ZXIgdGhlIGV4aXN0aW5nIHdhdGVybWFy ayBjb2RlCmFzc3VtZXMgdGhlcmUncyBhbHdheXMgYSBwcmltYXJ5IGZiIGFuZCB0cmllcyB0byBk ZXJlZmVyZW5jZSBpdCB0byBmaW5kCm91dCBwaXhlbCBmb3JtYXQgLyBicHAgaW5mb3JtYXRpb24u CgpUaGUgZml4IGlzIHRvIG1ha2UgSUxLLXN0eWxlIHdhdGVybWFyayBjYWxjdWxhdGlvbiBhY3R1 YWxseSBjaGVjayB0aGUKdHJ1ZSBzdGF0dXMgb2YgcHJpbWFyeSAmIGN1cnNvciBwbGFuZXMgYW5k IGFkanVzdCBvdXIgd2F0ZXJtYXJrIGxvZ2ljCmFjY29yZGluZ2x5LgoKdjI6IFVwZGF0ZSB1bmNo ZWNrZWQgdXNlcyBvZiBzdGF0ZS0+ZmIgZm9yIG90aGVyIHBsYXRmb3JtcyAocG52LCBza2wsCiAg ICBldGMuKS4gIE5vdGUgdGhhdCB0aGlzIGlzIGp1c3QgYSB0ZW1wb3JhcnkgZml4LiAgVWx0aW1h dGVseSB0aGUKICAgIHVzZWZ1bCBpbmZvcm1hdGlvbiBpcyBnb2luZyB0byBiZSBjb21wdXRlZCBh dCBjaGVjayB0aW1lIGFuZCBzdG9yZWQKICAgIHJpZ2h0IGluIHRoZSBzdGF0ZSBzdHJ1Y3R1cmVz IHNvIHRoYXQgd2UgZG9uJ3QgaGF2ZSB0byBmaWd1cmUgdGhpcwogICAgYWxsIG91dCB3aGlsZSB3 ZSdyZSBzdXBwb3NlZCB0byBiZSBwcm9ncmFtbWluZyB0aGUgd2F0ZXJtYXJrcy4KICAgIChjYXVn aHQgYnkgVHZydGtvKQoKdjM6IEZpeCBhIGNvdXBsZSBjb3B5L3Bhc3RlIG1pc3Rha2VzIGluIFNL TCBjb2RlLiAoVHZydGtvKQoKdjQ6IE9ubHkgYWRkIEZCIGNoZWNrcyBmb3IgSUxLL1NLTCBjb2Rl cGF0aHMuICBPbGRlciBwbGF0Zm9ybXMgc3RpbGwgdXNlCiAgICBpbnRlbF9jcnRjX2FjdGl2ZSgp IGFuZCB3aWxsIHNob3J0Y2lyY3VpdCBvdXQgb2Ygd2F0ZXJtYXJrCiAgICBjYWxjdWxhdGlvbnMg YmVmb3JlIGV2ZXIgdHJ5aW5nIHRvIGRlcmVmZXJlbmNlIHRoZSBwcmltYXJ5IHBsYW5lJ3MKICAg IGZyYW1lYnVmZmVyLgoKQ2M6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5j b20+ClJlcG9ydGVkLWJ5OiBNaWNoYWVsIExldWNodGVuYnVyZyA8bWljaGFlbEBzbGFzaGhvbWUu b3JnPgpCdWd6aWxsYTogaHR0cHM6Ly9idWdzLmZyZWVkZXNrdG9wLm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9ODkzODgKU2lnbmVkLW9mZi1ieTogTWF0dCBSb3BlciA8bWF0dGhldy5kLnJvcGVyQGludGVs LmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jIHwgNjIgKysrKysrKysr KysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAzOSBpbnNl cnRpb25zKCspLCAyMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9wbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwppbmRleCBh MDZhMmM3Li43NTY2Y2VjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9w bS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKQEAgLTE5NjIsMTMgKzE5 NjIsMjUgQEAgc3RhdGljIHZvaWQgaWxrX2NvbXB1dGVfd21fcGFyYW1ldGVycyhzdHJ1Y3QgZHJt X2NydGMgKmNydGMsCiAJcC0+YWN0aXZlID0gdHJ1ZTsKIAlwLT5waXBlX2h0b3RhbCA9IGludGVs X2NydGMtPmNvbmZpZy0+YmFzZS5hZGp1c3RlZF9tb2RlLmNydGNfaHRvdGFsOwogCXAtPnBpeGVs X3JhdGUgPSBpbGtfcGlwZV9waXhlbF9yYXRlKGRldiwgY3J0Yyk7Ci0JcC0+cHJpLmJ5dGVzX3Bl cl9waXhlbCA9IGNydGMtPnByaW1hcnktPnN0YXRlLT5mYi0+Yml0c19wZXJfcGl4ZWwgLyA4Owot CXAtPmN1ci5ieXRlc19wZXJfcGl4ZWwgPSA0OworCisJaWYgKGNydGMtPnByaW1hcnktPnN0YXRl LT5mYikgeworCQlwLT5wcmkuZW5hYmxlZCA9IHRydWU7CisJCXAtPnByaS5ieXRlc19wZXJfcGl4 ZWwgPQorCQkJY3J0Yy0+cHJpbWFyeS0+c3RhdGUtPmZiLT5iaXRzX3Blcl9waXhlbCAvIDg7CisJ fSBlbHNlIHsKKwkJcC0+cHJpLmVuYWJsZWQgPSBmYWxzZTsKKwkJcC0+cHJpLmJ5dGVzX3Blcl9w aXhlbCA9IDA7CisJfQorCisJaWYgKGNydGMtPmN1cnNvci0+c3RhdGUtPmZiKSB7CisJCXAtPmN1 ci5lbmFibGVkID0gdHJ1ZTsKKwkJcC0+Y3VyLmJ5dGVzX3Blcl9waXhlbCA9IDQ7CisJfSBlbHNl IHsKKwkJcC0+Y3VyLmVuYWJsZWQgPSBmYWxzZTsKKwkJcC0+Y3VyLmJ5dGVzX3Blcl9waXhlbCA9 IDA7CisJfQogCXAtPnByaS5ob3Jpel9waXhlbHMgPSBpbnRlbF9jcnRjLT5jb25maWctPnBpcGVf c3JjX3c7CiAJcC0+Y3VyLmhvcml6X3BpeGVscyA9IGludGVsX2NydGMtPmJhc2UuY3Vyc29yLT5z dGF0ZS0+Y3J0Y193OwotCS8qIFRPRE86IGZvciBub3csIGFzc3VtZSBwcmltYXJ5IGFuZCBjdXJz b3IgcGxhbmVzIGFyZSBhbHdheXMgZW5hYmxlZC4gKi8KLQlwLT5wcmkuZW5hYmxlZCA9IHRydWU7 Ci0JcC0+Y3VyLmVuYWJsZWQgPSB0cnVlOwogCiAJZHJtX2Zvcl9lYWNoX2xlZ2FjeV9wbGFuZShw bGFuZSwgJmRldi0+bW9kZV9jb25maWcucGxhbmVfbGlzdCkgewogCQlzdHJ1Y3QgaW50ZWxfcGxh bmUgKmludGVsX3BsYW5lID0gdG9faW50ZWxfcGxhbmUocGxhbmUpOwpAQCAtMjczNCwyNyArMjc0 NiwzMSBAQCBzdGF0aWMgdm9pZCBza2xfY29tcHV0ZV93bV9waXBlX3BhcmFtZXRlcnMoc3RydWN0 IGRybV9jcnRjICpjcnRjLAogCQlwLT5waXBlX2h0b3RhbCA9IGludGVsX2NydGMtPmNvbmZpZy0+ YmFzZS5hZGp1c3RlZF9tb2RlLmNydGNfaHRvdGFsOwogCQlwLT5waXhlbF9yYXRlID0gc2tsX3Bp cGVfcGl4ZWxfcmF0ZShpbnRlbF9jcnRjLT5jb25maWcpOwogCi0JCS8qCi0JCSAqIEZvciBub3cs IGFzc3VtZSBwcmltYXJ5IGFuZCBjdXJzb3IgcGxhbmVzIGFyZSBhbHdheXMgZW5hYmxlZC4KLQkJ ICovCi0JCXAtPnBsYW5lWzBdLmVuYWJsZWQgPSB0cnVlOwotCQlwLT5wbGFuZVswXS5ieXRlc19w ZXJfcGl4ZWwgPQotCQkJY3J0Yy0+cHJpbWFyeS0+c3RhdGUtPmZiLT5iaXRzX3Blcl9waXhlbCAv IDg7Ci0JCXAtPnBsYW5lWzBdLmhvcml6X3BpeGVscyA9IGludGVsX2NydGMtPmNvbmZpZy0+cGlw ZV9zcmNfdzsKLQkJcC0+cGxhbmVbMF0udmVydF9waXhlbHMgPSBpbnRlbF9jcnRjLT5jb25maWct PnBpcGVfc3JjX2g7Ci0JCXAtPnBsYW5lWzBdLnRpbGluZyA9IERSTV9GT1JNQVRfTU9EX05PTkU7 CiAJCWZiID0gY3J0Yy0+cHJpbWFyeS0+c3RhdGUtPmZiOwotCQkvKgotCQkgKiBGcmFtZWJ1ZmZl ciBjYW4gYmUgTlVMTCBvbiBwbGFuZSBkaXNhYmxlLCBidXQgaXQgZG9lcyBub3QKLQkJICogbWF0 dGVyIGZvciB3YXRlcm1hcmtzIGlmIHdlIGFzc3VtZSBubyB0aWxpbmcgaW4gdGhhdCBjYXNlLgot CQkgKi8KLQkJaWYgKGZiKQorCQlpZiAoZmIpIHsKKwkJCXAtPnBsYW5lWzBdLmVuYWJsZWQgPSB0 cnVlOworCQkJcC0+cGxhbmVbMF0uYnl0ZXNfcGVyX3BpeGVsID0gZmItPmJpdHNfcGVyX3BpeGVs IC8gODsKIAkJCXAtPnBsYW5lWzBdLnRpbGluZyA9IGZiLT5tb2RpZmllclswXTsKKwkJfSBlbHNl IHsKKwkJCXAtPnBsYW5lWzBdLmVuYWJsZWQgPSBmYWxzZTsKKwkJCXAtPnBsYW5lWzBdLmJ5dGVz X3Blcl9waXhlbCA9IDA7CisJCQlwLT5wbGFuZVswXS50aWxpbmcgPSBEUk1fRk9STUFUX01PRF9O T05FOworCQl9CisJCXAtPnBsYW5lWzBdLmhvcml6X3BpeGVscyA9IGludGVsX2NydGMtPmNvbmZp Zy0+cGlwZV9zcmNfdzsKKwkJcC0+cGxhbmVbMF0udmVydF9waXhlbHMgPSBpbnRlbF9jcnRjLT5j b25maWctPnBpcGVfc3JjX2g7CiAKLQkJcC0+Y3Vyc29yLmVuYWJsZWQgPSB0cnVlOwotCQlwLT5j dXJzb3IuYnl0ZXNfcGVyX3BpeGVsID0gNDsKLQkJcC0+Y3Vyc29yLmhvcml6X3BpeGVscyA9IGlu dGVsX2NydGMtPmJhc2UuY3Vyc29yLT5zdGF0ZS0+Y3J0Y193ID8KLQkJCQkJIGludGVsX2NydGMt PmJhc2UuY3Vyc29yLT5zdGF0ZS0+Y3J0Y193IDogNjQ7CisJCWZiID0gY3J0Yy0+Y3Vyc29yLT5z dGF0ZS0+ZmI7CisJCWlmIChmYikgeworCQkJcC0+Y3Vyc29yLmVuYWJsZWQgPSB0cnVlOworCQkJ cC0+Y3Vyc29yLmJ5dGVzX3Blcl9waXhlbCA9IGZiLT5iaXRzX3Blcl9waXhlbCAvIDg7CisJCQlw LT5jdXJzb3IuaG9yaXpfcGl4ZWxzID0gY3J0Yy0+Y3Vyc29yLT5zdGF0ZS0+Y3J0Y193OworCQkJ cC0+Y3Vyc29yLnZlcnRfcGl4ZWxzID0gY3J0Yy0+Y3Vyc29yLT5zdGF0ZS0+Y3J0Y19oOworCQl9 IGVsc2UgeworCQkJcC0+Y3Vyc29yLmVuYWJsZWQgPSBmYWxzZTsKKwkJCXAtPmN1cnNvci5ieXRl c19wZXJfcGl4ZWwgPSAwOworCQkJcC0+Y3Vyc29yLmhvcml6X3BpeGVscyA9IDY0OworCQkJcC0+ Y3Vyc29yLnZlcnRfcGl4ZWxzID0gNjQ7CisJCX0KIAl9CiAKIAlsaXN0X2Zvcl9lYWNoX2VudHJ5 KHBsYW5lLCAmZGV2LT5tb2RlX2NvbmZpZy5wbGFuZV9saXN0LCBoZWFkKSB7Ci0tIAoxLjguNS4x CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1n ZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xp c3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=