From: Matt Roper Subject: [PATCH 4/5] drm/i915: Use crtc->state->active in ilk/skl watermark calculations Date: Sun, 8 Mar 2015 14:00:44 -0700 Message-ID: <1425848445-19479-5-git-send-email-matthew.d.roper@intel.com> References: <1425848445-19479-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 164C46E096 for ; Sun, 8 Mar 2015 14:04:15 -0700 (PDT) In-Reply-To: <1425848445-19479-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 Z2UgZm9yCiAgICBvbGQgaGFyZHdhcmUgcGxhdGZvcm1zLiAgKFZpbGxlKQoKQ2M6IFZpbGxlIFN5 cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+CkNjOiBUdnJ0a28gVXJzdWxp biA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBNYXR0IFJvcGVyIDxt YXR0aGV3LmQucm9wZXJAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3BtLmMgfCAyMCArKysrKysrKysrLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDEwIGluc2Vy dGlvbnMoKyksIDEwIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCmluZGV4IGQ5 YjExNWUuLmRhZmQ3ZGUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Bt LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwpAQCAtODIyLDcgKzgyMiw3 IEBAIHN0YXRpYyB1aW50OF90IHZsdl9jb21wdXRlX2RyYWluX2xhdGVuY3koc3RydWN0IGRybV9j cnRjICpjcnRjLAogCSAqIEZJWE1FIHRoZSBwbGFuZSBtaWdodCBoYXZlIGFuIGZiCiAJICogYnV0 IGJlIGludmlzaWJsZSAoZWcuIGR1ZSB0byBjbGlwcGluZykKIAkgKi8KLQlpZiAoIWludGVsX2Ny dGMtPmJhc2Uuc3RhdGUtPmFjdGl2ZSB8fCAhcGxhbmUtPnN0YXRlLT5mYikKKwlpZiAoIWNydGMt PnN0YXRlLT5hY3RpdmUgfHwgIXBsYW5lLT5zdGF0ZS0+ZmIpCiAJCXJldHVybiAwOwogCiAJaWYg KFdBUk4oY2xvY2sgPT0gMCwgIlBpeGVsIGNsb2NrIGlzIHplcm8hXG4iKSkKQEAgLTE3MDEsNyAr MTcwMSw3IEBAIGhzd19jb21wdXRlX2xpbmV0aW1lX3dtKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYs IHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAlzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSAqbW9kZSA9 ICZpbnRlbF9jcnRjLT5jb25maWctPmJhc2UuYWRqdXN0ZWRfbW9kZTsKIAl1MzIgbGluZXRpbWUs IGlwc19saW5ldGltZTsKIAotCWlmICghaW50ZWxfY3J0Y19hY3RpdmUoY3J0YykpCisJaWYgKCFj cnRjLT5zdGF0ZS0+YWN0aXZlKQogCQlyZXR1cm4gMDsKIAogCS8qIFRoZSBXTSBhcmUgY29tcHV0 ZWQgd2l0aCBiYXNlIG9uIGhvdyBsb25nIGl0IHRha2VzIHRvIGZpbGwgYSBzaW5nbGUKQEAgLTE5 NTYsNyArMTk1Niw3IEBAIHN0YXRpYyB2b2lkIGlsa19jb21wdXRlX3dtX3BhcmFtZXRlcnMoc3Ry dWN0IGRybV9jcnRjICpjcnRjLAogCWVudW0gcGlwZSBwaXBlID0gaW50ZWxfY3J0Yy0+cGlwZTsK IAlzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZTsKIAotCWlmICghaW50ZWxfY3J0Y19hY3RpdmUoY3J0 YykpCisJaWYgKCFjcnRjLT5zdGF0ZS0+YWN0aXZlKQogCQlyZXR1cm47CiAKIAlwLT5hY3RpdmUg PSB0cnVlOwpAQCAtMjQ2OCw3ICsyNDY4LDcgQEAgc2tsX2RkYl9nZXRfcGlwZV9hbGxvY2F0aW9u X2xpbWl0cyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCiAJbnRoX2FjdGl2ZV9waXBlID0gMDsK IAlmb3JfZWFjaF9jcnRjKGRldiwgY3J0YykgewotCQlpZiAoIWludGVsX2NydGNfYWN0aXZlKGNy dGMpKQorCQlpZiAoIWNydGMtPnN0YXRlLT5hY3RpdmUpCiAJCQljb250aW51ZTsKIAogCQlpZiAo Y3J0YyA9PSBmb3JfY3J0YykKQEAgLTI3MDgsNyArMjcwOCw3IEBAIHN0YXRpYyB2b2lkIHNrbF9j b21wdXRlX3dtX2dsb2JhbF9wYXJhbWV0ZXJzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJc3Ry dWN0IGRybV9wbGFuZSAqcGxhbmU7CiAKIAlsaXN0X2Zvcl9lYWNoX2VudHJ5KGNydGMsICZkZXYt Pm1vZGVfY29uZmlnLmNydGNfbGlzdCwgaGVhZCkKLQkJY29uZmlnLT5udW1fcGlwZXNfYWN0aXZl ICs9IGludGVsX2NydGNfYWN0aXZlKGNydGMpOworCQljb25maWctPm51bV9waXBlc19hY3RpdmUg Kz0gY3J0Yy0+c3RhdGUtPmFjdGl2ZTsKIAogCS8qIEZJWE1FOiBJIGRvbid0IHRoaW5rIHdlIG5l ZWQgdGhvc2UgdHdvIGdsb2JhbCBwYXJhbWV0ZXJzIG9uIFNLTCAqLwogCWxpc3RfZm9yX2VhY2hf ZW50cnkocGxhbmUsICZkZXYtPm1vZGVfY29uZmlnLnBsYW5lX2xpc3QsIGhlYWQpIHsKQEAgLTI3 MjksNyArMjcyOSw3IEBAIHN0YXRpYyB2b2lkIHNrbF9jb21wdXRlX3dtX3BpcGVfcGFyYW1ldGVy cyhzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmI7CiAJ aW50IGkgPSAxOyAvKiBJbmRleCBmb3Igc3ByaXRlIHBsYW5lcyBzdGFydCAqLwogCi0JcC0+YWN0 aXZlID0gaW50ZWxfY3J0Y19hY3RpdmUoY3J0Yyk7CisJcC0+YWN0aXZlID0gY3J0Yy0+c3RhdGUt PmFjdGl2ZTsKIAlpZiAocC0+YWN0aXZlKSB7CiAJCXAtPnBpcGVfaHRvdGFsID0gaW50ZWxfY3J0 Yy0+Y29uZmlnLT5iYXNlLmFkanVzdGVkX21vZGUuY3J0Y19odG90YWw7CiAJCXAtPnBpeGVsX3Jh dGUgPSBza2xfcGlwZV9waXhlbF9yYXRlKGludGVsX2NydGMtPmNvbmZpZyk7CkBAIC0yODYwLDcg KzI4NjAsNyBAQCBzdGF0aWMgdm9pZCBza2xfY29tcHV0ZV93bV9sZXZlbChjb25zdCBzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiBzdGF0aWMgdWludDMyX3QKIHNrbF9jb21wdXRl X2xpbmV0aW1lX3dtKHN0cnVjdCBkcm1fY3J0YyAqY3J0Yywgc3RydWN0IHNrbF9waXBlX3dtX3Bh cmFtZXRlcnMgKnApCiB7Ci0JaWYgKCFpbnRlbF9jcnRjX2FjdGl2ZShjcnRjKSkKKwlpZiAoIWNy dGMtPnN0YXRlLT5hY3RpdmUpCiAJCXJldHVybiAwOwogCiAJcmV0dXJuIERJVl9ST1VORF9VUCg4 ICogcC0+cGlwZV9odG90YWwgKiAxMDAwLCBwLT5waXhlbF9yYXRlKTsKQEAgLTMxOTEsNyArMzE5 MSw3IEBAIHN0YXRpYyB2b2lkIHNrbF91cGRhdGVfb3RoZXJfcGlwZV93bShzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2LAogCQlpZiAodGhpc19jcnRjLT5waXBlID09IGludGVsX2NydGMtPnBpcGUpCiAJ CQljb250aW51ZTsKIAotCQlpZiAoIWludGVsX2NydGMtPmJhc2Uuc3RhdGUtPmFjdGl2ZSkKKwkJ aWYgKCFjcnRjLT5zdGF0ZS0+YWN0aXZlKQogCQkJY29udGludWU7CiAKIAkJd21fY2hhbmdlZCA9 IHNrbF91cGRhdGVfcGlwZV93bSgmaW50ZWxfY3J0Yy0+YmFzZSwKQEAgLTM0MDcsNyArMzQwNyw3 IEBAIHN0YXRpYyB2b2lkIHNrbF9waXBlX3dtX2dldF9od19zdGF0ZShzdHJ1Y3QgZHJtX2NydGMg KmNydGMpCiAJCWh3LT5wbGFuZV90cmFuc1twaXBlXVtpXSA9IEk5MTVfUkVBRChQTEFORV9XTV9U UkFOUyhwaXBlLCBpKSk7CiAJaHctPmN1cnNvcl90cmFuc1twaXBlXSA9IEk5MTVfUkVBRChDVVJf V01fVFJBTlMocGlwZSkpOwogCi0JaWYgKCFpbnRlbF9jcnRjX2FjdGl2ZShjcnRjKSkKKwlpZiAo IWNydGMtPnN0YXRlLT5hY3RpdmUpCiAJCXJldHVybjsKIAogCWh3LT5kaXJ0eVtwaXBlXSA9IHRy dWU7CkBAIC0zNDYyLDcgKzM0NjIsNyBAQCBzdGF0aWMgdm9pZCBpbGtfcGlwZV93bV9nZXRfaHdf c3RhdGUoc3RydWN0IGRybV9jcnRjICpjcnRjKQogCWlmIChJU19IQVNXRUxMKGRldikgfHwgSVNf QlJPQURXRUxMKGRldikpCiAJCWh3LT53bV9saW5ldGltZVtwaXBlXSA9IEk5MTVfUkVBRChQSVBF X1dNX0xJTkVUSU1FKHBpcGUpKTsKIAotCWFjdGl2ZS0+cGlwZV9lbmFibGVkID0gaW50ZWxfY3J0 Y19hY3RpdmUoY3J0Yyk7CisJYWN0aXZlLT5waXBlX2VuYWJsZWQgPSBjcnRjLT5zdGF0ZS0+YWN0 aXZlOwogCiAJaWYgKGFjdGl2ZS0+cGlwZV9lbmFibGVkKSB7CiAJCXUzMiB0bXAgPSBody0+d21f cGlwZVtwaXBlXTsKLS0gCjEuOC41LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZy ZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGlu Zm8vaW50ZWwtZ2Z4Cg==