From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: [PATCH] drm/i915: Fix all pipe->plane mappings before sanitizing crtc Date: Wed, 14 Jan 2015 12:47:11 +0200 Message-ID: <87h9vtfxlc.fsf@intel.com> References: <1421135983-1581-1-git-send-email-ander.conselvan.de.oliveira@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 546BA6E759 for ; Wed, 14 Jan 2015 02:46:29 -0800 (PST) In-Reply-To: <1421135983-1581-1-git-send-email-ander.conselvan.de.oliveira@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org Cc: Ander Conselvan de Oliveira List-Id: intel-gfx@lists.freedesktop.org T24gVHVlLCAxMyBKYW4gMjAxNSwgQW5kZXIgQ29uc2VsdmFuIGRlIE9saXZlaXJhIDxhbmRlci5j b25zZWx2YW4uZGUub2xpdmVpcmFAaW50ZWwuY29tPiB3cm90ZToKPiBJZiBRVUlSS19QSVBFQV9G T1JDRSBpcyBuZWNlc3NhcnksIGludGVsX3Nhbml0aXplX2NydGMoKSBtaWdodCB0cmlnZ2VyCj4g YSBtb2RlIHNldC4gSW4gdGhhdCBjYXNlLCBpZiBwaXBlIEEgaXMgZGlzYWJsZWQgYW5kIHBpcGUg QiBpcyBtYXBwZWQgdG8KPiBwbGFuZSBCLCB0aGF0IG1vZGUgc2V0IGhhcHBlbnMgYmVmb3JlIHRo ZSBtYXBwaW5nIGlzIGZpeGVkLiBEdWUgdG8gdGhlCj4gd3Jvbmcgc3RhdGUsIHRoZSBjYWxsIHRv IGRpc2FibGUgcGlwZSBCIGRpc2FibGVzIHBsYW5lIEEgKHdoaWNoIGlzCj4gYWxyZWFkeSBkaXNh YmxlZCkgYW5kIGxhdGVyIGFuIGFzc2VydGlvbiBmb3IgcGxhbmUgQiBiZWluZyBlbmFibGVkCj4g KHdoaWxlIGl0IHNob3VsZCBoYXZlIGJlZW4gZGlzYWJsZWQpIGlzIHRyaWdnZXJlZC4KPgo+IFJl ZmVyZW5jZXM6IGh0dHBzOi8vYnVncy5mcmVlZGVza3RvcC5vcmcvc2hvd19idWcuY2dpP2lkPTcy NzgyCgpJZiB0aGUgcGF0Y2ggaXMgZXhwZWN0ZWQgdG8gZml4IHRoZSBidWcsIHBsZWFzZSB1c2Ug QnVnemlsbGE6LiBJZiB5b3UncmUKcmVmZXJlbmNpbmcgYSBidWcgYmVjYXVzZSBpdCdzIG90aGVy d2lzZSByZWxldmFudCwgcGxlYXNlIHVzZQpSZWZlcmVuY2VzOi4KCldoaWNoIG9uZSBpcyB0aGlz PwoKQlIsCkphbmkuCgoKPiBTaWduZWQtb2ZmLWJ5OiBBbmRlciBDb25zZWx2YW4gZGUgT2xpdmVp cmEgPGFuZGVyLmNvbnNlbHZhbi5kZS5vbGl2ZWlyYUBpbnRlbC5jb20+Cj4gLS0tCj4gIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8IDUwICsrKysrKysrKysrKysrKysrKysr KysrLS0tLS0tLS0tLS0tLQo+ICAxIGZpbGUgY2hhbmdlZCwgMzIgaW5zZXJ0aW9ucygrKSwgMTgg ZGVsZXRpb25zKC0pCj4KPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCj4gaW5kZXgg ZDAxZGIxYi4uY2Y4NzUyOCAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kaXNwbGF5LmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMK PiBAQCAtMTMxMjcsMzAgKzEzMTI3LDIyIEBAIGludGVsX2NoZWNrX3BsYW5lX21hcHBpbmcoc3Ry dWN0IGludGVsX2NydGMgKmNydGMpCj4gIAlyZXR1cm4gdHJ1ZTsKPiAgfQo+ICAKPiAtc3RhdGlj IHZvaWQgaW50ZWxfc2FuaXRpemVfY3J0YyhzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKPiArc3Rh dGljIHZvaWQgaW50ZWxfZml4X3BsYW5lX21hcHBpbmcoc3RydWN0IGRybV9kZXZpY2UgKmRldikK PiAgewo+IC0Jc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMtPmJhc2UuZGV2Owo+IC0Jc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKPiAtCXUz MiByZWc7Cj4gLQo+IC0JLyogQ2xlYXIgYW55IGZyYW1lIHN0YXJ0IGRlbGF5cyB1c2VkIGZvciBk ZWJ1Z2dpbmcgbGVmdCBieSB0aGUgQklPUyAqLwo+IC0JcmVnID0gUElQRUNPTkYoY3J0Yy0+Y29u ZmlnLmNwdV90cmFuc2NvZGVyKTsKPiAtCUk5MTVfV1JJVEUocmVnLCBJOTE1X1JFQUQocmVnKSAm IH5QSVBFQ09ORl9GUkFNRV9TVEFSVF9ERUxBWV9NQVNLKTsKPiArCXN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKPiArCXN0cnVjdCBpbnRlbF9jcnRjICpj cnRjOwo+ICAKPiAtCS8qIHJlc3RvcmUgdmJsYW5rIGludGVycnVwdHMgdG8gY29ycmVjdCBzdGF0 ZSAqLwo+IC0JaWYgKGNydGMtPmFjdGl2ZSkgewo+IC0JCXVwZGF0ZV9zY2FubGluZV9vZmZzZXQo Y3J0Yyk7Cj4gLQkJZHJtX3ZibGFua19vbihkZXYsIGNydGMtPnBpcGUpOwo+IC0JfSBlbHNlCj4g LQkJZHJtX3ZibGFua19vZmYoZGV2LCBjcnRjLT5waXBlKTsKPiArCS8qIGdlbjQrIGhhcyBhIGZp eGVkIHBsYW5lIC0+IHBpcGUgbWFwcGluZy4qLwo+ICsJaWYgKElOVEVMX0lORk8oZGV2KS0+Z2Vu ID49IDQpCj4gKwkJcmV0dXJuOwo+ICAKPiAtCS8qIFdlIG5lZWQgdG8gc2FuaXRpemUgdGhlIHBs YW5lIC0+IHBpcGUgbWFwcGluZyBmaXJzdCBiZWNhdXNlIHRoaXMgd2lsbAo+IC0JICogZGlzYWJs ZSB0aGUgY3J0YyAoYW5kIGhlbmNlIGNoYW5nZSB0aGUgc3RhdGUpIGlmIGl0IGlzIHdyb25nLiBO b3RlCj4gLQkgKiB0aGF0IGdlbjQrIGhhcyBhIGZpeGVkIHBsYW5lIC0+IHBpcGUgbWFwcGluZy4g ICovCj4gLQlpZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPCA0ICYmICFpbnRlbF9jaGVja19wbGFu ZV9tYXBwaW5nKGNydGMpKSB7Cj4gKwlmb3JfZWFjaF9pbnRlbF9jcnRjKGRldiwgY3J0Yykgewo+ ICAJCXN0cnVjdCBpbnRlbF9jb25uZWN0b3IgKmNvbm5lY3RvcjsKPiAgCQlib29sIHBsYW5lOwo+ ICAKPiArCQlpZiAoaW50ZWxfY2hlY2tfcGxhbmVfbWFwcGluZyhjcnRjKSkKPiArCQkJY29udGlu dWU7Cj4gKwo+ICAJCURSTV9ERUJVR19LTVMoIltDUlRDOiVkXSB3cm9uZyBwbGFuZSBjb25uZWN0 aW9uIGRldGVjdGVkIVxuIiwKPiAgCQkJICAgICAgY3J0Yy0+YmFzZS5iYXNlLmlkKTsKPiAgCj4g QEAgLTEzMTg0LDYgKzEzMTc2LDI0IEBAIHN0YXRpYyB2b2lkIGludGVsX3Nhbml0aXplX2NydGMo c3RydWN0IGludGVsX2NydGMgKmNydGMpCj4gIAkJV0FSTl9PTihjcnRjLT5hY3RpdmUpOwo+ICAJ CWNydGMtPmJhc2UuZW5hYmxlZCA9IGZhbHNlOwo+ICAJfQo+ICt9Cj4gKwo+ICtzdGF0aWMgdm9p ZCBpbnRlbF9zYW5pdGl6ZV9jcnRjKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQo+ICt7Cj4gKwlz dHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+YmFzZS5kZXY7Cj4gKwlzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwo+ICsJdTMyIHJlZzsKPiAr Cj4gKwkvKiBDbGVhciBhbnkgZnJhbWUgc3RhcnQgZGVsYXlzIHVzZWQgZm9yIGRlYnVnZ2luZyBs ZWZ0IGJ5IHRoZSBCSU9TICovCj4gKwlyZWcgPSBQSVBFQ09ORihjcnRjLT5jb25maWcuY3B1X3Ry YW5zY29kZXIpOwo+ICsJSTkxNV9XUklURShyZWcsIEk5MTVfUkVBRChyZWcpICYgflBJUEVDT05G X0ZSQU1FX1NUQVJUX0RFTEFZX01BU0spOwo+ICsKPiArCS8qIHJlc3RvcmUgdmJsYW5rIGludGVy cnVwdHMgdG8gY29ycmVjdCBzdGF0ZSAqLwo+ICsJaWYgKGNydGMtPmFjdGl2ZSkgewo+ICsJCXVw ZGF0ZV9zY2FubGluZV9vZmZzZXQoY3J0Yyk7Cj4gKwkJZHJtX3ZibGFua19vbihkZXYsIGNydGMt PnBpcGUpOwo+ICsJfSBlbHNlCj4gKwkJZHJtX3ZibGFua19vZmYoZGV2LCBjcnRjLT5waXBlKTsK PiAgCj4gIAlpZiAoZGV2X3ByaXYtPnF1aXJrcyAmIFFVSVJLX1BJUEVBX0ZPUkNFICYmCj4gIAkg ICAgY3J0Yy0+cGlwZSA9PSBQSVBFX0EgJiYgIWNydGMtPmFjdGl2ZSkgewo+IEBAIC0xMzQ0Miw2 ICsxMzQ1MiwxMCBAQCB2b2lkIGludGVsX21vZGVzZXRfc2V0dXBfaHdfc3RhdGUoc3RydWN0IGRy bV9kZXZpY2UgKmRldiwKPiAgCQlpbnRlbF9zYW5pdGl6ZV9lbmNvZGVyKGVuY29kZXIpOwo+ICAJ fQo+ICAKPiArCS8qIFdlIG5lZWQgdG8gc2FuaXRpemUgdGhlIHBsYW5lIC0+IHBpcGUgbWFwcGlu ZyBmaXJzdCBiZWNhdXNlIHRoaXMgd2lsbAo+ICsJICogZGlzYWJsZSB0aGUgY3J0YyAoYW5kIGhl bmNlIGNoYW5nZSB0aGUgc3RhdGUpIGlmIGl0IGlzIHdyb25nLiAqLwo+ICsJaW50ZWxfZml4X3Bs YW5lX21hcHBpbmcoZGV2KTsKPiArCj4gIAlmb3JfZWFjaF9waXBlKGRldl9wcml2LCBwaXBlKSB7 Cj4gIAkJY3J0YyA9IHRvX2ludGVsX2NydGMoZGV2X3ByaXYtPnBpcGVfdG9fY3J0Y19tYXBwaW5n W3BpcGVdKTsKPiAgCQlpbnRlbF9zYW5pdGl6ZV9jcnRjKGNydGMpOwo+IC0tIAo+IDEuOS4xCj4K PiBfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwo+IEludGVs LWdmeCBtYWlsaW5nIGxpc3QKPiBJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCj4gaHR0 cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAoKLS0g CkphbmkgTmlrdWxhLCBJbnRlbCBPcGVuIFNvdXJjZSBUZWNobm9sb2d5IENlbnRlcgpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGlu ZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVk ZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=