From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH 4.20 regression fix] drm/i915: Revert "Fix assert_plane() warning on bootup with external display" Date: Wed, 21 Nov 2018 14:14:44 +0200 Message-ID: <20181121121444.GE9144@intel.com> References: <20181119223500.29779-1-hdegoede@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline In-Reply-To: <20181119223500.29779-1-hdegoede@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Hans de Goede Cc: intel-gfx , dri-devel@lists.freedesktop.org, Rodrigo Vivi List-Id: dri-devel@lists.freedesktop.org T24gTW9uLCBOb3YgMTksIDIwMTggYXQgMTE6MzU6MDBQTSArMDEwMCwgSGFucyBkZSBHb2VkZSB3 cm90ZToKPiBTdGFydGluZyB3aXRoIDQuMjAtcmMxIEknbSBzZWVpbmcgdGhlIExDRCBzY3JlZW4g YnJpZWZseSB0dXJuIG1vc3RseSBwdXJwbGUKPiBvbiBkZXZpY2VzIHdpdGggYSBEU0kgcGFuZWwg KHNlZW4gb24gMiBkaWZmZXJlbnQgZGV2aWNlcyB3aXRoIGEgRFNJIHBhbmVsKS4KPiAKPiBUaGlz IGhhcHBlbnMgYm90aCB3aXRoIGFuZCB3aXRob3V0IGZhc3Rib290PTEuIFRoaXMgaXMgY2F1c2Vk IGJ5Cj4gY29tbWl0IDUxNmE0OWNjMTk0NiAoImRybS9pOTE1OiBGaXggYXNzZXJ0X3BsYW5lKCkg d2FybmluZyBvbiBib290dXAgd2l0aAo+IGV4dGVybmFsIGRpc3BsYXkiKS4KPiAKPiBBbmQgYSB1 c2VyIGNvbW1lbnRpbmcgb24gZmRvIGJ1ZyAxMDgyMjUgaGFzIHJlcG9ydGVkIGEgZmxpY2tlciBj YXVzZWQgYnkKPiB0aGUgc2NyZWVuIGJyaWVmbHkgdHVybmluZyBibGFuayB3aGVuIGJvb3Rpbmcg d2l0aCBmYXN0Ym9vdD0xLCB3aGljaCBnb2VzCj4gYXdheSB3aGVuIHJldmVydGluZyB0aGlzIGNv bW1pdC4KPiAKPiBJIGJlbGlldmUgYSByZXZlcnQgb2YgdGhlIG9mZmVuZGluZyBjb21taXQgaXMg dGhlIGJlc3Qgc29sdXRpb24gYmVjYXVzZQo+IHRoZSBjb21taXQgaW50cm9kdWNlcyBhIGRybV9h dG9taWNfY29tbWl0KCkgY2FsbCBpbiB0aGUgZHJpdmVycycgcHJvYmUKPiBwYXRoLCBjYXVzaW5n IHdyaXRlcyB0byB0aGUgaGFyZHdhcmUgZHVyaW5nIHByb2JlLgo+IEkgYmVsaWV2ZSB0aGlzIGdv ZXMgYWdhaW5zIHRoZSBkZXNpZ24gb2YgdGhlIGRyaXZlciB3aGljaCBpcyB0byBvbmx5Cj4gcmVh ZC1iYWNrIHN0YXRlIG9uIHByb2JlIGFuZCBvbmx5IHdyaXRlIHRvIHRoZSBoYXJkd2FyZSBvbiB0 aGUgZmlyc3QKPiBjb21taXQgZnJvbSB0aGUgZmJjb24gb3IgdXNlcnNwYWNlLgo+IAo+IEluc3Rl YWQgdGhlIGFzc2VydF9wbGFuZSgpIHByb2JsZW0gdGhlIGNvbW1pdCB0cmllZCB0byBmaXggc2hv dWxkIGJlIGZpeGVkCj4gYnkgZml4aW5nIHRoZSBzdGF0ZSByZWFkLWJhY2sgY29kZS4KPiAKPiBS ZWxhdGVkOiBodHRwczovL2J1Z3MuZnJlZWRlc2t0b3Aub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDgy MjUKPiBDYzogQXpoYXIgU2hhaWtoIDxhemhhci5zaGFpa2hAaW50ZWwuY29tPgo+IENjOiBWaWxs ZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tPgo+IFNpZ25lZC1vZmYt Ynk6IEhhbnMgZGUgR29lZGUgPGhkZWdvZWRlQHJlZGhhdC5jb20+CgpGaXhlZCB3aXRoIGh0dHBz Oi8vcGF0Y2h3b3JrLmZyZWVkZXNrdG9wLm9yZy9zZXJpZXMvNTI3NTQvCgo+IC0tLQo+ICBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCA2MSArLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tCj4gIDEgZmlsZSBjaGFuZ2VkLCAyIGluc2VydGlvbnMoKyksIDU5IGRlbGV0aW9u cygtKQo+IAo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5 LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKPiBpbmRleCAyMTA3ZGU2 ZGE2OTIuLjAzZGVjMWMwNTY1MiAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kaXNwbGF5LmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5 LmMKPiBAQCAtMTUxOTMsNjEgKzE1MTkzLDEyIEBAIHN0YXRpYyB2b2lkIGludGVsX3VwZGF0ZV9m ZGlfcGxsX2ZyZXEoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQo+ICAJRFJNX0RF QlVHX0RSSVZFUigiRkRJIFBMTCBmcmVxPSVkXG4iLCBkZXZfcHJpdi0+ZmRpX3BsbF9mcmVxKTsK PiAgfQo+ICAKPiAtc3RhdGljIGludCBpbnRlbF9pbml0aWFsX2NvbW1pdChzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2KQo+IC17Cj4gLQlzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUgPSBOVUxM Owo+IC0Jc3RydWN0IGRybV9tb2Rlc2V0X2FjcXVpcmVfY3R4IGN0eDsKPiAtCXN0cnVjdCBkcm1f Y3J0YyAqY3J0YzsKPiAtCXN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZTsKPiAtCWlu dCByZXQgPSAwOwo+IC0KPiAtCXN0YXRlID0gZHJtX2F0b21pY19zdGF0ZV9hbGxvYyhkZXYpOwo+ IC0JaWYgKCFzdGF0ZSkKPiAtCQlyZXR1cm4gLUVOT01FTTsKPiAtCj4gLQlkcm1fbW9kZXNldF9h Y3F1aXJlX2luaXQoJmN0eCwgMCk7Cj4gLQo+IC1yZXRyeToKPiAtCXN0YXRlLT5hY3F1aXJlX2N0 eCA9ICZjdHg7Cj4gLQo+IC0JZHJtX2Zvcl9lYWNoX2NydGMoY3J0YywgZGV2KSB7Cj4gLQkJY3J0 Y19zdGF0ZSA9IGRybV9hdG9taWNfZ2V0X2NydGNfc3RhdGUoc3RhdGUsIGNydGMpOwo+IC0JCWlm IChJU19FUlIoY3J0Y19zdGF0ZSkpIHsKPiAtCQkJcmV0ID0gUFRSX0VSUihjcnRjX3N0YXRlKTsK PiAtCQkJZ290byBvdXQ7Cj4gLQkJfQo+IC0KPiAtCQlpZiAoY3J0Y19zdGF0ZS0+YWN0aXZlKSB7 Cj4gLQkJCXJldCA9IGRybV9hdG9taWNfYWRkX2FmZmVjdGVkX3BsYW5lcyhzdGF0ZSwgY3J0Yyk7 Cj4gLQkJCWlmIChyZXQpCj4gLQkJCQlnb3RvIG91dDsKPiAtCQl9Cj4gLQl9Cj4gLQo+IC0JcmV0 ID0gZHJtX2F0b21pY19jb21taXQoc3RhdGUpOwo+IC0KPiAtb3V0Ogo+IC0JaWYgKHJldCA9PSAt RURFQURMSykgewo+IC0JCWRybV9hdG9taWNfc3RhdGVfY2xlYXIoc3RhdGUpOwo+IC0JCWRybV9t b2Rlc2V0X2JhY2tvZmYoJmN0eCk7Cj4gLQkJZ290byByZXRyeTsKPiAtCX0KPiAtCj4gLQlkcm1f YXRvbWljX3N0YXRlX3B1dChzdGF0ZSk7Cj4gLQo+IC0JZHJtX21vZGVzZXRfZHJvcF9sb2Nrcygm Y3R4KTsKPiAtCWRybV9tb2Rlc2V0X2FjcXVpcmVfZmluaSgmY3R4KTsKPiAtCj4gLQlyZXR1cm4g cmV0Owo+IC19Cj4gLQo+ICBpbnQgaW50ZWxfbW9kZXNldF9pbml0KHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYpCj4gIHsKPiAgCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5 MTUoZGV2KTsKPiAgCXN0cnVjdCBpOTE1X2dndHQgKmdndHQgPSAmZGV2X3ByaXYtPmdndHQ7Cj4g IAllbnVtIHBpcGUgcGlwZTsKPiAgCXN0cnVjdCBpbnRlbF9jcnRjICpjcnRjOwo+IC0JaW50IHJl dDsKPiAgCj4gIAlkZXZfcHJpdi0+bW9kZXNldF93cSA9IGFsbG9jX29yZGVyZWRfd29ya3F1ZXVl KCJpOTE1X21vZGVzZXQiLCAwKTsKPiAgCj4gQEAgLTE1MzE5LDYgKzE1MjcwLDggQEAgaW50IGlu dGVsX21vZGVzZXRfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQo+ICAJCSAgICAgIElOVEVM X0lORk8oZGV2X3ByaXYpLT5udW1fcGlwZXMgPiAxID8gInMiIDogIiIpOwo+ICAKPiAgCWZvcl9l YWNoX3BpcGUoZGV2X3ByaXYsIHBpcGUpIHsKPiArCQlpbnQgcmV0Owo+ICsKPiAgCQlyZXQgPSBp bnRlbF9jcnRjX2luaXQoZGV2X3ByaXYsIHBpcGUpOwo+ICAJCWlmIChyZXQpIHsKPiAgCQkJZHJt X21vZGVfY29uZmlnX2NsZWFudXAoZGV2KTsKPiBAQCAtMTUzNzQsMTYgKzE1MzI3LDYgQEAgaW50 IGludGVsX21vZGVzZXRfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQo+ICAJaWYgKCFIQVNf R01DSF9ESVNQTEFZKGRldl9wcml2KSkKPiAgCQlzYW5pdGl6ZV93YXRlcm1hcmtzKGRldik7Cj4g IAo+IC0JLyoKPiAtCSAqIEZvcmNlIGFsbCBhY3RpdmUgcGxhbmVzIHRvIHJlY29tcHV0ZSB0aGVp ciBzdGF0ZXMuIFNvIHRoYXQgb24KPiAtCSAqIG1vZGVfc2V0Y3J0YyBhZnRlciBwcm9iZSwgYWxs IHRoZSBpbnRlbF9wbGFuZV9zdGF0ZSB2YXJpYWJsZXMKPiAtCSAqIGFyZSBhbHJlYWR5IGNhbGN1 bGF0ZWQgYW5kIHRoZXJlIGlzIG5vIGFzc2VydF9wbGFuZSB3YXJuaW5ncwo+IC0JICogZHVyaW5n IGJvb3R1cC4KPiAtCSAqLwo+IC0JcmV0ID0gaW50ZWxfaW5pdGlhbF9jb21taXQoZGV2KTsKPiAt CWlmIChyZXQpCj4gLQkJRFJNX0RFQlVHX0tNUygiSW5pdGlhbCBjb21taXQgaW4gcHJvYmUgZmFp bGVkLlxuIik7Cj4gLQo+ICAJcmV0dXJuIDA7Cj4gIH0KPiAgCj4gLS0gCj4gMi4xOS4xCgotLSAK VmlsbGUgU3lyasOkbMOkCkludGVsCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVk ZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZv L2ludGVsLWdmeAo=