From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH 4/5] drm/i915: Use crtc->state->active in ilk/skl watermark calculations Date: Mon, 9 Mar 2015 17:57:54 +0200 Message-ID: <20150309155754.GY11371@intel.com> References: <1425848445-19479-1-git-send-email-matthew.d.roper@intel.com> <1425848445-19479-5-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 mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 5514A6E527 for ; Mon, 9 Mar 2015 08:57:59 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1425848445-19479-5-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 T24gU3VuLCBNYXIgMDgsIDIwMTUgYXQgMDI6MDA6NDRQTSAtMDcwMCwgTWF0dCBSb3BlciB3cm90 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+IENjOiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXgu aW50ZWwuY29tPgo+IENjOiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29t Pgo+IFNpZ25lZC1vZmYtYnk6IE1hdHQgUm9wZXIgPG1hdHRoZXcuZC5yb3BlckBpbnRlbC5jb20+ CgoKSWYgeW91IG1ha2UgdGhpcyB1c2UgaW50ZWxfY3J0Yy0+YWN0aXZlIHlvdSBjYW4gc2xhcCBv biBteSAKUmV2aWV3ZWQtYnk6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5p bnRlbC5jb20+CgpUaGUgaW50ZWxfY3J0Yy0+YWN0aXZlIHRvIGNydGMtPnN0YXRlLT5hY3RpdmUg Y2hhbmdlIGlzIG1vcmUKY29udHJvdmVyc2lhbCBzbyBJIHRoaW5rIHdlIG5lZWQgdG8gbG9vayBh dCB0aGUgY29kZSBpbiBtb3JlIGRldGFpbApiZWZvcmUgd2UgZ28gbWFrZSBzdWNoIGEgYmlnIGNo YW5nZS4KCj4gLS0tCj4gIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgfCAyMCArKysr KysrKysrLS0tLS0tLS0tLQo+ICAxIGZpbGUgY2hhbmdlZCwgMTAgaW5zZXJ0aW9ucygrKSwgMTAg ZGVsZXRpb25zKC0pCj4gCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCj4gaW5kZXggZDliMTE1ZS4u ZGFmZDdkZSAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCj4g KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwo+IEBAIC04MjIsNyArODIyLDcg QEAgc3RhdGljIHVpbnQ4X3Qgdmx2X2NvbXB1dGVfZHJhaW5fbGF0ZW5jeShzdHJ1Y3QgZHJtX2Ny dGMgKmNydGMsCj4gIAkgKiBGSVhNRSB0aGUgcGxhbmUgbWlnaHQgaGF2ZSBhbiBmYgo+ICAJICog YnV0IGJlIGludmlzaWJsZSAoZWcuIGR1ZSB0byBjbGlwcGluZykKPiAgCSAqLwo+IC0JaWYgKCFp bnRlbF9jcnRjLT5iYXNlLnN0YXRlLT5hY3RpdmUgfHwgIXBsYW5lLT5zdGF0ZS0+ZmIpCj4gKwlp ZiAoIWNydGMtPnN0YXRlLT5hY3RpdmUgfHwgIXBsYW5lLT5zdGF0ZS0+ZmIpCj4gIAkJcmV0dXJu IDA7Cj4gIAo+ICAJaWYgKFdBUk4oY2xvY2sgPT0gMCwgIlBpeGVsIGNsb2NrIGlzIHplcm8hXG4i KSkKPiBAQCAtMTcwMSw3ICsxNzAxLDcgQEAgaHN3X2NvbXB1dGVfbGluZXRpbWVfd20oc3RydWN0 IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGRybV9jcnRjICpjcnRjKQo+ICAJc3RydWN0IGRybV9k aXNwbGF5X21vZGUgKm1vZGUgPSAmaW50ZWxfY3J0Yy0+Y29uZmlnLT5iYXNlLmFkanVzdGVkX21v ZGU7Cj4gIAl1MzIgbGluZXRpbWUsIGlwc19saW5ldGltZTsKPiAgCj4gLQlpZiAoIWludGVsX2Ny dGNfYWN0aXZlKGNydGMpKQo+ICsJaWYgKCFjcnRjLT5zdGF0ZS0+YWN0aXZlKQo+ICAJCXJldHVy biAwOwo+ICAKPiAgCS8qIFRoZSBXTSBhcmUgY29tcHV0ZWQgd2l0aCBiYXNlIG9uIGhvdyBsb25n IGl0IHRha2VzIHRvIGZpbGwgYSBzaW5nbGUKPiBAQCAtMTk1Niw3ICsxOTU2LDcgQEAgc3RhdGlj IHZvaWQgaWxrX2NvbXB1dGVfd21fcGFyYW1ldGVycyhzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCj4g IAllbnVtIHBpcGUgcGlwZSA9IGludGVsX2NydGMtPnBpcGU7Cj4gIAlzdHJ1Y3QgZHJtX3BsYW5l ICpwbGFuZTsKPiAgCj4gLQlpZiAoIWludGVsX2NydGNfYWN0aXZlKGNydGMpKQo+ICsJaWYgKCFj cnRjLT5zdGF0ZS0+YWN0aXZlKQo+ICAJCXJldHVybjsKPiAgCj4gIAlwLT5hY3RpdmUgPSB0cnVl Owo+IEBAIC0yNDY4LDcgKzI0NjgsNyBAQCBza2xfZGRiX2dldF9waXBlX2FsbG9jYXRpb25fbGlt aXRzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCj4gIAo+ICAJbnRoX2FjdGl2ZV9waXBlID0gMDsK PiAgCWZvcl9lYWNoX2NydGMoZGV2LCBjcnRjKSB7Cj4gLQkJaWYgKCFpbnRlbF9jcnRjX2FjdGl2 ZShjcnRjKSkKPiArCQlpZiAoIWNydGMtPnN0YXRlLT5hY3RpdmUpCj4gIAkJCWNvbnRpbnVlOwo+ ICAKPiAgCQlpZiAoY3J0YyA9PSBmb3JfY3J0YykKPiBAQCAtMjcwOCw3ICsyNzA4LDcgQEAgc3Rh dGljIHZvaWQgc2tsX2NvbXB1dGVfd21fZ2xvYmFsX3BhcmFtZXRlcnMoc3RydWN0IGRybV9kZXZp Y2UgKmRldiwKPiAgCXN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lOwo+ICAKPiAgCWxpc3RfZm9yX2Vh Y2hfZW50cnkoY3J0YywgJmRldi0+bW9kZV9jb25maWcuY3J0Y19saXN0LCBoZWFkKQo+IC0JCWNv bmZpZy0+bnVtX3BpcGVzX2FjdGl2ZSArPSBpbnRlbF9jcnRjX2FjdGl2ZShjcnRjKTsKPiArCQlj b25maWctPm51bV9waXBlc19hY3RpdmUgKz0gY3J0Yy0+c3RhdGUtPmFjdGl2ZTsKPiAgCj4gIAkv KiBGSVhNRTogSSBkb24ndCB0aGluayB3ZSBuZWVkIHRob3NlIHR3byBnbG9iYWwgcGFyYW1ldGVy cyBvbiBTS0wgKi8KPiAgCWxpc3RfZm9yX2VhY2hfZW50cnkocGxhbmUsICZkZXYtPm1vZGVfY29u ZmlnLnBsYW5lX2xpc3QsIGhlYWQpIHsKPiBAQCAtMjcyOSw3ICsyNzI5LDcgQEAgc3RhdGljIHZv aWQgc2tsX2NvbXB1dGVfd21fcGlwZV9wYXJhbWV0ZXJzKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywK PiAgCXN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiOwo+ICAJaW50IGkgPSAxOyAvKiBJbmRleCBm b3Igc3ByaXRlIHBsYW5lcyBzdGFydCAqLwo+ICAKPiAtCXAtPmFjdGl2ZSA9IGludGVsX2NydGNf YWN0aXZlKGNydGMpOwo+ICsJcC0+YWN0aXZlID0gY3J0Yy0+c3RhdGUtPmFjdGl2ZTsKPiAgCWlm IChwLT5hY3RpdmUpIHsKPiAgCQlwLT5waXBlX2h0b3RhbCA9IGludGVsX2NydGMtPmNvbmZpZy0+ YmFzZS5hZGp1c3RlZF9tb2RlLmNydGNfaHRvdGFsOwo+ICAJCXAtPnBpeGVsX3JhdGUgPSBza2xf cGlwZV9waXhlbF9yYXRlKGludGVsX2NydGMtPmNvbmZpZyk7Cj4gQEAgLTI4NjAsNyArMjg2MCw3 IEBAIHN0YXRpYyB2b2lkIHNrbF9jb21wdXRlX3dtX2xldmVsKGNvbnN0IHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiwKPiAgc3RhdGljIHVpbnQzMl90Cj4gIHNrbF9jb21wdXRlX2xp bmV0aW1lX3dtKHN0cnVjdCBkcm1fY3J0YyAqY3J0Yywgc3RydWN0IHNrbF9waXBlX3dtX3BhcmFt ZXRlcnMgKnApCj4gIHsKPiAtCWlmICghaW50ZWxfY3J0Y19hY3RpdmUoY3J0YykpCj4gKwlpZiAo IWNydGMtPnN0YXRlLT5hY3RpdmUpCj4gIAkJcmV0dXJuIDA7Cj4gIAo+ICAJcmV0dXJuIERJVl9S T1VORF9VUCg4ICogcC0+cGlwZV9odG90YWwgKiAxMDAwLCBwLT5waXhlbF9yYXRlKTsKPiBAQCAt MzE5MSw3ICszMTkxLDcgQEAgc3RhdGljIHZvaWQgc2tsX3VwZGF0ZV9vdGhlcl9waXBlX3dtKHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYsCj4gIAkJaWYgKHRoaXNfY3J0Yy0+cGlwZSA9PSBpbnRlbF9j cnRjLT5waXBlKQo+ICAJCQljb250aW51ZTsKPiAgCj4gLQkJaWYgKCFpbnRlbF9jcnRjLT5iYXNl LnN0YXRlLT5hY3RpdmUpCj4gKwkJaWYgKCFjcnRjLT5zdGF0ZS0+YWN0aXZlKQo+ICAJCQljb250 aW51ZTsKPiAgCj4gIAkJd21fY2hhbmdlZCA9IHNrbF91cGRhdGVfcGlwZV93bSgmaW50ZWxfY3J0 Yy0+YmFzZSwKPiBAQCAtMzQwNyw3ICszNDA3LDcgQEAgc3RhdGljIHZvaWQgc2tsX3BpcGVfd21f Z2V0X2h3X3N0YXRlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKPiAgCQlody0+cGxhbmVfdHJhbnNb cGlwZV1baV0gPSBJOTE1X1JFQUQoUExBTkVfV01fVFJBTlMocGlwZSwgaSkpOwo+ICAJaHctPmN1 cnNvcl90cmFuc1twaXBlXSA9IEk5MTVfUkVBRChDVVJfV01fVFJBTlMocGlwZSkpOwo+ICAKPiAt CWlmICghaW50ZWxfY3J0Y19hY3RpdmUoY3J0YykpCj4gKwlpZiAoIWNydGMtPnN0YXRlLT5hY3Rp dmUpCj4gIAkJcmV0dXJuOwo+ICAKPiAgCWh3LT5kaXJ0eVtwaXBlXSA9IHRydWU7Cj4gQEAgLTM0 NjIsNyArMzQ2Miw3IEBAIHN0YXRpYyB2b2lkIGlsa19waXBlX3dtX2dldF9od19zdGF0ZShzdHJ1 Y3QgZHJtX2NydGMgKmNydGMpCj4gIAlpZiAoSVNfSEFTV0VMTChkZXYpIHx8IElTX0JST0FEV0VM TChkZXYpKQo+ICAJCWh3LT53bV9saW5ldGltZVtwaXBlXSA9IEk5MTVfUkVBRChQSVBFX1dNX0xJ TkVUSU1FKHBpcGUpKTsKPiAgCj4gLQlhY3RpdmUtPnBpcGVfZW5hYmxlZCA9IGludGVsX2NydGNf YWN0aXZlKGNydGMpOwo+ICsJYWN0aXZlLT5waXBlX2VuYWJsZWQgPSBjcnRjLT5zdGF0ZS0+YWN0 aXZlOwo+ICAKPiAgCWlmIChhY3RpdmUtPnBpcGVfZW5hYmxlZCkgewo+ICAJCXUzMiB0bXAgPSBo dy0+d21fcGlwZVtwaXBlXTsKPiAtLSAKPiAxLjguNS4xCgotLSAKVmlsbGUgU3lyasOkbMOkCklu dGVsIE9UQwpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJ bnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0 cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=