From: Azhar Shaikh Subject: [PATCH v2] drm/i915: Fix assert_plane() warning on bootup with external display Date: Mon, 25 Jun 2018 17:33:05 -0700 Message-ID: <1529973185-18846-1-git-send-email-azhar.shaikh@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id B9DCE6E2CF for ; Tue, 26 Jun 2018 00:33:05 +0000 (UTC) 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 List-Id: intel-gfx@lists.freedesktop.org T24gS0JMLCBXSEwgUlZQcywgYm9vdGluZyB1cCB3aXRoIGFuIGV4dGVybmFsIGRpc3BsYXkgY29u bmVjdGVkLCB0cmlnZ2VycwpiZWxvdyB3YXJuaW5nLCB3aGVuIHRoZSBCaU9TIGJyaW5ncyB1cCB0 aGUgZXh0ZXJuYWwgZGlzcGxheSB0b28uClRoaXMgd2FybmluZyBpcyBub3Qgc2VlbiBkdXJpbmcg aG90cGx1Zy4KClsgICAgMy42MTUyMjZdIC0tLS0tLS0tLS0tLVsgY3V0IGhlcmUgXS0tLS0tLS0t LS0tLQpbICAgIDMuNjE5ODI5XSBwbGFuZSAxQSBhc3NlcnRpb24gZmFpbHVyZSAoZXhwZWN0ZWQg b24sIGN1cnJlbnQgb2ZmKQpbICAgIDMuNjMyMDM5XSBXQVJOSU5HOiBDUFU6IDIgUElEOiAzNTQg YXQgZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jOjEyOTQgYXNzZXJ0X3BsYW5l KzB4NzEvMHhiYgpbICAgIDMuNjMzOTIwXSBpd2x3aWZpIDAwMDA6MDA6MTQuMzogbG9hZGVkIGZp cm13YXJlIHZlcnNpb24gMzguYzBlMDNkOTQuMCBvcF9tb2RlIGl3bG12bQpbICAgIDMuNjQ3MTU3 XSBNb2R1bGVzIGxpbmtlZCBpbjogaXdsd2lmaSBjZmc4MDIxMSBidHVzYiBidHJ0bCBidGJjbSBi dGludGVsIGJsdWV0b290aCBlY2RoX2dlbmVyaWMKWyAgICAzLjY0NzE2M10gQ1BVOiAyIFBJRDog MzU0IENvbW06IGZyZWNvbiBOb3QgdGFpbnRlZCA0LjE3LjAtcmM3LTUwMTc2LWc2NTVhZjEyZDM5 YzIgIzMKWyAgICAzLjY0NzE2NV0gSGFyZHdhcmUgbmFtZTogSW50ZWwgQ29ycG9yYXRpb24gQ29m ZmVlTGFrZSBDbGllbnQgUGxhdGZvcm0vV2hpc2tleUxha2UgVSBERFI0IEVSQiwgQklPUyBDTkxT RldSMS5SMDAuWDE0MC5CMDAuMTgwNDA0MDMwNCAwNC8wNC8yMDE4ClsgICAgMy42ODQ1MDldIFJJ UDogMDAxMDphc3NlcnRfcGxhbmUrMHg3MS8weGJiClsgICAgMy43NjQ0NTFdIENhbGwgVHJhY2U6 ClsgICAgMy43NjY4ODhdICBpbnRlbF9hdG9taWNfY29tbWl0X3RhaWwrMHhhOTcvMHhiNzcKWyAg ICAzLjc3MTU2OV0gIGludGVsX2F0b21pY19jb21taXQrMHgyNmEvMHgyNzkKWyAgICAzLjc3MTU3 Ml0gIGRybV9hdG9taWNfaGVscGVyX3NldF9jb25maWcrMHg1Yy8weDc2ClsgICAgMy43ODA2NzBd ICBfX2RybV9tb2RlX3NldF9jb25maWdfaW50ZXJuYWwrMHg2Ni8weDEwOQpbICAgIDMuNzgwNjcy XSAgZHJtX21vZGVfc2V0Y3J0YysweDRjOS8weDVjYwpbICAgIDMuNzgwNjc0XSAgPyBkcm1fbW9k ZV9nZXRjcnRjKzB4MTYyLzB4MTYyClsgICAgMy43ODk3NzRdICA/IGRybV9tb2RlX2dldGNydGMr MHgxNjIvMHgxNjIKWyAgICAzLjc5ODEwOF0gIGRybV9pb2N0bF9rZXJuZWwrMHg4ZC8weGU0Clsg ICAgMy44MDE5MjZdICBkcm1faW9jdGwrMHgyN2QvMHgzNjgKWyAgICAzLjgwNTMxMV0gID8gZHJt X21vZGVfZ2V0Y3J0YysweDE2Mi8weDE2MgpbICAgIDMuODA1MzE0XSAgPyBzZWxpbnV4X2ZpbGVf aW9jdGwrMHgxNGUvMHgxOTkKWyAgICAzLjgwNTMxN10gIHZmc19pb2N0bCsweDIxLzB4MmYKWyAg ICAzLjgxMzgxMl0gIGRvX3Zmc19pb2N0bCsweDQ5MS8weDRiNApbICAgIDMuODEzODEzXSAgPyBz ZWN1cml0eV9maWxlX2lvY3RsKzB4MzcvMHg0YgpbICAgIDMuODEzODE2XSAga3N5c19pb2N0bCsw eDU1LzB4NzUKWyAgICAzLjgyMDY3Ml0gIF9feDY0X3N5c19pb2N0bCsweDFhLzB4MWUKWyAgICAz LjgyMDY3NF0gIGRvX3N5c2NhbGxfNjQrMHg1MS8weDVmClsgICAgMy44MjA2NzhdICBlbnRyeV9T WVNDQUxMXzY0X2FmdGVyX2h3ZnJhbWUrMHg0NC8weGE5ClsgICAgMy44MjgyMjFdIFJJUDogMDAz MzoweDdiNWUwNDk1Mzk2NwpbICAgIDMuODM1NTA0XSBSU1A6IDAwMmI6MDAwMDdmZmYyZWFmYjZm OCBFRkxBR1M6IDAwMDAwMjQ2IE9SSUdfUkFYOiAwMDAwMDAwMDAwMDAwMDEwClsgICAgMy44MzU1 MDVdIFJBWDogZmZmZmZmZmZmZmZmZmZkYSBSQlg6IDAwMDAwMDAwMDAwMDAwMDIgUkNYOiAwMDAw N2I1ZTA0OTUzOTY3ClsgICAgMy44MzU1MDVdIFJEWDogMDAwMDdmZmYyZWFmYjczMCBSU0k6IDAw MDAwMDAwYzA2ODY0YTIgUkRJOiAwMDAwMDAwMDAwMDAwMDBmClsgICAgMy44MzU1MDZdIFJCUDog MDAwMDdmZmYyZWFmYjcyMCBSMDg6IDAwMDAwMDAwMDAwMDAwMDAgUjA5OiAwMDAwMDAwMDAwMDAw MDAwClsgICAgMy44MzU1MDddIFIxMDogMDAwMDAwMDAwMDAwMDA3MCBSMTE6IDAwMDAwMDAwMDAw MDAyNDYgUjEyOiAwMDAwMDAwMDAwMDAwMDBmClsgICAgMy44Nzk5ODhdIFIxMzogMDAwMDU2YmM5 ZGQ3ZDIxMCBSMTQ6IDAwMDA3ZmZmMmVhZmI3MzAgUjE1OiAwMDAwMDAwMGMwNjg2NGEyClsgICAg My44ODcwODFdIENvZGU6IDQ4IGM3IGM3IDA2IDcxIGE1IGJlIDg0IGMwIDQ4IGM3IGMyIDA2IGZk IGEzIGJlIDQ4IDg5IGY5IDQ4IDBmIDQ0IGNhIDg0IGRiIDQ4IDBmIDQ1IGQ3IDQ4IGM3IGM3IGRm IGQzIGE0IGJlIDMxIGMwIGU4IGFmIGEwIGMwIGZmIDwwZj4gMGIgZWIgMmIgNDggYzcgYzcgMDYg ZmQgYTMgYmUgODQgYzAgNDggYzcgYzIgMDYgNzEgYTUgYmUgNDgKWyAgICAzLjkwNTg0NV0gV0FS TklORzogQ1BVOiAyIFBJRDogMzU0IGF0IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3Bs YXkuYzoxMjk0IGFzc2VydF9wbGFuZSsweDcxLzB4YmIKWyAgICAzLjkyMDk2NF0gLS0tWyBlbmQg dHJhY2UgZGFjNjkyZjRhYzQ2MzkxYSBdLS0tCgpUaGUgd2FybmluZyBpcyBzZWVuIHdoZW4gbW9k ZV9zZXRjcnRjKCkgaXMgY2FsbGVkIGZvciBwaXBlQgpkdXJpbmcgYm9vdHVwIGFuZCBiZWZvcmUg d2UgZ2V0IGEgbW9kZV9zZXRjcnRjKCkgZm9yIHBpcGVBLAp3aGlsZSBkb2luZyB1cGRhdGVfY3J0 Y3MoKSBpbiBpbnRlbF9hdG9taWNfY29tbWl0X3RhaWwoKS4KTm93IHNpbmNlLCBwbGFuZTFBIGlz IHN0aWxsIGFjdGl2ZSBhZnRlciBjb21taXQsIHVwZGF0ZV9jcnRjcygpCmlzIGRvbmUgZm9yIHBp cGVBIGFuZCBldmVudHVhbGx5IHVwZGF0ZV9wbGFuZSgpIGZvciBwbGFuZTFBLgoKaW50ZWxfcGxh bmVfc3RhdGUtPmN0bCBmb3IgcGxhbmUxQSBpcyBub3QgdXBkYXRlZCBzaW5jZSBzZXRfbW9kZWNy dGMoKSBpcwpjYWxsZWQgZm9yIHBpcGVCLiBTbyBpbnRlbF9wbGFuZV9zdGF0ZS0+Y3RsIGZvciBw bGFuZSAxQSB3aWxsIGJlIDB4MC4KU28gZG9pbmcgYW4gdXBkYXRlX3BsYW5lKCkgZm9yIHBsYW5l MUEsIHdpbGwgcmVzdWx0IGluIGNsZWFyaW5nClBMQU5FX0NUTF9FTkFCTEUgYml0LCBhbmQgaGVu Y2UgdGhlIHdhcm5pbmcuCgpUbyBmaXggdGhpcyB3YXJuaW5nLCBmb3JjZSBhbGwgYWN0aXZlIHBs YW5lcyB0byByZWNvbXB1dGUgdGhlaXIgc3RhdGVzCmluIHByb2JlLgoKU2lnbmVkLW9mZi1ieTog QXpoYXIgU2hhaWtoIDxhemhhci5zaGFpa2hAaW50ZWwuY29tPgotLS0KQ2hhbmdlcyBpbiB2MjoK LSBGb3JjZSBhbGwgcGxhbmVzIHRvIHJlY29tcHV0ZSB0aGVpciBzdGF0ZXMuKFZpbGxlIFN5cmrD pGzDpCkKLSBVcGRhdGUgdGhlIGNvbW1pdCBtZXNzYWdlCgogZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZGlzcGxheS5jIHwgNDkgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr CiAxIGZpbGUgY2hhbmdlZCwgNDkgaW5zZXJ0aW9ucygrKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2Rpc3BsYXkuYwppbmRleCAzNzA5ZmExYjYzMTguLjE1MTFkNTg5OTFjYyAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtMTUwOTIsNiArMTUwOTIsNTEgQEAgc3RhdGljIHZv aWQgaW50ZWxfdXBkYXRlX2ZkaV9wbGxfZnJlcShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYpCiAJRFJNX0RFQlVHX0RSSVZFUigiRkRJIFBMTCBmcmVxPSVkXG4iLCBkZXZfcHJpdi0+ ZmRpX3BsbF9mcmVxKTsKIH0KIAorc3RhdGljIHZvaWQgaW50ZWxfaW5pdGlhbF9jb21taXQoc3Ry dWN0IGRybV9kZXZpY2UgKmRldiwKKwkJCQkgc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMp Cit7CisJc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlID0gTlVMTDsKKwlzdHJ1Y3QgZHJt X2NydGMgKmNydGMgPSAmaW50ZWxfY3J0Yy0+YmFzZTsKKwlzdHJ1Y3QgZHJtX21vZGVzZXRfYWNx dWlyZV9jdHggY3R4OworCXN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZTsKKwlpbnQg cmV0OworCisJZHJtX21vZGVzZXRfYWNxdWlyZV9pbml0KCZjdHgsIDApOworCisJc3RhdGUgPSBk cm1fYXRvbWljX3N0YXRlX2FsbG9jKGRldik7CisJaWYgKCFzdGF0ZSkKKwkJZ290byB1bmxvY2s7 CisKKwlzdGF0ZS0+YWNxdWlyZV9jdHggPSAmY3R4OworCisJY3J0Y19zdGF0ZSA9IGRybV9hdG9t aWNfZ2V0X2NydGNfc3RhdGUoc3RhdGUsIGNydGMpOworCWlmIChJU19FUlIoY3J0Y19zdGF0ZSkp CisJCWdvdG8gb3V0OworCisJaWYgKCFjcnRjX3N0YXRlLT5hY3RpdmUpCisJCWdvdG8gb3V0Owor CisJcmV0ID0gZHJtX2F0b21pY19hZGRfYWZmZWN0ZWRfcGxhbmVzKHN0YXRlLCBjcnRjKTsKKwlp ZiAocmV0KQorCQlnb3RvIG91dDsKKworCXJldCA9IGRybV9hdG9taWNfY29tbWl0KHN0YXRlKTsK KwlpZiAocmV0ID09IC1FREVBRExLKSB7CisJCWRybV9hdG9taWNfc3RhdGVfY2xlYXIoc3RhdGUp OworCQlkcm1fbW9kZXNldF9iYWNrb2ZmKCZjdHgpOworCX0KKworb3V0OgorCWlmIChzdGF0ZSkg eworCQlkcm1fYXRvbWljX3N0YXRlX3B1dChzdGF0ZSk7CisJCXN0YXRlID0gTlVMTDsKKwl9CisK K3VubG9jazoKKwlkcm1fbW9kZXNldF9kcm9wX2xvY2tzKCZjdHgpOworCWRybV9tb2Rlc2V0X2Fj cXVpcmVfZmluaSgmY3R4KTsKK30KKwogaW50IGludGVsX21vZGVzZXRfaW5pdChzdHJ1Y3QgZHJt X2RldmljZSAqZGV2KQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRv X2k5MTUoZGV2KTsKQEAgLTE1MjIxLDYgKzE1MjY2LDEwIEBAIGludCBpbnRlbF9tb2Rlc2V0X2lu aXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJaW50ZWxfZmluZF9pbml0aWFsX3BsYW5lX29i aihjcnRjLCAmcGxhbmVfY29uZmlnKTsKIAl9CiAKKwkvKiBGb3JjZSBhbGwgYWN0aXZlIHBsYW5l cyB0byByZWNvbXB1dGUgdGhlaXIgc3RhdGVzICovCisJZm9yX2VhY2hfaW50ZWxfY3J0YyhkZXYs IGNydGMpCisJCWludGVsX2luaXRpYWxfY29tbWl0KGRldiwgY3J0Yyk7CisKIAkvKgogCSAqIE1h a2Ugc3VyZSBoYXJkd2FyZSB3YXRlcm1hcmtzIHJlYWxseSBtYXRjaCB0aGUgc3RhdGUgd2UgcmVh ZCBvdXQuCiAJICogTm90ZSB0aGF0IHdlIG5lZWQgdG8gZG8gdGhpcyBhZnRlciByZWNvbnN0cnVj dGluZyB0aGUgQklPUyBmYidzCi0tIAoxLjkuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlz dHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4v bGlzdGluZm8vaW50ZWwtZ2Z4Cg==