From: Matt Roper Subject: [PATCH 2/3] drm/i915: Use crtc->state->active in ilk/skl watermark calculations (v3) Date: Mon, 9 Mar 2015 10:19:24 -0700 Message-ID: <1425921565-10828-3-git-send-email-matthew.d.roper@intel.com> References: <1425921565-10828-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 mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id BC2836E299 for ; Mon, 9 Mar 2015 10:23:57 -0700 (PDT) In-Reply-To: <1425921565-10828-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 List-Id: intel-gfx@lists.freedesktop.org RXhpc3Rpbmcgd2F0ZXJtYXJrIGNvZGUgY2FsbHMgaW50ZWxfY3J0Y19hY3RpdmUoKSB0byBkZXRl cm1pbmUgd2hldGhlciBhIENSVEMKaXMgYWN0aXZlIGZvciB0aGUgcHVycG9zZSBvZiB3YXRlcm1h cmsgY2FsY3VsYXRpb25zIChhbmQgYmFpbHMgb3V0IGVhcmx5IGlmIGl0CmRldGVybWluZXMgdGhl IENSVEMgaXMgbm90IGFjdGl2ZSkuICBIb3dldmVyIGludGVsX2NydGNfYWN0aXZlKCkgb25seSBy ZXR1cm5zCnRydWUgaWYgY3J0Yy0+cHJpbWFyeS0+ZmIgaXMgbm9uLU5VTEwsIHdoaWNoIGlzbid0 IGFwcHJvcHJpYXRlIGluIHRoZSBtb2Rlcm4KYWdlIG9mIHVuaXZlcnNhbCBwbGFuZXMgYW5kIGF0 b21pYyBtb2Rlc2V0IHNpbmNlIHVzZXJzcGFjZSBjYW4gbm93IGRpc2FibGUgdGhlCnByaW1hcnkg cGxhbmUsIGJ1dCBsZWF2ZSB0aGUgQ1JUQyAoYW5kIG90aGVyIHBsYW5lcykgcnVubmluZy4KCk5v dGUgdGhhdCBjb21taXQKCiAgICAgICAgY29tbWl0IDBmZGE2NTY4MGU5MjU0NWNhZWE1YmU3ODA1 YTdmMGE2MTdmYjZjMjAKICAgICAgICBBdXRob3I6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJz dWxpbkBpbnRlbC5jb20+CiAgICAgICAgRGF0ZTogICBGcmkgRmViIDI3IDE1OjEyOjM1IDIwMTUg KzAwMDAKCiAgICAgICAgICAgIGRybS9pOTE1L3NrbDogVXBkYXRlIHdhdGVybWFya3MgZm9yIFkg dGlsaW5nCgphZGRzIGEgdGVzdCBmb3IgcHJpbWFyeSBwbGFuZSBlbmFibGUvZGlzYWJsZSB0byB0 cmlnZ2VyIGEgd2F0ZXJtYXJrIHVwZGF0ZQoocHJldmlvdXNseSB3ZSBpZ25vcmVkIHVwZGF0ZXMg dG8gcHJpbWFyeSBwbGFuZXMsIHdoaWNoIHdhc24ndCByZWFsbHkgY29ycmVjdCwKYnV0IHdlIGdv dCBsdWNreSBzaW5jZSB3ZSBhbHdheXMgcHJldGVuZGVkIHRoZSBwcmltYXJ5IHBsYW5lIHdhcyBv bikuICBUdnJ0a28ncwpwYXRjaCB0cmllcyB0byB1cGRhdGUgd2F0ZXJtYXJrcyB3aGVuIHdlIHJl LWVuYWJsZSB0aGUgcHJpbWFyeSBwbGFuZSwgYnV0IHRoYXQKd2F0ZXJtYXJrIGNvbXB1dGF0aW9u IGdldHMgYWJvcnRlZCBlYXJseSBiZWNhdXNlIGludGVsX2NydGNfYWN0aXZlKCkgcmV0dXJucwpm YWxzZSBkdWUgdG8gdGhlIGRpc2FibGVkIHByaW1hcnkgcGxhbmUuCgpTd2l0Y2ggdGhlIElMSyBh bmQgU0tMIHdhdGVybWFyayBjb2RlIG92ZXIgdG8gdXNlIGNydGMtPnN0YXRlLT5hY3RpdmUgcmF0 aGVyCnRoYW4gY2FsbGluZyBpbnRlbF9jcnRjX2FjdGl2ZSgpIHNvIHRoYXQgd2UnbGwgcHJvcGVy bHkgY29tcHV0ZSB3YXRlcm1hcmtzIHdoZW4KcmUtZW5hYmxpbmcgdGhlIHByaW1hcnkgcGxhbmUu CgpOb3RlIHRoYXQgdGhpcyBjb21taXQgZG9lc24ndCB0b3VjaCBjYWxsc2l0ZXMgaW4gdGhlIHdh dGVybWFyayBjb2RlIGZvcgpvbGRlciBwbGF0Zm9ybXMgc2luY2UgdGhlcmUgd2VyZSBjb25jZXJu cyB0aGF0IGRvaW5nIHNvIHdvdWxkIGxlYWQgdG8Kb3RoZXIgdHlwZXMgb2YgYnJlYWthZ2UuCgpB bHNvIG5vdGUgdGhhdCBhbGwgb2YgdGhlIHdhdGVybWFyayBjYWxjdWxhdGlvbiBhdCB0aGUgbW9t ZW50IHRha2VzIHBsYWNlIGFmdGVyCm5ldyBjcnRjL3BsYW5lIHN0YXRlcyBhcmUgc3dhcHBlZCBp bnRvIHRoZSBEUk0gb2JqZWN0cy4gIFRoaXMgd2lsbCBjaGFuZ2UgaW4KdGhlIGZ1dHVyZSwgc28g d2UnbGwgYmUgd29ya2luZyB3aXRoIGluLWZsaWdodCBzdGF0ZSBvYmplY3RzLCBidXQgZm9yIHRo ZSB0aW1lCmJlaW5nLCBjcnRjLT5zdGF0ZSBpcyB3aGF0IHdlIHdhbnQgdG8gb3BlcmF0ZSBvbi4K CnYyOiBEb24ndCBkcm9wIHByaW1hcnktPmZiIGNoZWNrIGZyb20gaW50ZWxfY3J0Y19hY3RpdmUo KSwgYnV0IHJhdGhlciByZXBsYWNlCiAgICBJTEsvU0tMIGNhbGxzaXRlcyB3aXRoIGRpcmVjdCB0 ZXN0cyBvZiBjcnRjLT5zdGF0ZS0+YWN0aXZlLiAgVGhlcmUgaXMKICAgIGNvbmNlcm4gdGhhdCBt ZXNzaW5nIHdpdGggaW50ZWxfY3J0Y19hY3RpdmUoKSB3aWxsIGxlYWQgdG8gb3RoZXIgYnJlYWth Z2UgZm9yCiAgICBvbGQgaGFyZHdhcmUgcGxhdGZvcm1zLiAgKFZpbGxlKQoKdjM6IFVzZSBpbnRl bF9jcnRjLT5hY3RpdmUgZm9yIG5vdyByYXRoZXIgdGhhbiBjcnRjLT5zdGF0ZS0+YWN0aXZlIHNp bmNlCiAgICB3ZSBkb24ndCBoYXZlIENSVEMgc3RhdGVzIHByb3Blcmx5IGhvb2tlZCB1cCBhbmQg aW5pdGlhbGl6ZWQgeWV0LgogICAgV2UnbGwgZGVmZXIgdGhlIHN3aXRjaCB0byBjcnRjLT5zdGF0 ZS0+YWN0aXZlIHVudGlsIHRoZSBhdG9taWMgQ1JUQwogICAgc3RhdGUgd29yayBpcyBmYXJ0aGVy IGFsb25nLiAoVmlsbGUpCgpDYzogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4 LmludGVsLmNvbT4KQ2M6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+ ClNpZ25lZC1vZmYtYnk6IE1hdHQgUm9wZXIgPG1hdHRoZXcuZC5yb3BlckBpbnRlbC5jb20+ClJl dmlld2VkLWJ5OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwuY29t PgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgfCAxNiArKysrKysrKy0tLS0t LS0tCiAxIGZpbGUgY2hhbmdlZCwgOCBpbnNlcnRpb25zKCspLCA4IGRlbGV0aW9ucygtKQoKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9wbS5jCmluZGV4IDRmMDRmYWIuLmEwNmEyYzcgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfcG0uYwpAQCAtMTcwMSw3ICsxNzAxLDcgQEAgaHN3X2NvbXB1dGVfbGluZXRpbWVfd20o c3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGRybV9jcnRjICpjcnRjKQogCXN0cnVjdCBk cm1fZGlzcGxheV9tb2RlICptb2RlID0gJmludGVsX2NydGMtPmNvbmZpZy0+YmFzZS5hZGp1c3Rl ZF9tb2RlOwogCXUzMiBsaW5ldGltZSwgaXBzX2xpbmV0aW1lOwogCi0JaWYgKCFpbnRlbF9jcnRj X2FjdGl2ZShjcnRjKSkKKwlpZiAoIWludGVsX2NydGMtPmFjdGl2ZSkKIAkJcmV0dXJuIDA7CiAK IAkvKiBUaGUgV00gYXJlIGNvbXB1dGVkIHdpdGggYmFzZSBvbiBob3cgbG9uZyBpdCB0YWtlcyB0 byBmaWxsIGEgc2luZ2xlCkBAIC0xOTU2LDcgKzE5NTYsNyBAQCBzdGF0aWMgdm9pZCBpbGtfY29t cHV0ZV93bV9wYXJhbWV0ZXJzKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAllbnVtIHBpcGUgcGlw ZSA9IGludGVsX2NydGMtPnBpcGU7CiAJc3RydWN0IGRybV9wbGFuZSAqcGxhbmU7CiAKLQlpZiAo IWludGVsX2NydGNfYWN0aXZlKGNydGMpKQorCWlmICghaW50ZWxfY3J0Yy0+YWN0aXZlKQogCQly ZXR1cm47CiAKIAlwLT5hY3RpdmUgPSB0cnVlOwpAQCAtMjQ2OCw3ICsyNDY4LDcgQEAgc2tsX2Rk Yl9nZXRfcGlwZV9hbGxvY2F0aW9uX2xpbWl0cyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCiAJ bnRoX2FjdGl2ZV9waXBlID0gMDsKIAlmb3JfZWFjaF9jcnRjKGRldiwgY3J0YykgewotCQlpZiAo IWludGVsX2NydGNfYWN0aXZlKGNydGMpKQorCQlpZiAoIXRvX2ludGVsX2NydGMoY3J0YyktPmFj dGl2ZSkKIAkJCWNvbnRpbnVlOwogCiAJCWlmIChjcnRjID09IGZvcl9jcnRjKQpAQCAtMjcwOCw3 ICsyNzA4LDcgQEAgc3RhdGljIHZvaWQgc2tsX2NvbXB1dGVfd21fZ2xvYmFsX3BhcmFtZXRlcnMo c3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAlzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZTsKIAogCWxp c3RfZm9yX2VhY2hfZW50cnkoY3J0YywgJmRldi0+bW9kZV9jb25maWcuY3J0Y19saXN0LCBoZWFk KQotCQljb25maWctPm51bV9waXBlc19hY3RpdmUgKz0gaW50ZWxfY3J0Y19hY3RpdmUoY3J0Yyk7 CisJCWNvbmZpZy0+bnVtX3BpcGVzX2FjdGl2ZSArPSB0b19pbnRlbF9jcnRjKGNydGMpLT5hY3Rp dmU7CiAKIAkvKiBGSVhNRTogSSBkb24ndCB0aGluayB3ZSBuZWVkIHRob3NlIHR3byBnbG9iYWwg cGFyYW1ldGVycyBvbiBTS0wgKi8KIAlsaXN0X2Zvcl9lYWNoX2VudHJ5KHBsYW5lLCAmZGV2LT5t b2RlX2NvbmZpZy5wbGFuZV9saXN0LCBoZWFkKSB7CkBAIC0yNzI5LDcgKzI3MjksNyBAQCBzdGF0 aWMgdm9pZCBza2xfY29tcHV0ZV93bV9waXBlX3BhcmFtZXRlcnMoc3RydWN0IGRybV9jcnRjICpj cnRjLAogCXN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiOwogCWludCBpID0gMTsgLyogSW5kZXgg Zm9yIHNwcml0ZSBwbGFuZXMgc3RhcnQgKi8KIAotCXAtPmFjdGl2ZSA9IGludGVsX2NydGNfYWN0 aXZlKGNydGMpOworCXAtPmFjdGl2ZSA9IGludGVsX2NydGMtPmFjdGl2ZTsKIAlpZiAocC0+YWN0 aXZlKSB7CiAJCXAtPnBpcGVfaHRvdGFsID0gaW50ZWxfY3J0Yy0+Y29uZmlnLT5iYXNlLmFkanVz dGVkX21vZGUuY3J0Y19odG90YWw7CiAJCXAtPnBpeGVsX3JhdGUgPSBza2xfcGlwZV9waXhlbF9y YXRlKGludGVsX2NydGMtPmNvbmZpZyk7CkBAIC0yODYwLDcgKzI4NjAsNyBAQCBzdGF0aWMgdm9p ZCBza2xfY29tcHV0ZV93bV9sZXZlbChjb25zdCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYsCiBzdGF0aWMgdWludDMyX3QKIHNrbF9jb21wdXRlX2xpbmV0aW1lX3dtKHN0cnVjdCBk cm1fY3J0YyAqY3J0Yywgc3RydWN0IHNrbF9waXBlX3dtX3BhcmFtZXRlcnMgKnApCiB7Ci0JaWYg KCFpbnRlbF9jcnRjX2FjdGl2ZShjcnRjKSkKKwlpZiAoIXRvX2ludGVsX2NydGMoY3J0YyktPmFj dGl2ZSkKIAkJcmV0dXJuIDA7CiAKIAlyZXR1cm4gRElWX1JPVU5EX1VQKDggKiBwLT5waXBlX2h0 b3RhbCAqIDEwMDAsIHAtPnBpeGVsX3JhdGUpOwpAQCAtMzQwNyw3ICszNDA3LDcgQEAgc3RhdGlj IHZvaWQgc2tsX3BpcGVfd21fZ2V0X2h3X3N0YXRlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAkJ aHctPnBsYW5lX3RyYW5zW3BpcGVdW2ldID0gSTkxNV9SRUFEKFBMQU5FX1dNX1RSQU5TKHBpcGUs IGkpKTsKIAlody0+Y3Vyc29yX3RyYW5zW3BpcGVdID0gSTkxNV9SRUFEKENVUl9XTV9UUkFOUyhw aXBlKSk7CiAKLQlpZiAoIWludGVsX2NydGNfYWN0aXZlKGNydGMpKQorCWlmICghaW50ZWxfY3J0 Yy0+YWN0aXZlKQogCQlyZXR1cm47CiAKIAlody0+ZGlydHlbcGlwZV0gPSB0cnVlOwpAQCAtMzQ2 Miw3ICszNDYyLDcgQEAgc3RhdGljIHZvaWQgaWxrX3BpcGVfd21fZ2V0X2h3X3N0YXRlKHN0cnVj dCBkcm1fY3J0YyAqY3J0YykKIAlpZiAoSVNfSEFTV0VMTChkZXYpIHx8IElTX0JST0FEV0VMTChk ZXYpKQogCQlody0+d21fbGluZXRpbWVbcGlwZV0gPSBJOTE1X1JFQUQoUElQRV9XTV9MSU5FVElN RShwaXBlKSk7CiAKLQlhY3RpdmUtPnBpcGVfZW5hYmxlZCA9IGludGVsX2NydGNfYWN0aXZlKGNy dGMpOworCWFjdGl2ZS0+cGlwZV9lbmFibGVkID0gaW50ZWxfY3J0Yy0+YWN0aXZlOwogCiAJaWYg KGFjdGl2ZS0+cGlwZV9lbmFibGVkKSB7CiAJCXUzMiB0bXAgPSBody0+d21fcGlwZVtwaXBlXTsK LS0gCjEuOC41LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9y ZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4 Cg==