From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH 08/13] drm/i915: Move active watermarks into CRTC state (v2) Date: Wed, 26 Aug 2015 16:10:53 +0300 Message-ID: <20150826131053.GQ5176@intel.com> References: <1440119524-13867-1-git-send-email-matthew.d.roper@intel.com> <1440119524-13867-9-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 mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 1317D6E308 for ; Wed, 26 Aug 2015 06:11:12 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1440119524-13867-9-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: ander.conselvan.de.oliveira@intel.com, intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org T24gVGh1LCBBdWcgMjAsIDIwMTUgYXQgMDY6MTE6NTlQTSAtMDcwMCwgTWF0dCBSb3BlciB3cm90 ZToKPiBTaW5jZSB3ZSBhbGxvY2F0ZSBhIGZldyBDUlRDIHN0YXRlcyBvbiB0aGUgc3RhY2ssIGFs c28gc3dpdGNoIHRoZSAnd20nCj4gc3RydWN0IGhlcmUgdG8gYmUgYSB1bmlvbiBzbyB0aGF0IHdl J3JlIG5vdCB3YXN0aW5nIHN0YWNrIHNwYWNlIHdpdGgKPiBvdGhlciBwbGF0Zm9ybXMnIHdhdGVy bWFyayB2YWx1ZXMuCj4gCgpJIGRvbid0IGxpa2UgdGhpcyBwYXRjaC4gVGhlIGxvY2tpbmcgcnVs ZXMgKG9uY2Ugd2UgaGF2ZSB0aGUgdmJsYW5rCnVwZGF0ZSBtYWNoaW5lcnkgYW5kIHdtLm11dGV4 KSB3aWxsIGJlIHRvdGFsbHkgZGlmZmVyZW50IGZvciB0aGUgYWN0aXZlCndtcyB2cy4gdGhlIGNy dGMgc3RhdGUuIFNvIHRoaXMgd291bGQgbmVlZCB0byByZXZlcnRlZCB3aGVuIHdlIGFkZCB0aGUK dmJsYW5rIHdtIG1hY2hpbmVyeS4KClRoYXQncyBhdCBsZWFzdCBmb3IgSUxLKy4gTm90IHN1cmUg YWJvdXQgU0tMIHNpbmNlIEkndmUgbm90IHJlYWxseQp0aG91Z2h0IGFib3V0IGl0IHNvIGZhci4K Cj4gdjI6IERvbid0IG1vdmUgY3hzcl9hbGxvd2VkIHRvIHN0YXRlIChNYWFydGVuKQo+IAo+IFNp Z25lZC1vZmYtYnk6IE1hdHQgUm9wZXIgPG1hdHRoZXcuZC5yb3BlckBpbnRlbC5jb20+Cj4gLS0t Cj4gIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oIHwgNDUgKysrKysrKysrKysrKysr KysrKysrKystLS0tLS0tLS0tLS0tLS0tLQo+ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9w bS5jICB8IDMwICsrKysrKysrKysrKysrKystLS0tLS0tLS0tLQo+ICAyIGZpbGVzIGNoYW5nZWQs IDQ0IGluc2VydGlvbnMoKyksIDMxIGRlbGV0aW9ucygtKQo+IAo+IGRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2Rydi5oCj4gaW5kZXggNjVmMDE3MS4uZGZiZmJhOSAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kcnYuaAo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2Rydi5oCj4gQEAgLTMyMyw2ICszMjMsMjEgQEAgc3RydWN0IGludGVsX2NydGNfc2NhbGVyX3N0 YXRlIHsKPiAgLyogZHJtX21vZGUtPnByaXZhdGVfZmxhZ3MgKi8KPiAgI2RlZmluZSBJOTE1X01P REVfRkxBR19JTkhFUklURUQgMQo+ICAKPiArc3RydWN0IGludGVsX3BpcGVfd20gewo+ICsJc3Ry dWN0IGludGVsX3dtX2xldmVsIHdtWzVdOwo+ICsJdWludDMyX3QgbGluZXRpbWU7Cj4gKwlib29s IGZiY193bV9lbmFibGVkOwo+ICsJYm9vbCBwaXBlX2VuYWJsZWQ7Cj4gKwlib29sIHNwcml0ZXNf ZW5hYmxlZDsKPiArCWJvb2wgc3ByaXRlc19zY2FsZWQ7Cj4gK307Cj4gKwo+ICtzdHJ1Y3Qgc2ts X3BpcGVfd20gewo+ICsJc3RydWN0IHNrbF93bV9sZXZlbCB3bVs4XTsKPiArCXN0cnVjdCBza2xf d21fbGV2ZWwgdHJhbnNfd207Cj4gKwl1aW50MzJfdCBsaW5ldGltZTsKPiArfTsKPiArCj4gIHN0 cnVjdCBpbnRlbF9jcnRjX3N0YXRlIHsKPiAgCXN0cnVjdCBkcm1fY3J0Y19zdGF0ZSBiYXNlOwo+ ICAKPiBAQCAtNDU4LDYgKzQ3MywxNyBAQCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSB7Cj4gIAo+ ICAJLyogSVZCIHNwcml0ZSBzY2FsaW5nIHcvYSAoV2FDeFNSRGlzYWJsZWRGb3JTcHJpdGVTY2Fs aW5nOml2YikgKi8KPiAgCWJvb2wgZGlzYWJsZV9scF93bTsKPiArCj4gKwlzdHJ1Y3Qgewo+ICsJ CS8qCj4gKwkJICogZmluYWwgd2F0ZXJtYXJrcywgcHJvZ3JhbW1lZCBwb3N0LXZibGFuayB3aGVu IHRoaXMgc3RhdGUKPiArCQkgKiBpcyBjb21taXR0ZWQKPiArCQkgKi8KPiArCQl1bmlvbiB7Cj4g KwkJCXN0cnVjdCBpbnRlbF9waXBlX3dtIGlsazsKPiArCQkJc3RydWN0IHNrbF9waXBlX3dtIHNr bDsKPiArCQl9IGFjdGl2ZTsKPiArCX0gd207Cj4gIH07Cj4gIAo+ICBzdHJ1Y3Qgdmx2X3dtX3N0 YXRlIHsKPiBAQCAtNDY5LDE1ICs0OTUsNiBAQCBzdHJ1Y3Qgdmx2X3dtX3N0YXRlIHsKPiAgCWJv b2wgY3hzcjsKPiAgfTsKPiAgCj4gLXN0cnVjdCBpbnRlbF9waXBlX3dtIHsKPiAtCXN0cnVjdCBp bnRlbF93bV9sZXZlbCB3bVs1XTsKPiAtCXVpbnQzMl90IGxpbmV0aW1lOwo+IC0JYm9vbCBmYmNf d21fZW5hYmxlZDsKPiAtCWJvb2wgcGlwZV9lbmFibGVkOwo+IC0JYm9vbCBzcHJpdGVzX2VuYWJs ZWQ7Cj4gLQlib29sIHNwcml0ZXNfc2NhbGVkOwo+IC19Owo+IC0KPiAgc3RydWN0IGludGVsX21t aW9fZmxpcCB7Cj4gIAlzdHJ1Y3Qgd29ya19zdHJ1Y3Qgd29yazsKPiAgCXN0cnVjdCBkcm1faTkx NV9wcml2YXRlICppOTE1Owo+IEBAIC00ODUsMTIgKzUwMiw2IEBAIHN0cnVjdCBpbnRlbF9tbWlv X2ZsaXAgewo+ICAJc3RydWN0IGludGVsX2NydGMgKmNydGM7Cj4gIH07Cj4gIAo+IC1zdHJ1Y3Qg c2tsX3BpcGVfd20gewo+IC0Jc3RydWN0IHNrbF93bV9sZXZlbCB3bVs4XTsKPiAtCXN0cnVjdCBz a2xfd21fbGV2ZWwgdHJhbnNfd207Cj4gLQl1aW50MzJfdCBsaW5ldGltZTsKPiAtfTsKPiAtCj4g IC8qCj4gICAqIFRyYWNraW5nIG9mIG9wZXJhdGlvbnMgdGhhdCBuZWVkIHRvIGJlIHBlcmZvcm1l ZCBhdCB0aGUgYmVnaW5uaW5nL2VuZCBvZiBhbgo+ICAgKiBhdG9taWMgY29tbWl0LCBvdXRzaWRl IHRoZSBhdG9taWMgc2VjdGlvbiB3aGVyZSBpbnRlcnJ1cHRzIGFyZSBkaXNhYmxlZC4KPiBAQCAt NTU1LDEwICs1NjYsNiBAQCBzdHJ1Y3QgaW50ZWxfY3J0YyB7Cj4gIAo+ICAJLyogcGVyLXBpcGUg d2F0ZXJtYXJrIHN0YXRlICovCj4gIAlzdHJ1Y3Qgewo+IC0JCS8qIHdhdGVybWFya3MgY3VycmVu dGx5IGJlaW5nIHVzZWQgICovCj4gLQkJc3RydWN0IGludGVsX3BpcGVfd20gYWN0aXZlOwo+IC0J CS8qIFNLTCB3bSB2YWx1ZXMgY3VycmVudGx5IGluIHVzZSAqLwo+IC0JCXN0cnVjdCBza2xfcGlw ZV93bSBza2xfYWN0aXZlOwo+ICAJCS8qIGFsbG93IEN4U1Igb24gdGhpcyBwaXBlICovCj4gIAkJ Ym9vbCBjeHNyX2FsbG93ZWQ7Cj4gIAl9IHdtOwo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9wbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwo+IGlu ZGV4IDViNzljMmYuLjA0ZmMwOTIgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfcG0uYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKPiBAQCAt MjM0NSw3ICsyMzQ1LDkgQEAgc3RhdGljIHZvaWQgaWxrX2NvbXB1dGVfd21fY29uZmlnKHN0cnVj dCBkcm1fZGV2aWNlICpkZXYsCj4gIAo+ICAJLyogQ29tcHV0ZSB0aGUgY3VycmVudGx5IF9hY3Rp dmVfIGNvbmZpZyAqLwo+ICAJZm9yX2VhY2hfaW50ZWxfY3J0YyhkZXYsIGludGVsX2NydGMpIHsK PiAtCQljb25zdCBzdHJ1Y3QgaW50ZWxfcGlwZV93bSAqd20gPSAmaW50ZWxfY3J0Yy0+d20uYWN0 aXZlOwo+ICsJCWNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjc3RhdGUgPQo+ICsJCQl0 b19pbnRlbF9jcnRjX3N0YXRlKGludGVsX2NydGMtPmJhc2Uuc3RhdGUpOwo+ICsJCWNvbnN0IHN0 cnVjdCBpbnRlbF9waXBlX3dtICp3bSA9ICZjc3RhdGUtPndtLmFjdGl2ZS5pbGs7Cj4gIAo+ICAJ CWlmICghd20tPnBpcGVfZW5hYmxlZCkKPiAgCQkJY29udGludWU7Cj4gQEAgLTI0NDIsNyArMjQ0 NCw5IEBAIHN0YXRpYyB2b2lkIGlsa19tZXJnZV93bV9sZXZlbChzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2LAo+ICAJcmV0X3dtLT5lbmFibGUgPSB0cnVlOwo+ICAKPiAgCWZvcl9lYWNoX2ludGVsX2Ny dGMoZGV2LCBpbnRlbF9jcnRjKSB7Cj4gLQkJY29uc3Qgc3RydWN0IGludGVsX3BpcGVfd20gKmFj dGl2ZSA9ICZpbnRlbF9jcnRjLT53bS5hY3RpdmU7Cj4gKwkJY29uc3Qgc3RydWN0IGludGVsX2Ny dGNfc3RhdGUgKmNzdGF0ZSA9Cj4gKwkJCXRvX2ludGVsX2NydGNfc3RhdGUoaW50ZWxfY3J0Yy0+ YmFzZS5zdGF0ZSk7Cj4gKwkJY29uc3Qgc3RydWN0IGludGVsX3BpcGVfd20gKmFjdGl2ZSA9ICZj c3RhdGUtPndtLmFjdGl2ZS5pbGs7Cj4gIAkJY29uc3Qgc3RydWN0IGludGVsX3dtX2xldmVsICp3 bSA9ICZhY3RpdmUtPndtW2xldmVsXTsKPiAgCj4gIAkJaWYgKCFhY3RpdmUtPnBpcGVfZW5hYmxl ZCkKPiBAQCAtMjU5MCwxNCArMjU5NCwxNSBAQCBzdGF0aWMgdm9pZCBpbGtfY29tcHV0ZV93bV9y ZXN1bHRzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCj4gIAo+ICAJLyogTFAwIHJlZ2lzdGVyIHZh bHVlcyAqLwo+ICAJZm9yX2VhY2hfaW50ZWxfY3J0YyhkZXYsIGludGVsX2NydGMpIHsKPiArCQlj b25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlID0KPiArCQkJdG9faW50ZWxfY3J0 Y19zdGF0ZShpbnRlbF9jcnRjLT5iYXNlLnN0YXRlKTsKPiAgCQllbnVtIHBpcGUgcGlwZSA9IGlu dGVsX2NydGMtPnBpcGU7Cj4gLQkJY29uc3Qgc3RydWN0IGludGVsX3dtX2xldmVsICpyID0KPiAt CQkJJmludGVsX2NydGMtPndtLmFjdGl2ZS53bVswXTsKPiArCQljb25zdCBzdHJ1Y3QgaW50ZWxf d21fbGV2ZWwgKnIgPSAmY3N0YXRlLT53bS5hY3RpdmUuaWxrLndtWzBdOwo+ICAKPiAgCQlpZiAo V0FSTl9PTighci0+ZW5hYmxlKSkKPiAgCQkJY29udGludWU7Cj4gIAo+IC0JCXJlc3VsdHMtPndt X2xpbmV0aW1lW3BpcGVdID0gaW50ZWxfY3J0Yy0+d20uYWN0aXZlLmxpbmV0aW1lOwo+ICsJCXJl c3VsdHMtPndtX2xpbmV0aW1lW3BpcGVdID0gY3N0YXRlLT53bS5hY3RpdmUuaWxrLmxpbmV0aW1l Owo+ICAKPiAgCQlyZXN1bHRzLT53bV9waXBlW3BpcGVdID0KPiAgCQkJKHItPnByaV92YWwgPDwg V00wX1BJUEVfUExBTkVfU0hJRlQpIHwKPiBAQCAtMzU2NCwxNiArMzU2OSwxNSBAQCBzdGF0aWMg Ym9vbCBza2xfdXBkYXRlX3BpcGVfd20oc3RydWN0IGRybV9jcnRjICpjcnRjLAo+ICAJCQkgICAg ICAgc3RydWN0IHNrbF9kZGJfYWxsb2NhdGlvbiAqZGRiLCAvKiBvdXQgKi8KPiAgCQkJICAgICAg IHN0cnVjdCBza2xfcGlwZV93bSAqcGlwZV93bSAvKiBvdXQgKi8pCj4gIHsKPiAtCXN0cnVjdCBp bnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjKTsKPiAgCXN0cnVjdCBp bnRlbF9jcnRjX3N0YXRlICpjc3RhdGUgPSB0b19pbnRlbF9jcnRjX3N0YXRlKGNydGMtPnN0YXRl KTsKPiAgCj4gIAlza2xfYWxsb2NhdGVfcGlwZV9kZGIoY3J0YywgY29uZmlnLCBjc3RhdGUsIGRk Yik7Cj4gIAlza2xfY29tcHV0ZV9waXBlX3dtKGNydGMsIGRkYiwgY3N0YXRlLCBwaXBlX3dtKTsK PiAgCj4gLQlpZiAoIW1lbWNtcCgmaW50ZWxfY3J0Yy0+d20uc2tsX2FjdGl2ZSwgcGlwZV93bSwg c2l6ZW9mKCpwaXBlX3dtKSkpCj4gKwlpZiAoIW1lbWNtcCgmY3N0YXRlLT53bS5hY3RpdmUuc2ts LCBwaXBlX3dtLCBzaXplb2YoKnBpcGVfd20pKSkKPiAgCQlyZXR1cm4gZmFsc2U7Cj4gIAo+IC0J aW50ZWxfY3J0Yy0+d20uc2tsX2FjdGl2ZSA9ICpwaXBlX3dtOwo+ICsJY3N0YXRlLT53bS5hY3Rp dmUuc2tsID0gKnBpcGVfd207Cj4gIAo+ICAJcmV0dXJuIHRydWU7Cj4gIH0KPiBAQCAtMzcwNiwx MCArMzcxMCwxMCBAQCBzdGF0aWMgdm9pZCBpbGtfdXBkYXRlX3dtKHN0cnVjdCBkcm1fY3J0YyAq Y3J0YykKPiAgCj4gIAlpbnRlbF9jb21wdXRlX3BpcGVfd20oY3N0YXRlLCAmcGlwZV93bSk7Cj4g IAo+IC0JaWYgKCFtZW1jbXAoJmludGVsX2NydGMtPndtLmFjdGl2ZSwgJnBpcGVfd20sIHNpemVv ZihwaXBlX3dtKSkpCj4gKwlpZiAoIW1lbWNtcCgmY3N0YXRlLT53bS5hY3RpdmUuaWxrLCAmcGlw ZV93bSwgc2l6ZW9mKHBpcGVfd20pKSkKPiAgCQlyZXR1cm47Cj4gIAo+IC0JaW50ZWxfY3J0Yy0+ d20uYWN0aXZlID0gcGlwZV93bTsKPiArCWNzdGF0ZS0+d20uYWN0aXZlLmlsayA9IHBpcGVfd207 Cj4gIAo+ICAJaWxrX3Byb2dyYW1fd2F0ZXJtYXJrcyhkZXZfcHJpdik7Cj4gIH0KPiBAQCAtMzc2 NCw3ICszNzY4LDggQEAgc3RhdGljIHZvaWQgc2tsX3BpcGVfd21fZ2V0X2h3X3N0YXRlKHN0cnVj dCBkcm1fY3J0YyAqY3J0YykKPiAgCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9 IGRldi0+ZGV2X3ByaXZhdGU7Cj4gIAlzdHJ1Y3Qgc2tsX3dtX3ZhbHVlcyAqaHcgPSAmZGV2X3By aXYtPndtLnNrbF9odzsKPiAgCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50 ZWxfY3J0YyhjcnRjKTsKPiAtCXN0cnVjdCBza2xfcGlwZV93bSAqYWN0aXZlID0gJmludGVsX2Ny dGMtPndtLnNrbF9hY3RpdmU7Cj4gKwlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlID0g dG9faW50ZWxfY3J0Y19zdGF0ZShjcnRjLT5zdGF0ZSk7Cj4gKwlzdHJ1Y3Qgc2tsX3BpcGVfd20g KmFjdGl2ZSA9ICZjc3RhdGUtPndtLmFjdGl2ZS5za2w7Cj4gIAllbnVtIHBpcGUgcGlwZSA9IGlu dGVsX2NydGMtPnBpcGU7Cj4gIAlpbnQgbGV2ZWwsIGksIG1heF9sZXZlbDsKPiAgCXVpbnQzMl90 IHRlbXA7Cj4gQEAgLTM4MjcsNyArMzgzMiw4IEBAIHN0YXRpYyB2b2lkIGlsa19waXBlX3dtX2dl dF9od19zdGF0ZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCj4gIAlzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwo+ICAJc3RydWN0IGlsa193bV92YWx1 ZXMgKmh3ID0gJmRldl9wcml2LT53bS5odzsKPiAgCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9j cnRjID0gdG9faW50ZWxfY3J0YyhjcnRjKTsKPiAtCXN0cnVjdCBpbnRlbF9waXBlX3dtICphY3Rp dmUgPSAmaW50ZWxfY3J0Yy0+d20uYWN0aXZlOwo+ICsJc3RydWN0IGludGVsX2NydGNfc3RhdGUg KmNzdGF0ZSA9IHRvX2ludGVsX2NydGNfc3RhdGUoY3J0Yy0+c3RhdGUpOwo+ICsJc3RydWN0IGlu dGVsX3BpcGVfd20gKmFjdGl2ZSA9ICZjc3RhdGUtPndtLmFjdGl2ZS5pbGs7Cj4gIAllbnVtIHBp cGUgcGlwZSA9IGludGVsX2NydGMtPnBpcGU7Cj4gIAlzdGF0aWMgY29uc3QgdW5zaWduZWQgaW50 IHdtMF9waXBlX3JlZ1tdID0gewo+ICAJCVtQSVBFX0FdID0gV00wX1BJUEVBX0lMSywKPiAtLSAK PiAyLjEuNAo+IAo+IF9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCj4gSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdAo+IEludGVsLWdmeEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKPiBodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50 ZWwtZ2Z4CgotLSAKVmlsbGUgU3lyasOkbMOkCkludGVsIE9UQwpfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVs LWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9t YWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=