From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH v2 02/12] drm/i915: Calculate watermark related members in the crtc_state, v4. Date: Thu, 3 Dec 2015 15:32:56 +0100 Message-ID: <20151203143256.GR10243@phenom.ffwll.local> References: <1447945645-32005-1-git-send-email-maarten.lankhorst@linux.intel.com> <1447945645-32005-3-git-send-email-maarten.lankhorst@linux.intel.com> <1448373813.2672.19.camel@gmail.com> <56547A50.9010606@linux.intel.com> <1448443379.2907.10.camel@gmail.com> <565C0E34.2040305@linux.intel.com> <56603A49.5000507@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-f54.google.com (mail-wm0-f54.google.com [74.125.82.54]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7F2207A154 for ; Thu, 3 Dec 2015 06:33:01 -0800 (PST) Received: by wmvv187 with SMTP id v187so30074005wmv.1 for ; Thu, 03 Dec 2015 06:32:59 -0800 (PST) Content-Disposition: inline In-Reply-To: <56603A49.5000507@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Maarten Lankhorst Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org T24gVGh1LCBEZWMgMDMsIDIwMTUgYXQgMDE6NDk6MTNQTSArMDEwMCwgTWFhcnRlbiBMYW5raG9y c3Qgd3JvdGU6Cj4gVGhpcyByZW1vdmVzIHByZS9wb3N0X3dtX3VwZGF0ZSBmcm9tIGludGVsX2Ny dGMtPmF0b21pYywgYW5kCj4gY3JlYXRlcyBhdG9taWMgc3RhdGUgZm9yIGl0IGluIGludGVsX2Ny dGMuCj4gICAgIAo+IENoYW5nZXMgc2luY2UgdjE6Cj4gLSBSZWJhc2Ugb24gdG9wIG9mIHdtIGNo YW5nZXMuCj4gQ2hhbmdlcyBzaW5jZSB2MjoKPiAtIFNwbGl0IGRpc2FibGVfY3hzciBpbnRvIGEg c2VwYXJhdGUgcGF0Y2guCj4gQ2hhbmdlcyBzaW5jZSB2MzoKPiAtIE1vdmUgc29tZSBvZiB0aGUg Y2hhbmdlcyB0byBpbnRlbF93bV9uZWVkX3VwZGF0ZS4KPiAKPiBTaWduZWQtb2ZmLWJ5OiBNYWFy dGVuIExhbmtob3JzdCA8bWFhcnRlbi5sYW5raG9yc3RAbGludXguaW50ZWwuY29tPgoKUmV2aWV3 ZWQtYnk6IERhbmllbCBWZXR0ZXIgPGRhbmllbC52ZXR0ZXJAZmZ3bGwuY2g+Cj4gLS0tCj4gZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2F0b21pYy5jIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljLmMKPiBpbmRleCA5ZjA2MzhhMzdiNmQuLjQ2MjVmOGE5 YmExMiAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9taWMuYwo+ ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2F0b21pYy5jCj4gQEAgLTk2LDYgKzk2 LDcgQEAgaW50ZWxfY3J0Y19kdXBsaWNhdGVfc3RhdGUoc3RydWN0IGRybV9jcnRjICpjcnRjKQo+ ICAJY3J0Y19zdGF0ZS0+dXBkYXRlX3BpcGUgPSBmYWxzZTsKPiAgCWNydGNfc3RhdGUtPmRpc2Fi bGVfbHBfd20gPSBmYWxzZTsKPiAgCWNydGNfc3RhdGUtPmRpc2FibGVfY3hzciA9IGZhbHNlOwo+ ICsJY3J0Y19zdGF0ZS0+d21fY2hhbmdlZCA9IGZhbHNlOwo+ICAKPiAgCXJldHVybiAmY3J0Y19z dGF0ZS0+YmFzZTsKPiAgfQo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKPiBpbmRl eCAwMjk3NzdmNzVkZTguLmI5NjQxOWZkNGM5ZSAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kaXNwbGF5LmMKPiBAQCAtNDc2Nyw2ICs0NzY3LDggQEAgaW50ZWxfcHJlX2Rpc2FibGVfcHJp bWFyeShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCj4gIHN0YXRpYyB2b2lkIGludGVsX3Bvc3RfcGxh bmVfdXBkYXRlKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQo+ICB7Cj4gIAlzdHJ1Y3QgaW50ZWxf Y3J0Y19hdG9taWNfY29tbWl0ICphdG9taWMgPSAmY3J0Yy0+YXRvbWljOwo+ICsJc3RydWN0IGlu dGVsX2NydGNfc3RhdGUgKnBpcGVfY29uZmlnID0KPiArCQl0b19pbnRlbF9jcnRjX3N0YXRlKGNy dGMtPmJhc2Uuc3RhdGUpOwo+ICAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMtPmJhc2Uu ZGV2Owo+ICAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJp dmF0ZTsKPiAgCj4gQEAgLTQ3NzcsNyArNDc3OSw3IEBAIHN0YXRpYyB2b2lkIGludGVsX3Bvc3Rf cGxhbmVfdXBkYXRlKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQo+ICAKPiAgCWNydGMtPndtLmN4 c3JfYWxsb3dlZCA9IHRydWU7Cj4gIAo+IC0JaWYgKGNydGMtPmF0b21pYy51cGRhdGVfd21fcG9z dCkKPiArCWlmIChwaXBlX2NvbmZpZy0+d21fY2hhbmdlZCkKPiAgCQlpbnRlbF91cGRhdGVfd2F0 ZXJtYXJrcygmY3J0Yy0+YmFzZSk7Cj4gIAo+ICAJaWYgKGF0b21pYy0+dXBkYXRlX2ZiYykKPiBA QCAtNDgxMCw2ICs0ODEyLDkgQEAgc3RhdGljIHZvaWQgaW50ZWxfcHJlX3BsYW5lX3VwZGF0ZShz dHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKPiAgCQljcnRjLT53bS5jeHNyX2FsbG93ZWQgPSBmYWxz ZTsKPiAgCQlpbnRlbF9zZXRfbWVtb3J5X2N4c3IoZGV2X3ByaXYsIGZhbHNlKTsKPiAgCX0KPiAr Cj4gKwlpZiAoIW5lZWRzX21vZGVzZXQoJnBpcGVfY29uZmlnLT5iYXNlKSAmJiBwaXBlX2NvbmZp Zy0+d21fY2hhbmdlZCkKPiArCQlpbnRlbF91cGRhdGVfd2F0ZXJtYXJrcygmY3J0Yy0+YmFzZSk7 Cj4gIH0KPiAgCj4gIHN0YXRpYyB2b2lkIGludGVsX2NydGNfZGlzYWJsZV9wbGFuZXMoc3RydWN0 IGRybV9jcnRjICpjcnRjLCB1bnNpZ25lZCBwbGFuZV9tYXNrKQo+IEBAIC0xMTY3NCw5ICsxMTY3 OSwxNCBAQCBzdGF0aWMgYm9vbCBpbnRlbF93bV9uZWVkX3VwZGF0ZShzdHJ1Y3QgZHJtX3BsYW5l ICpwbGFuZSwKPiAgCXN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqY3VyID0gdG9faW50ZWxfcGxh bmVfc3RhdGUocGxhbmUtPnN0YXRlKTsKPiAgCj4gIAkvKiBVcGRhdGUgd2F0ZXJtYXJrcyBvbiB0 aWxpbmcgb3Igc2l6ZSBjaGFuZ2VzLiAqLwo+IC0JaWYgKCFwbGFuZS0+c3RhdGUtPmZiIHx8ICFz dGF0ZS0+ZmIgfHwKPiAtCSAgICBwbGFuZS0+c3RhdGUtPmZiLT5tb2RpZmllclswXSAhPSBzdGF0 ZS0+ZmItPm1vZGlmaWVyWzBdIHx8Cj4gLQkgICAgcGxhbmUtPnN0YXRlLT5yb3RhdGlvbiAhPSBz dGF0ZS0+cm90YXRpb24gfHwKPiArCWlmIChuZXctPnZpc2libGUgIT0gY3VyLT52aXNpYmxlKQo+ ICsJCXJldHVybiB0cnVlOwo+ICsKPiArCWlmICghY3VyLT5iYXNlLmZiIHx8ICFuZXctPmJhc2Uu ZmIpCj4gKwkJcmV0dXJuIGZhbHNlOwo+ICsKPiArCWlmIChjdXItPmJhc2UuZmItPm1vZGlmaWVy WzBdICE9IG5ldy0+YmFzZS5mYi0+bW9kaWZpZXJbMF0gfHwKPiArCSAgICBjdXItPmJhc2Uucm90 YXRpb24gIT0gbmV3LT5iYXNlLnJvdGF0aW9uIHx8Cj4gIAkgICAgZHJtX3JlY3Rfd2lkdGgoJm5l dy0+c3JjKSAhPSBkcm1fcmVjdF93aWR0aCgmY3VyLT5zcmMpIHx8Cj4gIAkgICAgZHJtX3JlY3Rf aGVpZ2h0KCZuZXctPnNyYykgIT0gZHJtX3JlY3RfaGVpZ2h0KCZjdXItPnNyYykgfHwKPiAgCSAg ICBkcm1fcmVjdF93aWR0aCgmbmV3LT5kc3QpICE9IGRybV9yZWN0X3dpZHRoKCZjdXItPmRzdCkg fHwKPiBAQCAtMTE3NDYsMTcgKzExNzU2LDkgQEAgaW50IGludGVsX3BsYW5lX2F0b21pY19jYWxj X2NoYW5nZXMoc3RydWN0IGRybV9jcnRjX3N0YXRlICpjcnRjX3N0YXRlLAo+ICAJCQkgcGxhbmUt PmJhc2UuaWQsIHdhc192aXNpYmxlLCB2aXNpYmxlLAo+ICAJCQkgdHVybl9vZmYsIHR1cm5fb24s IG1vZGVfY2hhbmdlZCk7Cj4gIAo+IC0JaWYgKHR1cm5fb24pIHsKPiAtCQlpbnRlbF9jcnRjLT5h dG9taWMudXBkYXRlX3dtX3ByZSA9IHRydWU7Cj4gLQkJLyogbXVzdCBkaXNhYmxlIGN4c3IgYXJv dW5kIHBsYW5lIGVuYWJsZS9kaXNhYmxlICovCj4gLQkJaWYgKHBsYW5lLT50eXBlICE9IERSTV9Q TEFORV9UWVBFX0NVUlNPUikgewo+IC0JCQlwaXBlX2NvbmZpZy0+ZGlzYWJsZV9jeHNyID0gdHJ1 ZTsKPiAtCQkJLyogdG8gcG90ZW50aWFsbHkgcmUtZW5hYmxlIGN4c3IgKi8KPiAtCQkJaW50ZWxf Y3J0Yy0+YXRvbWljLndhaXRfdmJsYW5rID0gdHJ1ZTsKPiAtCQkJaW50ZWxfY3J0Yy0+YXRvbWlj LnVwZGF0ZV93bV9wb3N0ID0gdHJ1ZTsKPiAtCQl9Cj4gLQl9IGVsc2UgaWYgKHR1cm5fb2ZmKSB7 Cj4gLQkJaW50ZWxfY3J0Yy0+YXRvbWljLnVwZGF0ZV93bV9wb3N0ID0gdHJ1ZTsKPiArCWlmICh0 dXJuX29uIHx8IHR1cm5fb2ZmKSB7Cj4gKwkJcGlwZV9jb25maWctPndtX2NoYW5nZWQgPSB0cnVl Owo+ICsKPiAgCQkvKiBtdXN0IGRpc2FibGUgY3hzciBhcm91bmQgcGxhbmUgZW5hYmxlL2Rpc2Fi bGUgKi8KPiAgCQlpZiAocGxhbmUtPnR5cGUgIT0gRFJNX1BMQU5FX1RZUEVfQ1VSU09SKSB7Cj4g IAkJCWlmIChpc19jcnRjX2VuYWJsZWQpCj4gQEAgLTExNzY0LDcgKzExNzY2LDcgQEAgaW50IGlu dGVsX3BsYW5lX2F0b21pY19jYWxjX2NoYW5nZXMoc3RydWN0IGRybV9jcnRjX3N0YXRlICpjcnRj X3N0YXRlLAo+ICAJCQlwaXBlX2NvbmZpZy0+ZGlzYWJsZV9jeHNyID0gdHJ1ZTsKPiAgCQl9Cj4g IAl9IGVsc2UgaWYgKGludGVsX3dtX25lZWRfdXBkYXRlKHBsYW5lLCBwbGFuZV9zdGF0ZSkpIHsK PiAtCQlpbnRlbF9jcnRjLT5hdG9taWMudXBkYXRlX3dtX3ByZSA9IHRydWU7Cj4gKwkJcGlwZV9j b25maWctPndtX2NoYW5nZWQgPSB0cnVlOwo+ICAJfQo+ICAKPiAgCWlmICh2aXNpYmxlIHx8IHdh c192aXNpYmxlKQo+IEBAIC0xMTkwOSw3ICsxMTkxMSw3IEBAIHN0YXRpYyBpbnQgaW50ZWxfY3J0 Y19hdG9taWNfY2hlY2soc3RydWN0IGRybV9jcnRjICpjcnRjLAo+ICAJfQo+ICAKPiAgCWlmICht b2RlX2NoYW5nZWQgJiYgIWNydGNfc3RhdGUtPmFjdGl2ZSkKPiAtCQlpbnRlbF9jcnRjLT5hdG9t aWMudXBkYXRlX3dtX3Bvc3QgPSB0cnVlOwo+ICsJCXBpcGVfY29uZmlnLT53bV9jaGFuZ2VkID0g dHJ1ZTsKPiAgCj4gIAlpZiAobW9kZV9jaGFuZ2VkICYmIGNydGNfc3RhdGUtPmVuYWJsZSAmJgo+ ICAJICAgIGRldl9wcml2LT5kaXNwbGF5LmNydGNfY29tcHV0ZV9jbG9jayAmJgo+IEBAIC0xMzgw OSw5ICsxMzgxMSw2IEBAIHN0YXRpYyB2b2lkIGludGVsX2JlZ2luX2NydGNfY29tbWl0KHN0cnVj dCBkcm1fY3J0YyAqY3J0YywKPiAgCQl0b19pbnRlbF9jcnRjX3N0YXRlKG9sZF9jcnRjX3N0YXRl KTsKPiAgCWJvb2wgbW9kZXNldCA9IG5lZWRzX21vZGVzZXQoY3J0Yy0+c3RhdGUpOwo+ICAKPiAt CWlmIChpbnRlbF9jcnRjLT5hdG9taWMudXBkYXRlX3dtX3ByZSkKPiAtCQlpbnRlbF91cGRhdGVf d2F0ZXJtYXJrcyhjcnRjKTsKPiAtCj4gIAkvKiBQZXJmb3JtIHZibGFuayBldmFzaW9uIGFyb3Vu ZCBjb21taXQgb3BlcmF0aW9uICovCj4gIAlpbnRlbF9waXBlX3VwZGF0ZV9zdGFydChpbnRlbF9j cnRjKTsKPiAgCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5o IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKPiBpbmRleCA1MzQwNWNkYzAxZjQu LjRmNWQwOTQ5MTM3ZSAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k cnYuaAo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCj4gQEAgLTM3Miw2 ICszNzIsNyBAQCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSB7Cj4gIAo+ICAJYm9vbCB1cGRhdGVf cGlwZTsgLyogY2FuIGEgZmFzdCBtb2Rlc2V0IGJlIHBlcmZvcm1lZD8gKi8KPiAgCWJvb2wgZGlz YWJsZV9jeHNyOwo+ICsJYm9vbCB3bV9jaGFuZ2VkOyAvKiB3YXRlcm1hcmtzIGFyZSB1cGRhdGVk ICovCj4gIAo+ICAJLyogUGlwZSBzb3VyY2Ugc2l6ZSAoaWUuIHBhbmVsIGZpdHRlciBpbnB1dCBz aXplKQo+ICAJICogQWxsIHBsYW5lcyB3aWxsIGJlIHBvc2l0aW9uZWQgaW5zaWRlIHRoaXMgc3Bh Y2UsCj4gQEAgLTUzNSw3ICs1MzYsNiBAQCBzdHJ1Y3QgaW50ZWxfY3J0Y19hdG9taWNfY29tbWl0 IHsKPiAgCWJvb2wgZGlzYWJsZV9mYmM7Cj4gIAlib29sIGRpc2FibGVfaXBzOwo+ICAJYm9vbCBw cmVfZGlzYWJsZV9wcmltYXJ5Owo+IC0JYm9vbCB1cGRhdGVfd21fcHJlLCB1cGRhdGVfd21fcG9z dDsKPiAgCj4gIAkvKiBTbGVlcGFibGUgb3BlcmF0aW9ucyB0byBwZXJmb3JtIGFmdGVyIGNvbW1p dCAqLwo+ICAJdW5zaWduZWQgZmJfYml0czsKPiAKPiBfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwo+IEludGVsLWdmeCBtYWlsaW5nIGxpc3QKPiBJbnRlbC1n ZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCj4gaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9t YWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAoKLS0gCkRhbmllbCBWZXR0ZXIKU29mdHdhcmUgRW5n aW5lZXIsIEludGVsIENvcnBvcmF0aW9uCmh0dHA6Ly9ibG9nLmZmd2xsLmNoCl9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxp c3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0 b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==