From: Matt Roper Subject: [PATCH 2/2] drm/i915: Don't assume primary & cursor are always on for wm calculation Date: Tue, 3 Mar 2015 18:15:13 -0800 Message-ID: <1425435313-31711-2-git-send-email-matthew.d.roper@intel.com> References: <1425435313-31711-1-git-send-email-matthew.d.roper@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id 54BAC6E62E for ; Tue, 3 Mar 2015 18:15:34 -0800 (PST) In-Reply-To: <1425435313-31711-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: intel-gfx@lists.freedesktop.org Cc: Michael Leuchtenburg 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 IGFkanVzdCBvdXIgd2F0ZXJtYXJrIGxvZ2ljCmFjY29yZGluZ2x5LgoKQ2M6IFR2cnRrbyBVcnN1 bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+CkNjOiBNaWNoYWVsIExldWNodGVuYnVyZyA8 bWljaGFlbEBzbGFzaGhvbWUub3JnPgpCdWd6aWxsYTogaHR0cHM6Ly9idWdzLmZyZWVkZXNrdG9w Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODkzODgKU2lnbmVkLW9mZi1ieTogTWF0dCBSb3BlciA8bWF0 dGhldy5kLnJvcGVyQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9w bS5jIHwgMjIgKysrKysrKysrKysrKysrKystLS0tLQogMSBmaWxlIGNoYW5nZWQsIDE3IGluc2Vy dGlvbnMoKyksIDUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfcG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKaW5kZXggZTcx MGI0My4uOTNmZDE1ZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0u YworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCkBAIC0xOTI0LDEzICsxOTI0 LDI1IEBAIHN0YXRpYyB2b2lkIGlsa19jb21wdXRlX3dtX3BhcmFtZXRlcnMoc3RydWN0IGRybV9j cnRjICpjcnRjLAogCXAtPmFjdGl2ZSA9IHRydWU7CiAJcC0+cGlwZV9odG90YWwgPSBpbnRlbF9j cnRjLT5jb25maWctPmJhc2UuYWRqdXN0ZWRfbW9kZS5jcnRjX2h0b3RhbDsKIAlwLT5waXhlbF9y YXRlID0gaWxrX3BpcGVfcGl4ZWxfcmF0ZShkZXYsIGNydGMpOwotCXAtPnByaS5ieXRlc19wZXJf cGl4ZWwgPSBjcnRjLT5wcmltYXJ5LT5zdGF0ZS0+ZmItPmJpdHNfcGVyX3BpeGVsIC8gODsKLQlw LT5jdXIuYnl0ZXNfcGVyX3BpeGVsID0gNDsKKworCWlmIChjcnRjLT5wcmltYXJ5LT5zdGF0ZS0+ ZmIpIHsKKwkJcC0+cHJpLmVuYWJsZWQgPSB0cnVlOworCQlwLT5wcmkuYnl0ZXNfcGVyX3BpeGVs ID0KKwkJCWNydGMtPnByaW1hcnktPnN0YXRlLT5mYi0+Yml0c19wZXJfcGl4ZWwgLyA4OworCX0g ZWxzZSB7CisJCXAtPnByaS5lbmFibGVkID0gZmFsc2U7CisJCXAtPnByaS5ieXRlc19wZXJfcGl4 ZWwgPSAwOworCX0KKworCWlmIChjcnRjLT5jdXJzb3ItPnN0YXRlLT5mYikgeworCQlwLT5jdXIu ZW5hYmxlZCA9IHRydWU7CisJCXAtPmN1ci5ieXRlc19wZXJfcGl4ZWwgPSA0OworCX0gZWxzZSB7 CisJCXAtPmN1ci5lbmFibGVkID0gZmFsc2U7CisJCXAtPmN1ci5ieXRlc19wZXJfcGl4ZWwgPSAw OworCX0KIAlwLT5wcmkuaG9yaXpfcGl4ZWxzID0gaW50ZWxfY3J0Yy0+Y29uZmlnLT5waXBlX3Ny Y193OwogCXAtPmN1ci5ob3Jpel9waXhlbHMgPSBpbnRlbF9jcnRjLT5iYXNlLmN1cnNvci0+c3Rh dGUtPmNydGNfdzsKLQkvKiBUT0RPOiBmb3Igbm93LCBhc3N1bWUgcHJpbWFyeSBhbmQgY3Vyc29y IHBsYW5lcyBhcmUgYWx3YXlzIGVuYWJsZWQuICovCi0JcC0+cHJpLmVuYWJsZWQgPSB0cnVlOwot CXAtPmN1ci5lbmFibGVkID0gdHJ1ZTsKIAogCWRybV9mb3JfZWFjaF9sZWdhY3lfcGxhbmUocGxh bmUsICZkZXYtPm1vZGVfY29uZmlnLnBsYW5lX2xpc3QpIHsKIAkJc3RydWN0IGludGVsX3BsYW5l ICppbnRlbF9wbGFuZSA9IHRvX2ludGVsX3BsYW5lKHBsYW5lKTsKLS0gCjEuOC41LjEKCl9fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWls aW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJl ZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==