From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH 7/9] drm/i915: Use enum plane_id in VLV/CHV wm code Date: Thu, 17 Nov 2016 22:39:38 +0200 Message-ID: <20161117203938.GH31595@intel.com> References: <1478616439-10150-1-git-send-email-ville.syrjala@linux.intel.com> <1478616439-10150-8-git-send-email-ville.syrjala@linux.intel.com> <1479414585.2382.51.camel@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id 244C76E897 for ; Thu, 17 Nov 2016 20:39:41 +0000 (UTC) Content-Disposition: inline In-Reply-To: <1479414585.2382.51.camel@intel.com> 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-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org T24gVGh1LCBOb3YgMTcsIDIwMTYgYXQgMDY6Mjk6NDVQTSAtMDIwMCwgUGF1bG8gWmFub25pIHdy b3RlOgo+IEVtIFRlciwgMjAxNi0xMS0wOCDDoHMgMTY6NDcgKzAyMDAsIHZpbGxlLnN5cmphbGFA bGludXguaW50ZWwuY29tCj4gZXNjcmV2ZXU6Cj4gPiBGcm9tOiBWaWxsZSBTeXJqw6Rsw6QgPHZp bGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tPgo+ID4gCj4gPiBMZXQncyB0cnkgbm90IHRvIGFi dXNlIHBsYW5lLT5wbGFuZSBmb3Igc3ByaXRlcyBvbiBWTFYvQ0hWIGFuZAo+ID4gaW5zdGVhZAo+ ID4gdXNlIHBsYW5lLT5pZC4gU2luY2Ugb3V0IHdhdGVybWFyayBzdHJ1Y3R1cmVzIGFyZW4ndCBl bnRpcmVseSBwbGFuZQo+ID4gdHlwZQo+ID4gYWdub3N0aWMgKGZvciBub3cpIGFuZCBzdGFydCBp bmRleGluZyBzcHJpdGVzIGZyb20gMMKgwqB3ZSdsbCBhZGQgYQo+ID4gc21hbGwKPiA+IGhlbHBl ciB0byBjb252ZXJ0IGJldHdlZW4gdGhlIHR3byBiYXNlcy4KPiAKPiBJJ20gbm90IHN1cmUgSSBs aWtlIHRoaXMgb25lLiBXZSd2ZSBiZWVuIHVzaW5nIHBsYW5lX2lkIGZvciB0aGUgYWN0dWFsCj4g cHJpbS9zcHIvY3VyIElEcywgYW5kIG5vdyB3ZSB1c2UgcGxhbmVfaWQgZm9yIHNvbWV0aGluZyB0 aGF0J3Mgc3VwcG9zZWQKPiB0byBtZWFuIEEvQi9DLiBJIHJlYWxseSB0aGluayB3ZSBzaG91bGQg aGF2ZSBkaWZmZXJlbnQgd29yZHMgdG8gcmVmZXIKPiB0byB0aGUgdHdvIHRoaW5ncy4gSSB0aGlu ayB0aGlzIGdvZXMgYmFjayB0byBNYXR0J3MgcmVuYW1pbmcgZGlzY3Vzc2lvbgo+IHdlJ3ZlIGJl ZW4gaGF2aW5nIGluIHBhdGNoIDIuIExldCdzIHNvbHZlIGl0IHRoZXJlIGZpcnN0IGJlZm9yZSB3 ZQo+IHJldmlzaXQgdGhpcyBwYXRjaC4gSSdtIHN0aWxsIG5vdCBzdXJlIHdoYXQgd291bGQgYmUg dGhlIGlkZWFsIHNvbHV0aW9uCj4gaGVyZSwgSSdsbCBzcGVuZCBzb21lIHRpbWUgdGhpbmtpbmcu CgpSZXBsaWVkIHRvIHRoZSB3cm9uZyBwYXRjaD8KCj4gCj4gPiAKPiA+IFNpZ25lZC1vZmYtYnk6 IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+Cj4gPiAtLS0K PiA+IMKgZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyB8IDczICsrKysrKysrKysrKysr KysrKysrLS0tLS0tLS0tLS0KPiA+IC0tLS0tLS0tLS0KPiA+IMKgMSBmaWxlIGNoYW5nZWQsIDM2 IGluc2VydGlvbnMoKyksIDM3IGRlbGV0aW9ucygtKQo+ID4gCj4gPiBkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwo+ID4gYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9wbS5jCj4gPiBpbmRleCBmZDhjYmMyMjRiMDcuLmIxYWQwOWU0NThjYSAxMDA2NDQKPiA+ IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKPiA+ICsrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3BtLmMKPiA+IEBAIC0zNzEsMTIgKzM3MSwxNSBAQCBzdGF0aWMg Y29uc3QgaW50IHBlc3NpbWFsX2xhdGVuY3lfbnMgPSA1MDAwOwo+ID4gwqAjZGVmaW5lIFZMVl9G SUZPX1NUQVJUKGRzcGFyYiwgZHNwYXJiMiwgbG9fc2hpZnQsIGhpX3NoaWZ0KSBcCj4gPiDCoAko KCgoZHNwYXJiKSA+PiAobG9fc2hpZnQpKSAmIDB4ZmYpIHwgKCgoKGRzcGFyYjIpID4+Cj4gPiAo aGlfc2hpZnQpKSAmIDB4MSkgPDwgOCkpCj4gPiDCoAo+ID4gLXN0YXRpYyBpbnQgdmx2X2dldF9m aWZvX3NpemUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAo+ID4gLQkJCcKgwqDC oMKgwqDCoGVudW0gcGlwZSBwaXBlLCBpbnQgcGxhbmUpCj4gPiArc3RhdGljIGludCB2bHZfZ2V0 X2ZpZm9fc2l6ZShzdHJ1Y3QgaW50ZWxfcGxhbmUgKnBsYW5lKQo+ID4gwqB7Cj4gPiArCXN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUocGxhbmUtCj4gPiA+YmFzZS5k ZXYpOwo+ID4gwqAJaW50IHNwcml0ZTBfc3RhcnQsIHNwcml0ZTFfc3RhcnQsIHNpemU7Cj4gPiDC oAo+ID4gLQlzd2l0Y2ggKHBpcGUpIHsKPiA+ICsJaWYgKHBsYW5lLT5pZCA9PSBQTEFORV9DVVJT T1IpCj4gPiArCQlyZXR1cm4gNjM7Cj4gPiArCj4gPiArCXN3aXRjaCAocGxhbmUtPnBpcGUpIHsK PiA+IMKgCQl1aW50MzJfdCBkc3BhcmIsIGRzcGFyYjIsIGRzcGFyYjM7Cj4gPiDCoAljYXNlIFBJ UEVfQToKPiA+IMKgCQlkc3BhcmIgPSBJOTE1X1JFQUQoRFNQQVJCKTsKPiA+IEBAIC00MDAsMjQg KzQwMywyMSBAQCBzdGF0aWMgaW50IHZsdl9nZXRfZmlmb19zaXplKHN0cnVjdAo+ID4gZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCj4gPiDCoAkJcmV0dXJuIDA7Cj4gPiDCoAl9Cj4gPiDCoAo+ ID4gLQlzd2l0Y2ggKHBsYW5lKSB7Cj4gPiAtCWNhc2UgMDoKPiA+ICsJc3dpdGNoIChwbGFuZS0+ aWQpIHsKPiA+ICsJY2FzZSBQTEFORV9QUklNQVJZOgo+ID4gwqAJCXNpemUgPSBzcHJpdGUwX3N0 YXJ0Owo+ID4gwqAJCWJyZWFrOwo+ID4gLQljYXNlIDE6Cj4gPiArCWNhc2UgUExBTkVfU1BSSVRF MDoKPiA+IMKgCQlzaXplID0gc3ByaXRlMV9zdGFydCAtIHNwcml0ZTBfc3RhcnQ7Cj4gPiDCoAkJ YnJlYWs7Cj4gPiAtCWNhc2UgMjoKPiA+ICsJY2FzZSBQTEFORV9TUFJJVEUxOgo+ID4gwqAJCXNp emUgPSA1MTIgLSAxIC0gc3ByaXRlMV9zdGFydDsKPiA+IMKgCQlicmVhazsKPiA+IMKgCWRlZmF1 bHQ6Cj4gPiDCoAkJcmV0dXJuIDA7Cj4gPiDCoAl9Cj4gPiDCoAo+ID4gLQlEUk1fREVCVUdfS01T KCJQaXBlICVjICVzICVjIEZJRk8gc2l6ZTogJWRcbiIsCj4gPiAtCQnCoMKgwqDCoMKgwqBwaXBl X25hbWUocGlwZSksIHBsYW5lID09IDAgPyAicHJpbWFyeSIgOgo+ID4gInNwcml0ZSIsCj4gPiAt CQnCoMKgwqDCoMKgwqBwbGFuZSA9PSAwID8gcGxhbmVfbmFtZShwaXBlKSA6Cj4gPiBzcHJpdGVf bmFtZShwaXBlLCBwbGFuZSAtIDEpLAo+ID4gLQkJwqDCoMKgwqDCoMKgc2l6ZSk7Cj4gPiArCURS TV9ERUJVR19LTVMoIiVzIEZJRk8gc2l6ZTogJWRcbiIsIHBsYW5lLT5iYXNlLm5hbWUsIHNpemUp Owo+ID4gwqAKPiA+IMKgCXJldHVybiBzaXplOwo+ID4gwqB9Cj4gPiBAQCAtMTA1NCw2ICsxMDU0 LDEyIEBAIHN0YXRpYyB2b2lkIHZsdl9jb21wdXRlX2ZpZm8oc3RydWN0IGludGVsX2NydGMKPiA+ ICpjcnRjKQo+ID4gwqAJV0FSTl9PTihmaWZvX2xlZnQgIT0gMCk7Cj4gPiDCoH0KPiA+IMKgCj4g PiArLyogRklYTUUga2lsbCBtZSAqLwo+ID4gK3N0YXRpYyBpbmxpbmUgaW50IHZsdl9zcHJpdGVf aWQoZW51bSBwbGFuZV9pZCBwbGFuZV9pZCkKPiA+ICt7Cj4gPiArCXJldHVybiBwbGFuZV9pZCAt IFBMQU5FX1NQUklURTA7Cj4gPiArfQo+ID4gKwo+ID4gwqBzdGF0aWMgdm9pZCB2bHZfaW52ZXJ0 X3dtcyhzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKPiA+IMKgewo+ID4gwqAJc3RydWN0IHZsdl93 bV9zdGF0ZSAqd21fc3RhdGUgPSAmY3J0Yy0+d21fc3RhdGU7Cj4gPiBAQCAtMTA3OSw3ICsxMDg1 LDcgQEAgc3RhdGljIHZvaWQgdmx2X2ludmVydF93bXMoc3RydWN0IGludGVsX2NydGMKPiA+ICpj cnRjKQo+ID4gwqAJCQkJCXdtX3N0YXRlLT53bVtsZXZlbF0ucHJpbWFyeTsKPiA+IMKgCQkJCWJy ZWFrOwo+ID4gwqAJCQljYXNlIERSTV9QTEFORV9UWVBFX09WRVJMQVk6Cj4gPiAtCQkJCXNwcml0 ZSA9IHBsYW5lLT5wbGFuZTsKPiA+ICsJCQkJc3ByaXRlID0gdmx2X3Nwcml0ZV9pZChwbGFuZS0+ aWQpOwo+ID4gwqAJCQkJd21fc3RhdGUtPndtW2xldmVsXS5zcHJpdGVbc3ByaXRlXSA9Cj4gPiBw bGFuZS0+d20uZmlmb19zaXplIC0KPiA+IMKgCQkJCQl3bV9zdGF0ZS0KPiA+ID53bVtsZXZlbF0u c3ByaXRlW3Nwcml0ZV07Cj4gPiDCoAkJCQlicmVhazsKPiA+IEBAIC0xMTQzLDcgKzExNDksNyBA QCBzdGF0aWMgdm9pZCB2bHZfY29tcHV0ZV93bShzdHJ1Y3QgaW50ZWxfY3J0Ywo+ID4gKmNydGMp Cj4gPiDCoAkJCQl3bV9zdGF0ZS0+d21bbGV2ZWxdLnByaW1hcnkgPSB3bTsKPiA+IMKgCQkJCWJy ZWFrOwo+ID4gwqAJCQljYXNlIERSTV9QTEFORV9UWVBFX09WRVJMQVk6Cj4gPiAtCQkJCXNwcml0 ZSA9IHBsYW5lLT5wbGFuZTsKPiA+ICsJCQkJc3ByaXRlID0gdmx2X3Nwcml0ZV9pZChwbGFuZS0+ aWQpOwo+ID4gwqAJCQkJd21fc3RhdGUtPndtW2xldmVsXS5zcHJpdGVbc3ByaXRlXSA9Cj4gPiB3 bTsKPiA+IMKgCQkJCWJyZWFrOwo+ID4gwqAJCQl9Cj4gPiBAQCAtMTE2OSw3ICsxMTc1LDcgQEAg c3RhdGljIHZvaWQgdmx2X2NvbXB1dGVfd20oc3RydWN0IGludGVsX2NydGMKPiA+ICpjcnRjKQo+ ID4gwqAJCQkJCcKgwqDCoMKgd21fc3RhdGUtCj4gPiA+d21bbGV2ZWxdLnByaW1hcnkpOwo+ID4g wqAJCQlicmVhazsKPiA+IMKgCQljYXNlIERSTV9QTEFORV9UWVBFX09WRVJMQVk6Cj4gPiAtCQkJ c3ByaXRlID0gcGxhbmUtPnBsYW5lOwo+ID4gKwkJCXNwcml0ZSA9IHZsdl9zcHJpdGVfaWQocGxh bmUtPmlkKTsKPiA+IMKgCQkJZm9yIChsZXZlbCA9IDA7IGxldmVsIDwgd21fc3RhdGUtCj4gPiA+ bnVtX2xldmVsczsgbGV2ZWwrKykKPiA+IMKgCQkJCXdtX3N0YXRlLT5zcltsZXZlbF0ucGxhbmUg PQo+ID4gwqAJCQkJCW1pbih3bV9zdGF0ZS0KPiA+ID5zcltsZXZlbF0ucGxhbmUsCj4gPiBAQCAt MTE5OCwxNyArMTIwNCwyMyBAQCBzdGF0aWMgdm9pZCB2bHZfcGlwZV9zZXRfZmlmb19zaXplKHN0 cnVjdAo+ID4gaW50ZWxfY3J0YyAqY3J0YykKPiA+IMKgCWludCBzcHJpdGUwX3N0YXJ0ID0gMCwg c3ByaXRlMV9zdGFydCA9IDAsIGZpZm9fc2l6ZSA9IDA7Cj4gPiDCoAo+ID4gwqAJZm9yX2VhY2hf aW50ZWxfcGxhbmVfb25fY3J0YyhkZXYsIGNydGMsIHBsYW5lKSB7Cj4gPiAtCQlpZiAocGxhbmUt PmJhc2UudHlwZSA9PSBEUk1fUExBTkVfVFlQRV9DVVJTT1IpIHsKPiA+IC0JCQlXQVJOX09OKHBs YW5lLT53bS5maWZvX3NpemUgIT0gNjMpOwo+ID4gLQkJCWNvbnRpbnVlOwo+ID4gLQkJfQo+ID4g LQo+ID4gLQkJaWYgKHBsYW5lLT5iYXNlLnR5cGUgPT0gRFJNX1BMQU5FX1RZUEVfUFJJTUFSWSkK PiA+ICsJCXN3aXRjaCAocGxhbmUtPmlkKSB7Cj4gPiArCQljYXNlIFBMQU5FX1BSSU1BUlk6Cj4g PiDCoAkJCXNwcml0ZTBfc3RhcnQgPSBwbGFuZS0+d20uZmlmb19zaXplOwo+ID4gLQkJZWxzZSBp ZiAocGxhbmUtPnBsYW5lID09IDApCj4gPiArCQkJYnJlYWs7Cj4gPiArCQljYXNlIFBMQU5FX1NQ UklURTA6Cj4gPiDCoAkJCXNwcml0ZTFfc3RhcnQgPSBzcHJpdGUwX3N0YXJ0ICsgcGxhbmUtCj4g PiA+d20uZmlmb19zaXplOwo+ID4gLQkJZWxzZQo+ID4gKwkJCWJyZWFrOwo+ID4gKwkJY2FzZSBQ TEFORV9TUFJJVEUxOgo+ID4gwqAJCQlmaWZvX3NpemUgPSBzcHJpdGUxX3N0YXJ0ICsgcGxhbmUt Cj4gPiA+d20uZmlmb19zaXplOwo+ID4gKwkJCWJyZWFrOwo+ID4gKwkJY2FzZSBQTEFORV9DVVJT T1I6Cj4gPiArCQkJV0FSTl9PTihwbGFuZS0+d20uZmlmb19zaXplICE9IDYzKTsKPiA+ICsJCQli cmVhazsKPiA+ICsJCWRlZmF1bHQ6Cj4gPiArCQkJTUlTU0lOR19DQVNFKHBsYW5lLT5pZCk7Cj4g PiArCQkJYnJlYWs7Cj4gPiArCQl9Cj4gPiDCoAl9Cj4gPiDCoAo+ID4gwqAJV0FSTl9PTihmaWZv X3NpemUgIT0gNTEyIC0gMSk7Cj4gPiBAQCAtNDUwNSwyMSArNDUxNyw4IEBAIHZvaWQgdmx2X3dt X2dldF9od19zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZQo+ID4gKmRldikKPiA+IMKgCj4gPiDCoAl2 bHZfcmVhZF93bV92YWx1ZXMoZGV2X3ByaXYsIHdtKTsKPiA+IMKgCj4gPiAtCWZvcl9lYWNoX2lu dGVsX3BsYW5lKGRldiwgcGxhbmUpIHsKPiA+IC0JCXN3aXRjaCAocGxhbmUtPmJhc2UudHlwZSkg ewo+ID4gLQkJCWludCBzcHJpdGU7Cj4gPiAtCQljYXNlIERSTV9QTEFORV9UWVBFX0NVUlNPUjoK PiA+IC0JCQlwbGFuZS0+d20uZmlmb19zaXplID0gNjM7Cj4gPiAtCQkJYnJlYWs7Cj4gPiAtCQlj YXNlIERSTV9QTEFORV9UWVBFX1BSSU1BUlk6Cj4gPiAtCQkJcGxhbmUtPndtLmZpZm9fc2l6ZSA9 Cj4gPiB2bHZfZ2V0X2ZpZm9fc2l6ZShkZXZfcHJpdiwgcGxhbmUtPnBpcGUsIDApOwo+ID4gLQkJ CWJyZWFrOwo+ID4gLQkJY2FzZSBEUk1fUExBTkVfVFlQRV9PVkVSTEFZOgo+ID4gLQkJCXNwcml0 ZSA9IHBsYW5lLT5wbGFuZTsKPiA+IC0JCQlwbGFuZS0+d20uZmlmb19zaXplID0KPiA+IHZsdl9n ZXRfZmlmb19zaXplKGRldl9wcml2LCBwbGFuZS0+cGlwZSwgc3ByaXRlICsgMSk7Cj4gPiAtCQkJ YnJlYWs7Cj4gPiAtCQl9Cj4gPiAtCX0KPiA+ICsJZm9yX2VhY2hfaW50ZWxfcGxhbmUoZGV2LCBw bGFuZSkKPiA+ICsJCXBsYW5lLT53bS5maWZvX3NpemUgPSB2bHZfZ2V0X2ZpZm9fc2l6ZShwbGFu ZSk7Cj4gPiDCoAo+ID4gwqAJd20tPmN4c3IgPSBJOTE1X1JFQUQoRldfQkxDX1NFTEZfVkxWKSAm IEZXX0NTUFdSRFdORU47Cj4gPiDCoAl3bS0+bGV2ZWwgPSBWTFZfV01fTEVWRUxfUE0yOwoKLS0g ClZpbGxlIFN5cmrDpGzDpApJbnRlbCBPVEMKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMu ZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlz dGluZm8vaW50ZWwtZ2Z4Cg==