From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [Intel-gfx] [PATCH 2/3] drm/i915: Use the correct crtc when sanitizing plane mapping Date: Tue, 2 Oct 2018 14:11:34 +0200 Message-ID: <20181002121134.GN11082@phenom.ffwll.local> References: <20181001142909.5567-1-ville.syrjala@linux.intel.com> <20181001143120.5777-1-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline In-Reply-To: <20181001143120.5777-1-ville.syrjala@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Ville Syrjala Cc: stable@vger.kernel.org, intel-gfx@lists.freedesktop.org, Dennis , dri-devel@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org T24gTW9uLCBPY3QgMDEsIDIwMTggYXQgMDU6MzE6MjBQTSArMDMwMCwgVmlsbGUgU3lyamFsYSB3 cm90ZToKPiBGcm9tOiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwu Y29tPgo+IAo+IFdoZW4gd2UgZGVjaWRlIHRoYXQgYSBwbGFuZSBpcyBhdHRhY2hlZCB0byB0aGUg d3JvbmcgcGlwZSB3ZSB0cnkKPiB0byB0dXJuIG9mZiBzYWlkIHBsYW5lLiBIb3dldmVyIHdlIGFy ZSBwYXNzaW5nIGFyb3VuZCB0aGUgY3J0YyB3ZQo+IHRoaW5rIHRoYXQgdGhlIHBsYW5lIGlzIHN1 cHBvc2VkIHRvIGJlIHVzaW5nIHJhdGhlciB0aGFuIHRoZSBjcnRjCj4gaXQgaXMgY3VycmVudGx5 IHVzaW5nLiBUaGF0IGRvZXNuJ3Qgd29yayBhbGwgdGhhdCB3ZWxsIGJlY2F1c2UKPiB3ZSBtYXkg aGF2ZSB0byBkbyB2Ymxhbmsgd2FpdHMgZXRjLiBhbmQgdGhlIG90aGVyIHBpcGUgbWlnaHQKPiBu b3QgZXZlbiBiZSBlbmFibGVkIGhlcmUuIFNvIGxldCdzIHBhc3MgdGhlIHBsYW5lJ3MgY3VycmVu dCBjcnRjIHRvCj4gaW50ZWxfcGxhbmVfZGlzYWJsZV9ub2F0b21pYygpIHNvIHRoYXQgaXQgY2Fu IGl0cyBqb2IgY29ycmVjdGx5Lgo+IAo+IFRvIGRvIHRoYXQgc2VtaS1jbGVhbmx5IHdlIGFsc28g aGF2ZSB0byBjaGFuZ2UgdGhlIHBsYW5lIHJlYWRvdXQKPiB0byByZWNvcmQgdGhlIHBsYW5lJ3Mg dmlzaWJpbGl0eSBpbnRvIHRoZSBiaXRtYXNrcyBvZiB0aGUgY3J0Ywo+IHdoZXJlIHRoZSBwbGFu ZSBpcyBjdXJyZW50bHkgZW5hYmxlZCByYXRoZXIgdGhhbiB0byB0aGUgY3J0Ywo+IHdlIHdhbnQg dG8gdXNlIGZvciB0aGUgcGxhbmUuCj4gCj4gT25lIGNhdmVhdCBoZXJlIGlzIHRoYXQgb3VyIGFj dGl2ZV9wbGFuZXMgYml0bWFzayB3aWxsIGdldCBjb25mdXNlZAo+IGlmIGJvdGggcGxhbmVzIGFy ZSBlbmFibGVkIG9uIHRoZSBzYW1lIHBpcGUuIEZvcnR1bmF0ZWx5IHdlIGNhbiB1c2UKPiBwbGFu ZV9tYXNrIHRvIHJlY29uc3RydWN0IGFjdGl2ZV9wbGFuZXMgc3VmZmljaWVudGx5IHNpbmNlCj4g cGxhbmVfbWFzayBzdGlsbCBoYXMgdGhlIHNhbWUgbWVhbmluZyAoaXMgdGhlIHBsYW5lIHZpc2li bGU/KQo+IGR1cmluZyByZWFkb3V0LiBXZSBhbHNvIGhhdmUgdG8gZG8gdGhlIHNhbWUgZHVyaW5n IHRoZSBpbml0aWFsCj4gcGxhbmUgcmVhZG91dCBhcyB0aGUgc2Vjb25kIHBsYW5lIGNvdWxkIGNs ZWFyIHRoZSBhY3RpdmVfcGxhbmVzCj4gYml0IHRoZSBmaXJzdCBwbGFuZSBoYWQgYWxyZWFkeSBz ZXQuCgpIb3cgb2Z0ZW4gaGF2ZSB3ZSBicm9rZW4gdGhpcyA6LS8KClVuZm9ydHVuYXRlbHkgSSBz dGlsbCBkb24ndCBoYXZlIGEgZ29vZCBpZGVhIGhvdyB0byBiZXN0IENJIHRoaXMsIHNpbmNlIHdl CnNodXQgZG93biBldmVyeXRoaW5nIG9uIG1vZHVsZSB1bmxvYWQuIE1heWJlIHdlIHNob3VsZCBo YXZlIGEgc3BlY2lhbCBtb2RlCmZvciBtb2R1bGUgdW5sb2FkIHRvIGxlYXZlIHRoZSBodyBvbiwg c28gdGhhdCB3ZSBjYW4gc3RhcnQgdGVzdGluZyB2YXJpb3VzCmZhc3Rib290IHNjZW5hcmlvcyAu Li4KClNvbWUgcXVlc3Rpb25zIGJlbG93LgoKPiBDYzogc3RhYmxlQHZnZXIua2VybmVsLm9yZyAj IGZjYmE4NjJlODQyOCBkcm0vaTkxNTogSGF2ZSBwbGFuZS0+Z2V0X2h3X3N0YXRlKCkgcmV0dXJu IHRoZSBjdXJyZW50IHBpcGUKPiBDYzogc3RhYmxlQHZnZXIua2VybmVsLm9yZwo+IENjOiBEZW5u aXMgPGRlbm5pcy5uZXppY0B1dG9yb250by5jYT4KPiBUZXN0ZWQtYnk6IERlbm5pcyA8ZGVubmlz Lm5lemljQHV0b3JvbnRvLmNhPgo+IEJ1Z3ppbGxhOiBodHRwczovL2J1Z3MuZnJlZWRlc2t0b3Au b3JnL3Nob3dfYnVnLmNnaT9pZD0xMDU2MzcKPiBGaXhlczogYjFlMDE1OTVhNjZkICgiZHJtL2k5 MTU6IFJlZG8gcGxhbmUgc2FuaXRhdGlvbiBkdXJpbmcgcmVhZG91dCIpCj4gU2lnbmVkLW9mZi1i eTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KPiAtLS0K PiAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgNjMgKysrKysrKysrKysr KysrKysrKysrKysrKysrLS0tLS0tLS0tCj4gIDEgZmlsZSBjaGFuZ2VkLCA0NyBpbnNlcnRpb25z KCspLCAxNiBkZWxldGlvbnMoLSkKPiAKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5j Cj4gaW5kZXggZTAxOGIzN2JlZDM5Li5jNzJiZThjZDFmNTQgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZGlzcGxheS5jCj4gQEAgLTE1NDc1LDE1ICsxNTQ3NSwxNiBAQCB2b2lkIGk4MzBf ZGlzYWJsZV9waXBlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgZW51bSBwaXBl IHBpcGUpCj4gIAlQT1NUSU5HX1JFQUQoRFBMTChwaXBlKSk7Cj4gIH0KPiAgCj4gLXN0YXRpYyBi b29sIGludGVsX3BsYW5lX21hcHBpbmdfb2soc3RydWN0IGludGVsX2NydGMgKmNydGMsCj4gLQkJ CQkgICBzdHJ1Y3QgaW50ZWxfcGxhbmUgKnBsYW5lKQo+ICtzdGF0aWMgdm9pZCBmaXh1cF9hY3Rp dmVfcGxhbmVzKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQo+ICB7Cj4gLQllbnVtIHBpcGUgcGlw ZTsKPiAtCj4gLQlpZiAoIXBsYW5lLT5nZXRfaHdfc3RhdGUocGxhbmUsICZwaXBlKSkKPiAtCQly ZXR1cm4gdHJ1ZTsKPiArCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5 MTUoY3J0Yy0+YmFzZS5kZXYpOwo+ICsJc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3Rh dGUgPQo+ICsJCXRvX2ludGVsX2NydGNfc3RhdGUoY3J0Yy0+YmFzZS5zdGF0ZSk7Cj4gKwlzdHJ1 Y3QgZHJtX3BsYW5lICpwbGFuZTsKPiAgCj4gLQlyZXR1cm4gcGlwZSA9PSBjcnRjLT5waXBlOwo+ ICsJZHJtX2Zvcl9lYWNoX3BsYW5lX21hc2socGxhbmUsICZkZXZfcHJpdi0+ZHJtLAo+ICsJCQkJ Y3J0Y19zdGF0ZS0+YmFzZS5wbGFuZV9tYXNrKQo+ICsJCWNydGNfc3RhdGUtPmFjdGl2ZV9wbGFu ZXMgfD0gQklUKHRvX2ludGVsX3BsYW5lKHBsYW5lKS0+aWQpOwoKSSB0aGluayB3ZSBuZWVkIHRv IGFsc28gdXBkYXRlIHBsYW5lX21hc2sgaGVyZS4KCj4gIH0KPiAgCj4gIHN0YXRpYyB2b2lkCj4g QEAgLTE1NDk3LDEzICsxNTQ5OCwyOCBAQCBpbnRlbF9zYW5pdGl6ZV9wbGFuZV9tYXBwaW5nKHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKPiAgCWZvcl9lYWNoX2ludGVsX2NydGMo JmRldl9wcml2LT5kcm0sIGNydGMpIHsKPiAgCQlzdHJ1Y3QgaW50ZWxfcGxhbmUgKnBsYW5lID0K PiAgCQkJdG9faW50ZWxfcGxhbmUoY3J0Yy0+YmFzZS5wcmltYXJ5KTsKPiArCQlzdHJ1Y3QgaW50 ZWxfY3J0YyAqcGxhbmVfY3J0YzsKPiArCQllbnVtIHBpcGUgcGlwZTsKPiArCj4gKwkJaWYgKCFw bGFuZS0+Z2V0X2h3X3N0YXRlKHBsYW5lLCAmcGlwZSkpCj4gKwkJCWNvbnRpbnVlOwo+ICAKPiAt CQlpZiAoaW50ZWxfcGxhbmVfbWFwcGluZ19vayhjcnRjLCBwbGFuZSkpCj4gKwkJaWYgKHBpcGUg PT0gY3J0Yy0+cGlwZSkKPiAgCQkJY29udGludWU7Cj4gIAo+ICAJCURSTV9ERUJVR19LTVMoIiVz IGF0dGFjaGVkIHRvIHRoZSB3cm9uZyBwaXBlLCBkaXNhYmxpbmcgcGxhbmVcbiIsCj4gIAkJCSAg ICAgIHBsYW5lLT5iYXNlLm5hbWUpOwo+IC0JCWludGVsX3BsYW5lX2Rpc2FibGVfbm9hdG9taWMo Y3J0YywgcGxhbmUpOwo+ICsKPiArCQlwbGFuZV9jcnRjID0gaW50ZWxfZ2V0X2NydGNfZm9yX3Bp cGUoZGV2X3ByaXYsIHBpcGUpOwo+ICsJCWludGVsX3BsYW5lX2Rpc2FibGVfbm9hdG9taWMocGxh bmVfY3J0YywgcGxhbmUpOwo+ICsKPiArCQkvKgo+ICsJCSAqIE91ciBhY3RpdmVfcGxhbmVzIHRy YWNraW5nIHdpbGwgZ2V0IGNvbmZ1c2VkIGhlcmUKPiArCQkgKiBpZiBib3RoIHBsYW5lcyBBIGFu ZCBCIGFyZSBlbmFibGVkIG9uIHRoZSBzYW1lIHBpcGUKPiArCQkgKiAoc2luY2UgYm90aCBwbGFu ZXMgbWFwIHRvIEJJVChQTEFORV9QUklNQVJZKSkuCj4gKwkJICogUmVjb25zdHJ1Y3QgYWN0aXZl X3BsYW5lcyBhZnRlciBkaXNhYmxpbmcgdGhlIHBsYW5lLgo+ICsJCSAqLwoKSG0sIHdvdWxkIGJl IG5lYXQgaWYgd2UgY291bGQgcmV0aXJlIGludGVsX2NydGNfc3RhdGUtPmFjdGl2ZV9wbGFuZXMg aW4KZmF2b3VyIG9mIGRybV9jcnRjX3N0YXRlLT5wbGFuZV9tYXNrLiBFeGNlcHQgZm9yIHRoYXQg ZW50aXJlIHZpc2libGUgeS9uCnRoaW5nIDotLwoKPiArCQlmaXh1cF9hY3RpdmVfcGxhbmVzKHBs YW5lX2NydGMpOwoKQml0IGEgYmlrZXNoZWQsIGJ1dCB3aGF0IGFib3V0IHRocm93aW5nIHRoZSBw bGFuZSBzdGF0ZSBhd2F5IGFuZCBqdXN0CnN0YXJ0aW5nIG92ZXIsIGluc3RlYWQgb2YgdHJ5aW5n IHRvIGZpeCBpdCB1cD8gV2UgY291bGQgdGhlbiB1c2UgdGhhdCBhcyBhCmNvbnNpc3RlbmN5IGNo ZWNrLCBpZiB0aGUgcGxhbmUgbWFwcGluZ3MgYXJlIHN0aWxsIHdyb25nIG91ciBjb2RlIGlzCmJy b2tlbiBhbmQgd2Ugc2hvdWxkIGJhaWwgb3V0IHdpdGggYSB2ZXJ5IGxvdWQgd2FybmluZy4KCkJ1 dCB0aGlzIGhlcmUgc2hvdWxkIHdvcmsgdG9vLCBhbGJlaXQgYSBiaXQgbW9yZSBmcmFnaWxlIEkg dGhpbmsuCgpDaGVlcnMsIERhbmllbAo+ICAJfQo+ICB9Cj4gIAo+IEBAIC0xNTY3MSwyMyArMTU2 ODcsMzggQEAgdm9pZCBpOTE1X3JlZGlzYWJsZV92Z2Eoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2KQo+ICB9Cj4gIAo+ICAvKiBGSVhNRSByZWFkIG91dCBmdWxsIHBsYW5lIHN0YXRl IGZvciBhbGwgcGxhbmVzICovCj4gLXN0YXRpYyB2b2lkIHJlYWRvdXRfcGxhbmVfc3RhdGUoc3Ry dWN0IGludGVsX2NydGMgKmNydGMpCj4gK3N0YXRpYyB2b2lkIHJlYWRvdXRfcGxhbmVfc3RhdGUo c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQo+ICB7Cj4gLQlzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGNydGMtPmJhc2UuZGV2KTsKPiAtCXN0cnVj dCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlID0KPiAtCQl0b19pbnRlbF9jcnRjX3N0YXRl KGNydGMtPmJhc2Uuc3RhdGUpOwo+ICAJc3RydWN0IGludGVsX3BsYW5lICpwbGFuZTsKPiArCXN0 cnVjdCBpbnRlbF9jcnRjICpjcnRjOwo+ICAKPiAtCWZvcl9lYWNoX2ludGVsX3BsYW5lX29uX2Ny dGMoJmRldl9wcml2LT5kcm0sIGNydGMsIHBsYW5lKSB7Cj4gKwlmb3JfZWFjaF9pbnRlbF9wbGFu ZSgmZGV2X3ByaXYtPmRybSwgcGxhbmUpIHsKPiAgCQlzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUg KnBsYW5lX3N0YXRlID0KPiAgCQkJdG9faW50ZWxfcGxhbmVfc3RhdGUocGxhbmUtPmJhc2Uuc3Rh dGUpOwo+ICsJCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlOwo+ICAJCWVudW0g cGlwZSBwaXBlOwo+ICAJCWJvb2wgdmlzaWJsZTsKPiAgCj4gIAkJdmlzaWJsZSA9IHBsYW5lLT5n ZXRfaHdfc3RhdGUocGxhbmUsICZwaXBlKTsKPiAgCj4gKwkJY3J0YyA9IGludGVsX2dldF9jcnRj X2Zvcl9waXBlKGRldl9wcml2LCBwaXBlKTsKPiArCQljcnRjX3N0YXRlID0gdG9faW50ZWxfY3J0 Y19zdGF0ZShjcnRjLT5iYXNlLnN0YXRlKTsKPiArCj4gIAkJaW50ZWxfc2V0X3BsYW5lX3Zpc2li bGUoY3J0Y19zdGF0ZSwgcGxhbmVfc3RhdGUsIHZpc2libGUpOwo+ICAJfQo+ICsKPiArCWZvcl9l YWNoX2ludGVsX2NydGMoJmRldl9wcml2LT5kcm0sIGNydGMpIHsKPiArCQkvKgo+ICsJCSAqIE91 ciBhY3RpdmVfcGxhbmVzIHRyYWNraW5nIG1heSBnZXQgY29uZnVzZWQgaGVyZQo+ICsJCSAqIG9u IGdlbjIvMyBpZiB0aGUgZmlyc3QgcGxhbmUgaXMgZW5hYmxlZCBidXQgdGhlCj4gKwkJICogc2Vj b25kIG9uZSBpc24ndCBidXQgYm90aCBpbmRpY2F0ZSB0aGUgc2FtZSBwaXBlLgo+ICsJCSAqIFRo ZSBzZWNvbmQgcGxhbmUgd291bGQgY2xlYXIgdGhlIGFjdGl2ZV9wbGFuZXMKPiArCQkgKiBiaXQg Zm9yIHRoZSBmaXJzdCBwbGFuZSAoc2luY2UgYm90aCBtYXAgdG8KPiArCQkgKiBCSVQoUExBTkVf UFJJTUFSWSkuIFJlY29uc3RydWN0IGFjdGl2ZV9wbGFuZXMKPiArCQkgKiBhZnRlciBwbGFuZSBy ZWFkb3V0IGlzIGRvbmUuCj4gKwkJICovCj4gKwkJZml4dXBfYWN0aXZlX3BsYW5lcyhjcnRjKTsK PiArCX0KPiAgfQo+ICAKPiAgc3RhdGljIHZvaWQgaW50ZWxfbW9kZXNldF9yZWFkb3V0X2h3X3N0 YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCj4gQEAgLTE1NzE5LDEzICsxNTc1MCwxMyBAQCBz dGF0aWMgdm9pZCBpbnRlbF9tb2Rlc2V0X3JlYWRvdXRfaHdfc3RhdGUoc3RydWN0IGRybV9kZXZp Y2UgKmRldikKPiAgCQlpZiAoY3J0Y19zdGF0ZS0+YmFzZS5hY3RpdmUpCj4gIAkJCWRldl9wcml2 LT5hY3RpdmVfY3J0Y3MgfD0gMSA8PCBjcnRjLT5waXBlOwo+ICAKPiAtCQlyZWFkb3V0X3BsYW5l X3N0YXRlKGNydGMpOwo+IC0KPiAgCQlEUk1fREVCVUdfS01TKCJbQ1JUQzolZDolc10gaHcgc3Rh dGUgcmVhZG91dDogJXNcbiIsCj4gIAkJCSAgICAgIGNydGMtPmJhc2UuYmFzZS5pZCwgY3J0Yy0+ YmFzZS5uYW1lLAo+ICAJCQkgICAgICBlbmFibGVkZGlzYWJsZWQoY3J0Y19zdGF0ZS0+YmFzZS5h Y3RpdmUpKTsKPiAgCX0KPiAgCj4gKwlyZWFkb3V0X3BsYW5lX3N0YXRlKGRldl9wcml2KTsKPiAr Cj4gIAlmb3IgKGkgPSAwOyBpIDwgZGV2X3ByaXYtPm51bV9zaGFyZWRfZHBsbDsgaSsrKSB7Cj4g IAkJc3RydWN0IGludGVsX3NoYXJlZF9kcGxsICpwbGwgPSAmZGV2X3ByaXYtPnNoYXJlZF9kcGxs c1tpXTsKPiAgCj4gLS0gCj4gMi4xNi40Cj4gCj4gX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KPiBJbnRlbC1nZnggbWFpbGluZyBsaXN0Cj4gSW50ZWwtZ2Z4 QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwo+IGh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h aWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4CgotLSAKRGFuaWVsIFZldHRlcgpTb2Z0d2FyZSBFbmdp bmVlciwgSW50ZWwgQ29ycG9yYXRpb24KaHR0cDovL2Jsb2cuZmZ3bGwuY2gKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlz dApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0 b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==