From: Daniel Vetter Subject: Re: [PATCH 2/3] drm/i915: Use crtc->state->active in ilk/skl watermark calculations (v3) Date: Mon, 9 Mar 2015 18:33:59 +0100 Message-ID: <20150309173359.GX24485@phenom.ffwll.local> References: <1425921565-10828-1-git-send-email-matthew.d.roper@intel.com> <1425921565-10828-3-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 mail-we0-f169.google.com (mail-we0-f169.google.com [74.125.82.169]) by gabe.freedesktop.org (Postfix) with ESMTP id 0B2056E2B3 for ; Mon, 9 Mar 2015 10:32:20 -0700 (PDT) Received: by wevl61 with SMTP id l61so11835826wev.10 for ; Mon, 09 Mar 2015 10:32:19 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1425921565-10828-3-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: Matt Roper Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org T24gTW9uLCBNYXIgMDksIDIwMTUgYXQgMTA6MTk6MjRBTSAtMDcwMCwgTWF0dCBSb3BlciB3cm90 ZToKPiBFeGlzdGluZyB3YXRlcm1hcmsgY29kZSBjYWxscyBpbnRlbF9jcnRjX2FjdGl2ZSgpIHRv IGRldGVybWluZSB3aGV0aGVyIGEgQ1JUQwo+IGlzIGFjdGl2ZSBmb3IgdGhlIHB1cnBvc2Ugb2Yg d2F0ZXJtYXJrIGNhbGN1bGF0aW9ucyAoYW5kIGJhaWxzIG91dCBlYXJseSBpZiBpdAo+IGRldGVy bWluZXMgdGhlIENSVEMgaXMgbm90IGFjdGl2ZSkuICBIb3dldmVyIGludGVsX2NydGNfYWN0aXZl KCkgb25seSByZXR1cm5zCj4gdHJ1ZSBpZiBjcnRjLT5wcmltYXJ5LT5mYiBpcyBub24tTlVMTCwg d2hpY2ggaXNuJ3QgYXBwcm9wcmlhdGUgaW4gdGhlIG1vZGVybgo+IGFnZSBvZiB1bml2ZXJzYWwg cGxhbmVzIGFuZCBhdG9taWMgbW9kZXNldCBzaW5jZSB1c2Vyc3BhY2UgY2FuIG5vdyBkaXNhYmxl IHRoZQo+IHByaW1hcnkgcGxhbmUsIGJ1dCBsZWF2ZSB0aGUgQ1JUQyAoYW5kIG90aGVyIHBsYW5l cykgcnVubmluZy4KPiAKPiBOb3RlIHRoYXQgY29tbWl0Cj4gCj4gICAgICAgICBjb21taXQgMGZk YTY1NjgwZTkyNTQ1Y2FlYTViZTc4MDVhN2YwYTYxN2ZiNmMyMAo+ICAgICAgICAgQXV0aG9yOiBU dnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgo+ICAgICAgICAgRGF0ZTog ICBGcmkgRmViIDI3IDE1OjEyOjM1IDIwMTUgKzAwMDAKPiAKPiAgICAgICAgICAgICBkcm0vaTkx NS9za2w6IFVwZGF0ZSB3YXRlcm1hcmtzIGZvciBZIHRpbGluZwo+IAo+IGFkZHMgYSB0ZXN0IGZv ciBwcmltYXJ5IHBsYW5lIGVuYWJsZS9kaXNhYmxlIHRvIHRyaWdnZXIgYSB3YXRlcm1hcmsgdXBk YXRlCj4gKHByZXZpb3VzbHkgd2UgaWdub3JlZCB1cGRhdGVzIHRvIHByaW1hcnkgcGxhbmVzLCB3 aGljaCB3YXNuJ3QgcmVhbGx5IGNvcnJlY3QsCj4gYnV0IHdlIGdvdCBsdWNreSBzaW5jZSB3ZSBh bHdheXMgcHJldGVuZGVkIHRoZSBwcmltYXJ5IHBsYW5lIHdhcyBvbikuICBUdnJ0a28ncwo+IHBh dGNoIHRyaWVzIHRvIHVwZGF0ZSB3YXRlcm1hcmtzIHdoZW4gd2UgcmUtZW5hYmxlIHRoZSBwcmlt YXJ5IHBsYW5lLCBidXQgdGhhdAo+IHdhdGVybWFyayBjb21wdXRhdGlvbiBnZXRzIGFib3J0ZWQg ZWFybHkgYmVjYXVzZSBpbnRlbF9jcnRjX2FjdGl2ZSgpIHJldHVybnMKPiBmYWxzZSBkdWUgdG8g dGhlIGRpc2FibGVkIHByaW1hcnkgcGxhbmUuCj4gCj4gU3dpdGNoIHRoZSBJTEsgYW5kIFNLTCB3 YXRlcm1hcmsgY29kZSBvdmVyIHRvIHVzZSBjcnRjLT5zdGF0ZS0+YWN0aXZlIHJhdGhlcgo+IHRo YW4gY2FsbGluZyBpbnRlbF9jcnRjX2FjdGl2ZSgpIHNvIHRoYXQgd2UnbGwgcHJvcGVybHkgY29t cHV0ZSB3YXRlcm1hcmtzIHdoZW4KPiByZS1lbmFibGluZyB0aGUgcHJpbWFyeSBwbGFuZS4KPiAK PiBOb3RlIHRoYXQgdGhpcyBjb21taXQgZG9lc24ndCB0b3VjaCBjYWxsc2l0ZXMgaW4gdGhlIHdh dGVybWFyayBjb2RlIGZvcgo+IG9sZGVyIHBsYXRmb3JtcyBzaW5jZSB0aGVyZSB3ZXJlIGNvbmNl cm5zIHRoYXQgZG9pbmcgc28gd291bGQgbGVhZCB0bwo+IG90aGVyIHR5cGVzIG9mIGJyZWFrYWdl Lgo+IAo+IEFsc28gbm90ZSB0aGF0IGFsbCBvZiB0aGUgd2F0ZXJtYXJrIGNhbGN1bGF0aW9uIGF0 IHRoZSBtb21lbnQgdGFrZXMgcGxhY2UgYWZ0ZXIKPiBuZXcgY3J0Yy9wbGFuZSBzdGF0ZXMgYXJl IHN3YXBwZWQgaW50byB0aGUgRFJNIG9iamVjdHMuICBUaGlzIHdpbGwgY2hhbmdlIGluCj4gdGhl IGZ1dHVyZSwgc28gd2UnbGwgYmUgd29ya2luZyB3aXRoIGluLWZsaWdodCBzdGF0ZSBvYmplY3Rz LCBidXQgZm9yIHRoZSB0aW1lCj4gYmVpbmcsIGNydGMtPnN0YXRlIGlzIHdoYXQgd2Ugd2FudCB0 byBvcGVyYXRlIG9uLgo+IAo+IHYyOiBEb24ndCBkcm9wIHByaW1hcnktPmZiIGNoZWNrIGZyb20g aW50ZWxfY3J0Y19hY3RpdmUoKSwgYnV0IHJhdGhlciByZXBsYWNlCj4gICAgIElMSy9TS0wgY2Fs bHNpdGVzIHdpdGggZGlyZWN0IHRlc3RzIG9mIGNydGMtPnN0YXRlLT5hY3RpdmUuICBUaGVyZSBp cwo+ICAgICBjb25jZXJuIHRoYXQgbWVzc2luZyB3aXRoIGludGVsX2NydGNfYWN0aXZlKCkgd2ls bCBsZWFkIHRvIG90aGVyIGJyZWFrYWdlIGZvcgo+ICAgICBvbGQgaGFyZHdhcmUgcGxhdGZvcm1z LiAgKFZpbGxlKQo+IAo+IHYzOiBVc2UgaW50ZWxfY3J0Yy0+YWN0aXZlIGZvciBub3cgcmF0aGVy IHRoYW4gY3J0Yy0+c3RhdGUtPmFjdGl2ZSBzaW5jZQo+ICAgICB3ZSBkb24ndCBoYXZlIENSVEMg c3RhdGVzIHByb3Blcmx5IGhvb2tlZCB1cCBhbmQgaW5pdGlhbGl6ZWQgeWV0Lgo+ICAgICBXZSds bCBkZWZlciB0aGUgc3dpdGNoIHRvIGNydGMtPnN0YXRlLT5hY3RpdmUgdW50aWwgdGhlIGF0b21p YyBDUlRDCj4gICAgIHN0YXRlIHdvcmsgaXMgZmFydGhlciBhbG9uZy4gKFZpbGxlKQo+IAo+IENj OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tPgo+IENjOiBU dnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgo+IFNpZ25lZC1vZmYtYnk6 IE1hdHQgUm9wZXIgPG1hdHRoZXcuZC5yb3BlckBpbnRlbC5jb20+Cj4gUmV2aWV3ZWQtYnk6IFZp bGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+CgpNZXJnZWQgdXAg dG8gdGhpcyBvbmUsIHRoYW5rcy4KLURhbmllbAoKPiAtLS0KPiAgZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfcG0uYyB8IDE2ICsrKysrKysrLS0tLS0tLS0KPiAgMSBmaWxlIGNoYW5nZWQsIDgg aW5zZXJ0aW9ucygrKSwgOCBkZWxldGlvbnMoLSkKPiAKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfcG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMK PiBpbmRleCA0ZjA0ZmFiLi5hMDZhMmM3IDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX3BtLmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCj4g QEAgLTE3MDEsNyArMTcwMSw3IEBAIGhzd19jb21wdXRlX2xpbmV0aW1lX3dtKHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYsIHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKPiAgCXN0cnVjdCBkcm1fZGlzcGxh eV9tb2RlICptb2RlID0gJmludGVsX2NydGMtPmNvbmZpZy0+YmFzZS5hZGp1c3RlZF9tb2RlOwo+ ICAJdTMyIGxpbmV0aW1lLCBpcHNfbGluZXRpbWU7Cj4gIAo+IC0JaWYgKCFpbnRlbF9jcnRjX2Fj dGl2ZShjcnRjKSkKPiArCWlmICghaW50ZWxfY3J0Yy0+YWN0aXZlKQo+ICAJCXJldHVybiAwOwo+ ICAKPiAgCS8qIFRoZSBXTSBhcmUgY29tcHV0ZWQgd2l0aCBiYXNlIG9uIGhvdyBsb25nIGl0IHRh a2VzIHRvIGZpbGwgYSBzaW5nbGUKPiBAQCAtMTk1Niw3ICsxOTU2LDcgQEAgc3RhdGljIHZvaWQg aWxrX2NvbXB1dGVfd21fcGFyYW1ldGVycyhzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCj4gIAllbnVt IHBpcGUgcGlwZSA9IGludGVsX2NydGMtPnBpcGU7Cj4gIAlzdHJ1Y3QgZHJtX3BsYW5lICpwbGFu ZTsKPiAgCj4gLQlpZiAoIWludGVsX2NydGNfYWN0aXZlKGNydGMpKQo+ICsJaWYgKCFpbnRlbF9j cnRjLT5hY3RpdmUpCj4gIAkJcmV0dXJuOwo+ICAKPiAgCXAtPmFjdGl2ZSA9IHRydWU7Cj4gQEAg LTI0NjgsNyArMjQ2OCw3IEBAIHNrbF9kZGJfZ2V0X3BpcGVfYWxsb2NhdGlvbl9saW1pdHMoc3Ry dWN0IGRybV9kZXZpY2UgKmRldiwKPiAgCj4gIAludGhfYWN0aXZlX3BpcGUgPSAwOwo+ICAJZm9y X2VhY2hfY3J0YyhkZXYsIGNydGMpIHsKPiAtCQlpZiAoIWludGVsX2NydGNfYWN0aXZlKGNydGMp KQo+ICsJCWlmICghdG9faW50ZWxfY3J0YyhjcnRjKS0+YWN0aXZlKQo+ICAJCQljb250aW51ZTsK PiAgCj4gIAkJaWYgKGNydGMgPT0gZm9yX2NydGMpCj4gQEAgLTI3MDgsNyArMjcwOCw3IEBAIHN0 YXRpYyB2b2lkIHNrbF9jb21wdXRlX3dtX2dsb2JhbF9wYXJhbWV0ZXJzKHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYsCj4gIAlzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZTsKPiAgCj4gIAlsaXN0X2Zvcl9l YWNoX2VudHJ5KGNydGMsICZkZXYtPm1vZGVfY29uZmlnLmNydGNfbGlzdCwgaGVhZCkKPiAtCQlj b25maWctPm51bV9waXBlc19hY3RpdmUgKz0gaW50ZWxfY3J0Y19hY3RpdmUoY3J0Yyk7Cj4gKwkJ Y29uZmlnLT5udW1fcGlwZXNfYWN0aXZlICs9IHRvX2ludGVsX2NydGMoY3J0YyktPmFjdGl2ZTsK PiAgCj4gIAkvKiBGSVhNRTogSSBkb24ndCB0aGluayB3ZSBuZWVkIHRob3NlIHR3byBnbG9iYWwg cGFyYW1ldGVycyBvbiBTS0wgKi8KPiAgCWxpc3RfZm9yX2VhY2hfZW50cnkocGxhbmUsICZkZXYt Pm1vZGVfY29uZmlnLnBsYW5lX2xpc3QsIGhlYWQpIHsKPiBAQCAtMjcyOSw3ICsyNzI5LDcgQEAg c3RhdGljIHZvaWQgc2tsX2NvbXB1dGVfd21fcGlwZV9wYXJhbWV0ZXJzKHN0cnVjdCBkcm1fY3J0 YyAqY3J0YywKPiAgCXN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiOwo+ICAJaW50IGkgPSAxOyAv KiBJbmRleCBmb3Igc3ByaXRlIHBsYW5lcyBzdGFydCAqLwo+ICAKPiAtCXAtPmFjdGl2ZSA9IGlu dGVsX2NydGNfYWN0aXZlKGNydGMpOwo+ICsJcC0+YWN0aXZlID0gaW50ZWxfY3J0Yy0+YWN0aXZl Owo+ICAJaWYgKHAtPmFjdGl2ZSkgewo+ICAJCXAtPnBpcGVfaHRvdGFsID0gaW50ZWxfY3J0Yy0+ Y29uZmlnLT5iYXNlLmFkanVzdGVkX21vZGUuY3J0Y19odG90YWw7Cj4gIAkJcC0+cGl4ZWxfcmF0 ZSA9IHNrbF9waXBlX3BpeGVsX3JhdGUoaW50ZWxfY3J0Yy0+Y29uZmlnKTsKPiBAQCAtMjg2MCw3 ICsyODYwLDcgQEAgc3RhdGljIHZvaWQgc2tsX2NvbXB1dGVfd21fbGV2ZWwoY29uc3Qgc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAo+ICBzdGF0aWMgdWludDMyX3QKPiAgc2tsX2Nv bXB1dGVfbGluZXRpbWVfd20oc3RydWN0IGRybV9jcnRjICpjcnRjLCBzdHJ1Y3Qgc2tsX3BpcGVf d21fcGFyYW1ldGVycyAqcCkKPiAgewo+IC0JaWYgKCFpbnRlbF9jcnRjX2FjdGl2ZShjcnRjKSkK PiArCWlmICghdG9faW50ZWxfY3J0YyhjcnRjKS0+YWN0aXZlKQo+ICAJCXJldHVybiAwOwo+ICAK PiAgCXJldHVybiBESVZfUk9VTkRfVVAoOCAqIHAtPnBpcGVfaHRvdGFsICogMTAwMCwgcC0+cGl4 ZWxfcmF0ZSk7Cj4gQEAgLTM0MDcsNyArMzQwNyw3IEBAIHN0YXRpYyB2b2lkIHNrbF9waXBlX3dt X2dldF9od19zdGF0ZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCj4gIAkJaHctPnBsYW5lX3RyYW5z W3BpcGVdW2ldID0gSTkxNV9SRUFEKFBMQU5FX1dNX1RSQU5TKHBpcGUsIGkpKTsKPiAgCWh3LT5j dXJzb3JfdHJhbnNbcGlwZV0gPSBJOTE1X1JFQUQoQ1VSX1dNX1RSQU5TKHBpcGUpKTsKPiAgCj4g LQlpZiAoIWludGVsX2NydGNfYWN0aXZlKGNydGMpKQo+ICsJaWYgKCFpbnRlbF9jcnRjLT5hY3Rp dmUpCj4gIAkJcmV0dXJuOwo+ICAKPiAgCWh3LT5kaXJ0eVtwaXBlXSA9IHRydWU7Cj4gQEAgLTM0 NjIsNyArMzQ2Miw3IEBAIHN0YXRpYyB2b2lkIGlsa19waXBlX3dtX2dldF9od19zdGF0ZShzdHJ1 Y3QgZHJtX2NydGMgKmNydGMpCj4gIAlpZiAoSVNfSEFTV0VMTChkZXYpIHx8IElTX0JST0FEV0VM TChkZXYpKQo+ICAJCWh3LT53bV9saW5ldGltZVtwaXBlXSA9IEk5MTVfUkVBRChQSVBFX1dNX0xJ TkVUSU1FKHBpcGUpKTsKPiAgCj4gLQlhY3RpdmUtPnBpcGVfZW5hYmxlZCA9IGludGVsX2NydGNf YWN0aXZlKGNydGMpOwo+ICsJYWN0aXZlLT5waXBlX2VuYWJsZWQgPSBpbnRlbF9jcnRjLT5hY3Rp dmU7Cj4gIAo+ICAJaWYgKGFjdGl2ZS0+cGlwZV9lbmFibGVkKSB7Cj4gIAkJdTMyIHRtcCA9IGh3 LT53bV9waXBlW3BpcGVdOwo+IC0tIAo+IDEuOC41LjEKPiAKPiBfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwo+IEludGVsLWdmeCBtYWlsaW5nIGxpc3QKPiBJ bnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCj4gaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9w Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAoKLS0gCkRhbmllbCBWZXR0ZXIKU29mdHdh cmUgRW5naW5lZXIsIEludGVsIENvcnBvcmF0aW9uCis0MSAoMCkgNzkgMzY1IDU3IDQ4IC0gaHR0 cDovL2Jsb2cuZmZ3bGwuY2gKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0 b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRl bC1nZngK