From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mika Kahola Subject: Re: [PATCH 19/19] drm/i915: Modeset global_pipes() update Date: Thu, 2 Apr 2015 12:17:23 +0300 Message-ID: <20150402091723.GA3160@sorvi> References: <20150331110535.GB3154@sorvi> <1427800463-5388-1-git-send-email-mika.kahola@intel.com> <20150331144556.GP17410@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 CBFCE6E9B3 for ; Thu, 2 Apr 2015 02:17:47 -0700 (PDT) Content-Disposition: inline In-Reply-To: <20150331144556.GP17410@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org T24gVHVlLCBNYXIgMzEsIDIwMTUgYXQgMDU6NDU6NTZQTSArMDMwMCwgVmlsbGUgU3lyasOkbMOk IHdyb3RlOgo+IE9uIFR1ZSwgTWFyIDMxLCAyMDE1IGF0IDAyOjE0OjIzUE0gKzAzMDAsIE1pa2Eg S2Fob2xhIHdyb3RlOgo+ID4gQ29tYmluZWQgVmFsbGV5dmlldywgSGFzd2VsbCBhbmQgQnJvYWR3 ZWxsICcqX21vZGVzZXRfZ2xvYmFsX3BpcGVzKCknCj4gPiBpbnRvIG9uZSBmdW5jdGlvbiAnaW50 ZWxfbW9kZXNldF9nbG9iYWxfcGlwZXMoKScKPiA+IAo+ID4gU2lnbmVkLW9mZi1ieTogTWlrYSBL YWhvbGEgPG1pa2Eua2Fob2xhQGludGVsLmNvbT4KPiA+IC0tLQo+ID4gIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8IDg5ICsrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0t LS0tLS0tLQo+ID4gIDEgZmlsZSBjaGFuZ2VkLCA0MSBpbnNlcnRpb25zKCspLCA0OCBkZWxldGlv bnMoLSkKPiA+IAo+ID4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rp c3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwo+ID4gaW5kZXgg NWVkNDBkZi4uNzE4MGQyYiAxMDA2NDQKPiA+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rpc3BsYXkuYwo+ID4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxh eS5jCj4gPiBAQCAtNTIwOSwzOCArNTIwOSw2IEBAIHN0YXRpYyBpbnQgdmFsbGV5dmlld19jYWxj X2NkY2xrKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKPiA+ICAJCXJldHVybiAy MDAwMDA7Cj4gPiAgfQo+ID4gIAo+ID4gLS8qIGNvbXB1dGUgdGhlIG1heCBwaXhlbCBjbG9jayBm b3IgbmV3IGNvbmZpZ3VyYXRpb24gKi8KPiA+IC1zdGF0aWMgaW50IGludGVsX21vZGVfbWF4X3Bp eGNsayhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCj4gPiAtewo+ID4gLQlzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2ID0gZGV2X3ByaXYtPmRldjsKPiA+IC0Jc3RydWN0IGludGVsX2Ny dGMgKmludGVsX2NydGM7Cj4gPiAtCWludCBtYXhfcGl4Y2xrID0gMDsKPiA+IC0KPiA+IC0JZm9y X2VhY2hfaW50ZWxfY3J0YyhkZXYsIGludGVsX2NydGMpIHsKPiA+IC0JCWlmIChpbnRlbF9jcnRj LT5uZXdfZW5hYmxlZCkKPiA+IC0JCQltYXhfcGl4Y2xrID0gbWF4KG1heF9waXhjbGssCj4gPiAt CQkJCQkgaW50ZWxfY3J0Yy0+bmV3X2NvbmZpZy0+YmFzZS5hZGp1c3RlZF9tb2RlLmNydGNfY2xv Y2spOwo+ID4gLQl9Cj4gPiAtCj4gPiAtCXJldHVybiBtYXhfcGl4Y2xrOwo+ID4gLX0KPiA+IC0K PiA+IC1zdGF0aWMgdm9pZCB2YWxsZXl2aWV3X21vZGVzZXRfZ2xvYmFsX3BpcGVzKHN0cnVjdCBk cm1fZGV2aWNlICpkZXYsCj4gPiAtCQkJCQkgICAgdW5zaWduZWQgKnByZXBhcmVfcGlwZXMpCj4g PiAtewo+ID4gLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9w cml2YXRlOwo+ID4gLQlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YzsKPiA+IC0JaW50IG1h eF9waXhjbGsgPSBpbnRlbF9tb2RlX21heF9waXhjbGsoZGV2X3ByaXYpOwo+ID4gLQo+ID4gLQlp ZiAodmFsbGV5dmlld19jYWxjX2NkY2xrKGRldl9wcml2LCBtYXhfcGl4Y2xrKSA9PSBkZXZfcHJp di0+Y2RjbGtfZnJlcSkKPiA+IC0JCXJldHVybjsKPiA+IC0KPiA+IC0JLyogZGlzYWJsZS9lbmFi bGUgYWxsIGN1cnJlbnRseSBhY3RpdmUgcGlwZXMgd2hpbGUgd2UgY2hhbmdlIGNkY2xrICovCj4g PiAtCWZvcl9lYWNoX2ludGVsX2NydGMoZGV2LCBpbnRlbF9jcnRjKQo+ID4gLQkJaWYgKGludGVs X2NydGMtPmJhc2Uuc3RhdGUtPmVuYWJsZSkKPiA+IC0JCQkqcHJlcGFyZV9waXBlcyB8PSAoMSA8 PCBpbnRlbF9jcnRjLT5waXBlKTsKPiA+IC19Cj4gPiAtCj4gPiAgc3RhdGljIHZvaWQgdmx2X3By b2dyYW1fcGZpX2NyZWRpdHMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQo+ID4g IHsKPiA+ICAJdW5zaWduZWQgaW50IGNyZWRpdHMsIGRlZmF1bHRfY3JlZGl0czsKPiA+IEBAIC01 Mjc3LDYgKzUyNDUsMjIgQEAgc3RhdGljIHZvaWQgdmx2X3Byb2dyYW1fcGZpX2NyZWRpdHMoc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQo+ID4gIAlXQVJOX09OKEk5MTVfUkVBRChH Q0lfQ09OVFJPTCkgJiBQRklfQ1JFRElUX1JFU0VORCk7Cj4gPiAgfQo+ID4gIAo+ID4gKy8qIGNv bXB1dGUgdGhlIG1heCBwaXhlbCBjbG9jayBmb3IgbmV3IGNvbmZpZ3VyYXRpb24gKi8KPiA+ICtz dGF0aWMgaW50IGludGVsX21vZGVfbWF4X3BpeGNsayhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYpCj4gPiArewo+ID4gKwlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gZGV2X3ByaXYt PmRldjsKPiA+ICsJc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGM7Cj4gPiArCWludCBtYXhf cGl4Y2xrID0gMDsKPiA+ICsKPiA+ICsJZm9yX2VhY2hfaW50ZWxfY3J0YyhkZXYsIGludGVsX2Ny dGMpIHsKPiA+ICsJCWlmIChpbnRlbF9jcnRjLT5uZXdfZW5hYmxlZCkKPiA+ICsJCQltYXhfcGl4 Y2xrID0gbWF4KG1heF9waXhjbGssCj4gPiArCQkJCQkgaW50ZWxfY3J0Yy0+bmV3X2NvbmZpZy0+ YmFzZS5hZGp1c3RlZF9tb2RlLmNydGNfY2xvY2spOwo+ID4gKwl9Cj4gPiArCj4gPiArCXJldHVy biBtYXhfcGl4Y2xrOwo+ID4gK30KPiA+ICsKPiA+ICBzdGF0aWMgdm9pZCB2YWxsZXl2aWV3X21v ZGVzZXRfZ2xvYmFsX3Jlc291cmNlcyhzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUpCj4g PiAgewo+ID4gIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gc3RhdGUtPmRldjsKPiA+IEBAIC04 OTczLDIxICs4OTU3LDM4IEBAIHN0YXRpYyB2b2lkIGJyb2Fkd2VsbF9zZXRfY2RjbGsoc3RydWN0 IGRybV9kZXZpY2UgKmRldiwgaW50IGNkY2xrKQo+ID4gIAkgICAgIGNkY2xrLCBkZXZfcHJpdi0+ Y2RjbGtfZnJlcSk7Cj4gPiAgfQo+ID4gIAo+ID4gLXN0YXRpYyB2b2lkIGhhc3dlbGxfbW9kZXNl dF9nbG9iYWxfcGlwZXMoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKPiA+IC0JCQkJCSB1bnNpZ25l ZCAqcHJlcGFyZV9waXBlcykKPiA+ICtzdGF0aWMgdm9pZCBpbnRlbF9tb2Rlc2V0X2dsb2JhbF9w aXBlcyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAo+ID4gKwkJCQkgICAgICAgdW5zaWduZWQgKnBy ZXBhcmVfcGlwZXMsCj4gPiArCQkJCSAgICAgICB1bnNpZ25lZCAqZGlzYWJsZV9waXBlcykKPiAK PiBZb3UgZG9uJ3QgbW9kaWZ5IGRpc2FibGVfcGlwZXMsIHNvIG5vIG5lZWQgdG8gcGFzcyBhcyBw b2ludGVyLgo+IAo+IEkgZG8gdGhpbmsgcGFzc2luZyBkaXNhYmxlX3BpcGVzIGludG8gaW50ZWxf bW9kZXNldF9nbG9iYWxfcGlwZXMoKSBkb2VzCj4gbWFrZSBzZW5zZSBob3dldmVyLCBhcyBpdCBt YWtlcyBpdCBjbGVhcmVyIHdoeSB3ZSBuZWVkIHRvIGNsZWFyIG91dCB0aGUKPiBkaXNhYmxlX3Bp cGVzIHdoZW4gdGhlIGNvZGUgaXMgYWxsIGluIG9uZSBwbGFjZSBsaWtlIHRoaXMuClRoYXQncyBh IGdvb2QgcG9pbnQuCgo+IAo+ID4gIHsKPiA+ICAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKPiA+ICAJc3RydWN0IGludGVsX2NydGMgKmNydGM7 Cj4gPiAtCWludCBtYXhfcGl4ZWxfcmF0ZSA9IGlsa19tYXhfcGl4ZWxfcmF0ZShkZXZfcHJpdik7 Cj4gPiArCWludCBtYXhfcGl4Y2xrOwo+ID4gIAo+ID4gLQlpZiAoaGFzd2VsbF9jYWxjX2NkY2xr KGRldl9wcml2LCBtYXhfcGl4ZWxfcmF0ZSkgPT0KPiA+IC0JICAgIGRldl9wcml2LT5jZGNsa19m cmVxKQo+ID4gKwkvKiB0aGlzIG1vZGVzZXQgaXMgdmFsaWQgb25seSBmb3IgVkxWLCBIU1csIGFu ZCBCRFcgKi8KPiA+ICsJaWYgKCFJU19WQUxMRVlWSUVXKGRldikgJiYgIUlTX0hBU1dFTEwoZGV2 KSAmJiAhSVNfQlJPQURXRUxMKGRldikpCj4gPiAgCQlyZXR1cm47Cj4gPiAgCj4gPiArCWlmIChJ U19WQUxMRVlWSUVXKGRldikpIHsKPiA+ICsJCW1heF9waXhjbGsgPSBpbnRlbF9tb2RlX21heF9w aXhjbGsoZGV2X3ByaXYpOwo+ID4gKwkJaWYgKHZhbGxleXZpZXdfY2FsY19jZGNsayhkZXZfcHJp diwgbWF4X3BpeGNsaykgPT0KPiA+ICsJCSAgICBkZXZfcHJpdi0+Y2RjbGtfZnJlcSkKPiA+ICsJ CQlyZXR1cm47Cj4gPiArCX0gZWxzZSBpZiAoSVNfSEFTV0VMTChkZXYpIHx8IElTX0JST0FEV0VM TChkZXYpKSB7Cj4gPiArCQltYXhfcGl4Y2xrID0gaWxrX21heF9waXhlbF9yYXRlKGRldl9wcml2 KTsKPiA+ICsJCWlmIChoYXN3ZWxsX2NhbGNfY2RjbGsoZGV2X3ByaXYsIG1heF9waXhjbGspID09 Cj4gPiArCQkgICAgZGV2X3ByaXYtPmNkY2xrX2ZyZXEpCj4gPiArCQkJcmV0dXJuOwo+ID4gKwo+ ID4gKwl9Cj4gCj4gTWF5YmUgbW92ZSB0aGUgY3VycmVudCB2cy4gbmV3bHkgY29tcHV0ZWQgcGl4 Y2xrIGNvbXBhcmlzb24gb3V0IG9mCj4gdGhlIGlmIGxhZGRlciwgc28gd2UgZG9uJ3QgaGF2ZSB0 byBkdXBsaWNhdGUgaXQgZm9yIGVhY2ggcGxhdGZvcm0/Cj4gSXQgc2hvdWxkIGFsc28gZ2V0IHJp ZCBvZiB0aGUgdWdseSBsaW5lIGxlbmd0aCBpc3N1ZSB3ZSBoYXZlIGhlcmUuCj4gCj4gRXZlbnR1 YWxseSB3ZSBzaG91bGQgZ2V0IHJpZCBvZiB0aGUgcGxhdGZvcm0gc3BlY2lmaWNzIGhlcmUsIGJ1 dAo+IHRoYXQgcmVxdWlyZXMgdGhhdCB3ZSBzb3J0IG91dCB0aGUgcGZpdCBwaXhlbCByYXRlIG1l c3MgZm9yIGFsbAo+IHBsYXRmb3JtcyBpbiB0aGUgc2FtZSB3YXkuIEN1cnJlbnRseSB3ZSBqdXN0 IGlnbm9yZSB0aGUgcGZpdAo+IHNjYWxpbmcgcmF0aW8gZm9yIGdtY2ggKGFuZCBnZW45IElJUkMp IHBsYXRmb3Jtcy4KSW5kZWVkLCBsaW5lIGJyZWFrIGlzc3VlIGRvZXMgbG9vayB1Z2x5LiBJIHRo cm93IGEgcmV2aXNlZCBwYXRjaCBmb3IgdGhpcy4KClRoYW5rcyBmb3IgdGhlIHJldmlldyEKCj4g Cj4gPiArCj4gPiAgCS8qIGRpc2FibGUvZW5hYmxlIGFsbCBjdXJyZW50bHkgYWN0aXZlIHBpcGVz IHdoaWxlIHdlIGNoYW5nZSBjZGNsayAqLwo+ID4gIAlmb3JfZWFjaF9pbnRlbF9jcnRjKGRldiwg Y3J0YykKPiA+IC0JCWlmIChjcnRjLT5iYXNlLmVuYWJsZWQpCj4gPiAtCQkJKnByZXBhcmVfcGlw ZXMgfD0gMSA8PCBjcnRjLT5waXBlOwo+ID4gKwkJaWYgKGNydGMtPmJhc2Uuc3RhdGUtPmVuYWJs ZSkKPiA+ICsJCQkqcHJlcGFyZV9waXBlcyB8PSAoMSA8PCBjcnRjLT5waXBlKTsKPiA+ICsKPiA+ ICsJLyogbWF5IGhhdmUgYWRkZWQgbW9yZSB0byBwcmVwYXJlX3BpcGVzIHRoYW4gd2Ugc2hvdWxk ICovCj4gPiArCSpwcmVwYXJlX3BpcGVzICY9IH4qZGlzYWJsZV9waXBlczsKPiA+ICB9Cj4gPiAg Cj4gPiAgc3RhdGljIHZvaWQgaGFzd2VsbF9tb2Rlc2V0X2dsb2JhbF9yZXNvdXJjZXMoc3RydWN0 IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlKQo+ID4gQEAgLTEyMTIwLDE1ICsxMjEyMSw3IEBAIHN0 YXRpYyBpbnQgX19pbnRlbF9zZXRfbW9kZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCj4gPiAgCSAq IG1vZGUgc2V0IG9uIHRoaXMgY3J0Yy4gIEZvciBvdGhlciBjcnRjcyB3ZSBuZWVkIHRvIHVzZSB0 aGUKPiA+ICAJICogYWRqdXN0ZWRfbW9kZSBiaXRzIGluIHRoZSBjcnRjIGRpcmVjdGx5Lgo+ID4g IAkgKi8KPiA+IC0JaWYgKElTX1ZBTExFWVZJRVcoZGV2KSB8fCBJU19IQVNXRUxMKGRldikgfHwg SVNfQlJPQURXRUxMKGRldikpIHsKPiA+IC0JCWlmIChJU19WQUxMRVlWSUVXKGRldikpCj4gPiAt CQkJdmFsbGV5dmlld19tb2Rlc2V0X2dsb2JhbF9waXBlcyhkZXYsICZwcmVwYXJlX3BpcGVzKTsK PiA+IC0JCWVsc2UKPiA+IC0JCQloYXN3ZWxsX21vZGVzZXRfZ2xvYmFsX3BpcGVzKGRldiwgJnBy ZXBhcmVfcGlwZXMpOwo+ID4gLQo+ID4gLQkJLyogbWF5IGhhdmUgYWRkZWQgbW9yZSB0byBwcmVw YXJlX3BpcGVzIHRoYW4gd2Ugc2hvdWxkICovCj4gPiAtCQlwcmVwYXJlX3BpcGVzICY9IH5kaXNh YmxlX3BpcGVzOwo+ID4gLQl9Cj4gPiArCWludGVsX21vZGVzZXRfZ2xvYmFsX3BpcGVzKGRldiwg JnByZXBhcmVfcGlwZXMsICZkaXNhYmxlX3BpcGVzKTsKPiA+ICAKPiA+ICAJcmV0ID0gX19pbnRl bF9zZXRfbW9kZV9zZXR1cF9wbGxzKGRldiwgbW9kZXNldF9waXBlcywgZGlzYWJsZV9waXBlcyk7 Cj4gPiAgCWlmIChyZXQpCj4gPiAtLSAKPiA+IDEuOS4xCj4gPiAKPiA+IF9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCj4gPiBJbnRlbC1nZnggbWFpbGluZyBs aXN0Cj4gPiBJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCj4gPiBodHRwOi8vbGlzdHMu ZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cj4gCj4gLS0gCj4gVmls bGUgU3lyasOkbMOkCj4gSW50ZWwgT1RDCgotLSAKTWlrYSBLYWhvbGEsIEludGVsIE9UQwpfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFp bGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZy ZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=