From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matt Roper Subject: Re: [PATCH 3/3] drm/i915: Use plane->state->fb in watermark code (v2) Date: Tue, 3 Mar 2015 07:33:24 -0800 Message-ID: <20150303153324.GC23269@intel.com> References: <1425060721-12226-1-git-send-email-matthew.d.roper@intel.com> <1425060721-12226-4-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 mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id E83E66E537 for ; Tue, 3 Mar 2015 07:33:25 -0800 (PST) Content-Disposition: inline In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Paulo Zanoni Cc: Intel Graphics Development List-Id: intel-gfx@lists.freedesktop.org T24gVHVlLCBNYXIgMDMsIDIwMTUgYXQgMDg6MjE6NDRBTSAtMDMwMCwgUGF1bG8gWmFub25pIHdy b3RlOgo+IEhpCj4gCj4gMjAxNS0wMi0yNyAxNToxMiBHTVQtMDM6MDAgTWF0dCBSb3BlciA8bWF0 dGhldy5kLnJvcGVyQGludGVsLmNvbT46Cj4gPiBwbGFuZS0+ZmIgaXMgYSBsZWdhY3kgcG9pbnRl ciB0aGF0IG5vdCBhbHdheXMgYmUgdXAtdG8tZGF0ZSAob3IgdXBkYXRlZAo+ID4gZWFybHkgZW5v dWdoKS4gIE1ha2Ugc3VyZSB0aGUgd2F0ZXJtYXJrIGNvZGUgdXNlcyBwbGFuZS0+c3RhdGUtPmZi IHNvCj4gPiB0aGF0IHdlJ3JlIGFsd2F5cyBkb2luZyBvdXIgY2FsY3VsYXRpb25zIGJhc2VkIG9u IHRoZSBjb3JyZWN0Cj4gPiBmcmFtZWJ1ZmZlcnMuCj4gCj4gUUEgcmVwb3J0ZWQgYSByZWdyZXNz aW9uIGNhdXNlZCBieSB0aGlzIHBhdGNoOiBLZXJuZWwgTlVMTCBwb2ludGVyIGRlcmVmZXJlbmNl Lgo+IAo+IGh0dHBzOi8vYnVncy5mcmVlZGVza3RvcC5vcmcvc2hvd19idWcuY2dpP2lkPTg5Mzg4 Cj4gCgpZZWFoLCBJIGp1c3Qgc2F3IHRoaXMuICBJJ2xsIGhhdmUgdG8gbG9vayBtb3JlIGNsb3Nl bHkgbGF0ZXIgdG9kYXksIGJ1dApJJ20gd29uZGVyaW5nIHdoZXRoZXIgSSBzaG91bGQgaGF2ZSBq dXN0IGRvbmUgdGhpcyByZXBsYWNlbWVudApkcml2ZXItd2lkZSBpbnN0ZWFkIG9mIHJlc3RyaWN0 ZWQgdG8ganVzdCB0aGUgd2F0ZXJtYXJrIGNvZGUuICBJIHN1c3BlY3QKa2lsbGluZyBvZmYgYWxs IG9mIG91ciB1c2VzIG9mIHRoZSBvbGQsIGxlZ2FjeSBmaWVsZHMgYW5kIHVzaW5nIHRoZSBuZXcK YXRvbWljIHN0YXRlIHZhbHVlcyBpbnN0ZWFkIHdpbGwgbWFrZSB0aGUgZHJpdmVyIG1vcmUgaW50 ZXJuYWxseQpjb25zaXN0ZW50IHNvIHdlIHF1aXQgcnVubmluZyBpbnRvIGlzc3VlcyBsaWtlIHRo aXMuCgoKTWF0dAoKPiAKPiA+Cj4gPiBUaGlzIHBhdGNoIHdhcyBnZW5lcmF0ZWQgYnkgQ29jY2lu ZWxsZSB3aXRoIHRoZSBmb2xsb3dpbmcgc2VtYW50aWMKPiA+IHBhdGNoOgo+ID4KPiA+ICAgICAg ICAgQEAKPiA+ICAgICAgICAgc3RydWN0IGRybV9wbGFuZSAqUDsKPiA+ICAgICAgICAgQEAKPiA+ ICAgICAgICAgLSBQLT5mYgo+ID4gICAgICAgICArIFAtPnN0YXRlLT5mYgo+ID4KPiA+IHYyOiBS ZWJhc2UKPiA+Cj4gPiBTaWduZWQtb2ZmLWJ5OiBNYXR0IFJvcGVyIDxtYXR0aGV3LmQucm9wZXJA aW50ZWwuY29tPgo+ID4gLS0tCj4gPiAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfd20uYyB8 IDIyICsrKysrKysrKysrLS0tLS0tLS0tLS0KPiA+ICAxIGZpbGUgY2hhbmdlZCwgMTEgaW5zZXJ0 aW9ucygrKSwgMTEgZGVsZXRpb25zKC0pCj4gPgo+ID4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3dtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF93bS5jCj4g PiBpbmRleCA0N2E1MTc1Li5lODc3ZTAyIDEwMDY0NAo+ID4gLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfd20uYwo+ID4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfd20u Ywo+ID4gQEAgLTQ5Niw3ICs0OTYsNyBAQCBzdGF0aWMgdm9pZCBwaW5ldmlld191cGRhdGVfd20o c3RydWN0IGRybV9jcnRjICp1bnVzZWRfY3J0YykKPiA+ICAgICAgICAgY3J0YyA9IHNpbmdsZV9l bmFibGVkX2NydGMoZGV2KTsKPiA+ICAgICAgICAgaWYgKGNydGMpIHsKPiA+ICAgICAgICAgICAg ICAgICBjb25zdCBzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSAqYWRqdXN0ZWRfbW9kZTsKPiA+IC0g ICAgICAgICAgICAgICBpbnQgcGl4ZWxfc2l6ZSA9IGNydGMtPnByaW1hcnktPmZiLT5iaXRzX3Bl cl9waXhlbCAvIDg7Cj4gPiArICAgICAgICAgICAgICAgaW50IHBpeGVsX3NpemUgPSBjcnRjLT5w cmltYXJ5LT5zdGF0ZS0+ZmItPmJpdHNfcGVyX3BpeGVsIC8gODsKPiA+ICAgICAgICAgICAgICAg ICBpbnQgY2xvY2s7Cj4gPgo+ID4gICAgICAgICAgICAgICAgIGFkanVzdGVkX21vZGUgPSAmdG9f aW50ZWxfY3J0YyhjcnRjKS0+Y29uZmlnLT5iYXNlLmFkanVzdGVkX21vZGU7Cj4gPiBAQCAtNTcy LDcgKzU3Miw3IEBAIHN0YXRpYyBib29sIGc0eF9jb21wdXRlX3dtMChzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2LAo+ID4gICAgICAgICBjbG9jayA9IGFkanVzdGVkX21vZGUtPmNydGNfY2xvY2s7Cj4g PiAgICAgICAgIGh0b3RhbCA9IGFkanVzdGVkX21vZGUtPmNydGNfaHRvdGFsOwo+ID4gICAgICAg ICBoZGlzcGxheSA9IHRvX2ludGVsX2NydGMoY3J0YyktPmNvbmZpZy0+cGlwZV9zcmNfdzsKPiA+ IC0gICAgICAgcGl4ZWxfc2l6ZSA9IGNydGMtPnByaW1hcnktPmZiLT5iaXRzX3Blcl9waXhlbCAv IDg7Cj4gPiArICAgICAgIHBpeGVsX3NpemUgPSBjcnRjLT5wcmltYXJ5LT5zdGF0ZS0+ZmItPmJp dHNfcGVyX3BpeGVsIC8gODsKPiA+Cj4gPiAgICAgICAgIC8qIFVzZSB0aGUgc21hbGwgYnVmZmVy IG1ldGhvZCB0byBjYWxjdWxhdGUgcGxhbmUgd2F0ZXJtYXJrICovCj4gPiAgICAgICAgIGVudHJp ZXMgPSAoKGNsb2NrICogcGl4ZWxfc2l6ZSAvIDEwMDApICogZGlzcGxheV9sYXRlbmN5X25zKSAv IDEwMDA7Cj4gPiBAQCAtNjU5LDcgKzY1OSw3IEBAIHN0YXRpYyBib29sIGc0eF9jb21wdXRlX3Ny d20oc3RydWN0IGRybV9kZXZpY2UgKmRldiwKPiA+ICAgICAgICAgY2xvY2sgPSBhZGp1c3RlZF9t b2RlLT5jcnRjX2Nsb2NrOwo+ID4gICAgICAgICBodG90YWwgPSBhZGp1c3RlZF9tb2RlLT5jcnRj X2h0b3RhbDsKPiA+ICAgICAgICAgaGRpc3BsYXkgPSB0b19pbnRlbF9jcnRjKGNydGMpLT5jb25m aWctPnBpcGVfc3JjX3c7Cj4gPiAtICAgICAgIHBpeGVsX3NpemUgPSBjcnRjLT5wcmltYXJ5LT5m Yi0+Yml0c19wZXJfcGl4ZWwgLyA4Owo+ID4gKyAgICAgICBwaXhlbF9zaXplID0gY3J0Yy0+cHJp bWFyeS0+c3RhdGUtPmZiLT5iaXRzX3Blcl9waXhlbCAvIDg7Cj4gPgo+ID4gICAgICAgICBsaW5l X3RpbWVfdXMgPSBtYXgoaHRvdGFsICogMTAwMCAvIGNsb2NrLCAxKTsKPiA+ICAgICAgICAgbGlu ZV9jb3VudCA9IChsYXRlbmN5X25zIC8gbGluZV90aW1lX3VzICsgMTAwMCkgLyAxMDAwOwo+ID4g QEAgLTc0Miw3ICs3NDIsNyBAQCBzdGF0aWMgdm9pZCB2bHZfdXBkYXRlX2RyYWluX2xhdGVuY3ko c3RydWN0IGRybV9jcnRjICpjcnRjKQo+ID4gICAgICAgICB9Cj4gPgo+ID4gICAgICAgICAvKiBQ cmltYXJ5IHBsYW5lIERyYWluIExhdGVuY3kgKi8KPiA+IC0gICAgICAgcGl4ZWxfc2l6ZSA9IGNy dGMtPnByaW1hcnktPmZiLT5iaXRzX3Blcl9waXhlbCAvIDg7ICAgICAvKiBCUFAgKi8KPiA+ICsg ICAgICAgcGl4ZWxfc2l6ZSA9IGNydGMtPnByaW1hcnktPnN0YXRlLT5mYi0+Yml0c19wZXJfcGl4 ZWwgLyA4OyAgICAgIC8qIEJQUCAqLwo+ID4gICAgICAgICBpZiAodmx2X2NvbXB1dGVfZHJhaW5f bGF0ZW5jeShjcnRjLCBwaXhlbF9zaXplLCAmcHJlY19tdWx0LCAmZHJhaW5fbGF0ZW5jeSkpIHsK PiA+ICAgICAgICAgICAgICAgICBwbGFuZV9wcmVjID0gKHByZWNfbXVsdCA9PSBoaWdoX3ByZWNp c2lvbikgPwo+ID4gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIERE TF9QTEFORV9QUkVDSVNJT05fSElHSCA6Cj4gPiBAQCAtMTAyMyw3ICsxMDIzLDcgQEAgc3RhdGlj IHZvaWQgaTk2NV91cGRhdGVfd20oc3RydWN0IGRybV9jcnRjICp1bnVzZWRfY3J0YykKPiA+ICAg ICAgICAgICAgICAgICBpbnQgY2xvY2sgPSBhZGp1c3RlZF9tb2RlLT5jcnRjX2Nsb2NrOwo+ID4g ICAgICAgICAgICAgICAgIGludCBodG90YWwgPSBhZGp1c3RlZF9tb2RlLT5jcnRjX2h0b3RhbDsK PiA+ICAgICAgICAgICAgICAgICBpbnQgaGRpc3BsYXkgPSB0b19pbnRlbF9jcnRjKGNydGMpLT5j b25maWctPnBpcGVfc3JjX3c7Cj4gPiAtICAgICAgICAgICAgICAgaW50IHBpeGVsX3NpemUgPSBj cnRjLT5wcmltYXJ5LT5mYi0+Yml0c19wZXJfcGl4ZWwgLyA4Owo+ID4gKyAgICAgICAgICAgICAg IGludCBwaXhlbF9zaXplID0gY3J0Yy0+cHJpbWFyeS0+c3RhdGUtPmZiLT5iaXRzX3Blcl9waXhl bCAvIDg7Cj4gPiAgICAgICAgICAgICAgICAgdW5zaWduZWQgbG9uZyBsaW5lX3RpbWVfdXM7Cj4g PiAgICAgICAgICAgICAgICAgaW50IGVudHJpZXM7Cj4gPgo+ID4gQEAgLTExMDAsNyArMTEwMCw3 IEBAIHN0YXRpYyB2b2lkIGk5eHhfdXBkYXRlX3dtKHN0cnVjdCBkcm1fY3J0YyAqdW51c2VkX2Ny dGMpCj4gPiAgICAgICAgIGNydGMgPSBpbnRlbF9nZXRfY3J0Y19mb3JfcGxhbmUoZGV2LCAwKTsK PiA+ICAgICAgICAgaWYgKGludGVsX2NydGNfYWN0aXZlKGNydGMpKSB7Cj4gPiAgICAgICAgICAg ICAgICAgY29uc3Qgc3RydWN0IGRybV9kaXNwbGF5X21vZGUgKmFkanVzdGVkX21vZGU7Cj4gPiAt ICAgICAgICAgICAgICAgaW50IGNwcCA9IGNydGMtPnByaW1hcnktPmZiLT5iaXRzX3Blcl9waXhl bCAvIDg7Cj4gPiArICAgICAgICAgICAgICAgaW50IGNwcCA9IGNydGMtPnByaW1hcnktPnN0YXRl LT5mYi0+Yml0c19wZXJfcGl4ZWwgLyA4Owo+ID4gICAgICAgICAgICAgICAgIGlmIChJU19HRU4y KGRldikpCj4gPiAgICAgICAgICAgICAgICAgICAgICAgICBjcHAgPSA0Owo+ID4KPiA+IEBAIC0x MTIyLDcgKzExMjIsNyBAQCBzdGF0aWMgdm9pZCBpOXh4X3VwZGF0ZV93bShzdHJ1Y3QgZHJtX2Ny dGMgKnVudXNlZF9jcnRjKQo+ID4gICAgICAgICBjcnRjID0gaW50ZWxfZ2V0X2NydGNfZm9yX3Bs YW5lKGRldiwgMSk7Cj4gPiAgICAgICAgIGlmIChpbnRlbF9jcnRjX2FjdGl2ZShjcnRjKSkgewo+ ID4gICAgICAgICAgICAgICAgIGNvbnN0IHN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICphZGp1c3Rl ZF9tb2RlOwo+ID4gLSAgICAgICAgICAgICAgIGludCBjcHAgPSBjcnRjLT5wcmltYXJ5LT5mYi0+ Yml0c19wZXJfcGl4ZWwgLyA4Owo+ID4gKyAgICAgICAgICAgICAgIGludCBjcHAgPSBjcnRjLT5w cmltYXJ5LT5zdGF0ZS0+ZmItPmJpdHNfcGVyX3BpeGVsIC8gODsKPiA+ICAgICAgICAgICAgICAg ICBpZiAoSVNfR0VOMihkZXYpKQo+ID4gICAgICAgICAgICAgICAgICAgICAgICAgY3BwID0gNDsK PiA+Cj4gPiBAQCAtMTE0NSw3ICsxMTQ1LDcgQEAgc3RhdGljIHZvaWQgaTl4eF91cGRhdGVfd20o c3RydWN0IGRybV9jcnRjICp1bnVzZWRfY3J0YykKPiA+ICAgICAgICAgaWYgKElTX0k5MTVHTShk ZXYpICYmIGVuYWJsZWQpIHsKPiA+ICAgICAgICAgICAgICAgICBzdHJ1Y3QgZHJtX2k5MTVfZ2Vt X29iamVjdCAqb2JqOwo+ID4KPiA+IC0gICAgICAgICAgICAgICBvYmogPSBpbnRlbF9mYl9vYmoo ZW5hYmxlZC0+cHJpbWFyeS0+ZmIpOwo+ID4gKyAgICAgICAgICAgICAgIG9iaiA9IGludGVsX2Zi X29iaihlbmFibGVkLT5wcmltYXJ5LT5zdGF0ZS0+ZmIpOwo+ID4KPiA+ICAgICAgICAgICAgICAg ICAvKiBzZWxmLXJlZnJlc2ggc2VlbXMgYnVzdGVkIHdpdGggdW50aWxlZCAqLwo+ID4gICAgICAg ICAgICAgICAgIGlmIChvYmotPnRpbGluZ19tb2RlID09IEk5MTVfVElMSU5HX05PTkUpCj4gPiBA QCAtMTE2OSw3ICsxMTY5LDcgQEAgc3RhdGljIHZvaWQgaTl4eF91cGRhdGVfd20oc3RydWN0IGRy bV9jcnRjICp1bnVzZWRfY3J0YykKPiA+ICAgICAgICAgICAgICAgICBpbnQgY2xvY2sgPSBhZGp1 c3RlZF9tb2RlLT5jcnRjX2Nsb2NrOwo+ID4gICAgICAgICAgICAgICAgIGludCBodG90YWwgPSBh ZGp1c3RlZF9tb2RlLT5jcnRjX2h0b3RhbDsKPiA+ICAgICAgICAgICAgICAgICBpbnQgaGRpc3Bs YXkgPSB0b19pbnRlbF9jcnRjKGVuYWJsZWQpLT5jb25maWctPnBpcGVfc3JjX3c7Cj4gPiAtICAg ICAgICAgICAgICAgaW50IHBpeGVsX3NpemUgPSBlbmFibGVkLT5wcmltYXJ5LT5mYi0+Yml0c19w ZXJfcGl4ZWwgLyA4Owo+ID4gKyAgICAgICAgICAgICAgIGludCBwaXhlbF9zaXplID0gZW5hYmxl ZC0+cHJpbWFyeS0+c3RhdGUtPmZiLT5iaXRzX3Blcl9waXhlbCAvIDg7Cj4gPiAgICAgICAgICAg ICAgICAgdW5zaWduZWQgbG9uZyBsaW5lX3RpbWVfdXM7Cj4gPiAgICAgICAgICAgICAgICAgaW50 IGVudHJpZXM7Cj4gPgo+ID4gQEAgLTE4NzQsNyArMTg3NCw3IEBAIHN0YXRpYyB2b2lkIGlsa19j b21wdXRlX3dtX3BhcmFtZXRlcnMoc3RydWN0IGRybV9jcnRjICpjcnRjLAo+ID4gICAgICAgICBw LT5hY3RpdmUgPSB0cnVlOwo+ID4gICAgICAgICBwLT5waXBlX2h0b3RhbCA9IGludGVsX2NydGMt PmNvbmZpZy0+YmFzZS5hZGp1c3RlZF9tb2RlLmNydGNfaHRvdGFsOwo+ID4gICAgICAgICBwLT5w aXhlbF9yYXRlID0gaWxrX3BpcGVfcGl4ZWxfcmF0ZShkZXYsIGNydGMpOwo+ID4gLSAgICAgICBw LT5wcmkuYnl0ZXNfcGVyX3BpeGVsID0gY3J0Yy0+cHJpbWFyeS0+ZmItPmJpdHNfcGVyX3BpeGVs IC8gODsKPiA+ICsgICAgICAgcC0+cHJpLmJ5dGVzX3Blcl9waXhlbCA9IGNydGMtPnByaW1hcnkt PnN0YXRlLT5mYi0+Yml0c19wZXJfcGl4ZWwgLyA4Owo+ID4gICAgICAgICBwLT5jdXIuYnl0ZXNf cGVyX3BpeGVsID0gNDsKPiA+ICAgICAgICAgcC0+cHJpLmhvcml6X3BpeGVscyA9IGludGVsX2Ny dGMtPmNvbmZpZy0+cGlwZV9zcmNfdzsKPiA+ICAgICAgICAgcC0+Y3VyLmhvcml6X3BpeGVscyA9 IGludGVsX2NydGMtPmJhc2UuY3Vyc29yLT5zdGF0ZS0+Y3J0Y193Owo+ID4gQEAgLTI2NTksNyAr MjY1OSw3IEBAIHN0YXRpYyB2b2lkIHNrbF9jb21wdXRlX3dtX3BpcGVfcGFyYW1ldGVycyhzdHJ1 Y3QgZHJtX2NydGMgKmNydGMsCj4gPiAgICAgICAgICAgICAgICAgICovCj4gPiAgICAgICAgICAg ICAgICAgcC0+cGxhbmVbMF0uZW5hYmxlZCA9IHRydWU7Cj4gPiAgICAgICAgICAgICAgICAgcC0+ cGxhbmVbMF0uYnl0ZXNfcGVyX3BpeGVsID0KPiA+IC0gICAgICAgICAgICAgICAgICAgICAgIGNy dGMtPnByaW1hcnktPmZiLT5iaXRzX3Blcl9waXhlbCAvIDg7Cj4gPiArICAgICAgICAgICAgICAg ICAgICAgICBjcnRjLT5wcmltYXJ5LT5zdGF0ZS0+ZmItPmJpdHNfcGVyX3BpeGVsIC8gODsKPiA+ ICAgICAgICAgICAgICAgICBwLT5wbGFuZVswXS5ob3Jpel9waXhlbHMgPSBpbnRlbF9jcnRjLT5j b25maWctPnBpcGVfc3JjX3c7Cj4gPiAgICAgICAgICAgICAgICAgcC0+cGxhbmVbMF0udmVydF9w aXhlbHMgPSBpbnRlbF9jcnRjLT5jb25maWctPnBpcGVfc3JjX2g7Cj4gPiAgICAgICAgICAgICAg ICAgcC0+cGxhbmVbMF0udGlsaW5nID0gRFJNX0ZPUk1BVF9NT0RfTk9ORTsKPiA+IC0tCj4gPiAx LjguNS4xCj4gPgo+ID4gX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KPiA+IEludGVsLWdmeCBtYWlsaW5nIGxpc3QKPiA+IEludGVsLWdmeEBsaXN0cy5mcmVl ZGVza3RvcC5vcmcKPiA+IGh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0 aW5mby9pbnRlbC1nZngKPiAKPiAKPiAKPiAtLSAKPiBQYXVsbyBaYW5vbmkKCi0tIApNYXR0IFJv cGVyCkdyYXBoaWNzIFNvZnR3YXJlIEVuZ2luZWVyCklvVEcgUGxhdGZvcm0gRW5hYmxpbmcgJiBE ZXZlbG9wbWVudApJbnRlbCBDb3Jwb3JhdGlvbgooOTE2KSAzNTYtMjc5NQpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0 CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9w Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=