From mboxrd@z Thu Jan 1 00:00:00 1970 From: Azhar Shaikh Subject: [PATCH v8] drm/i915: Fix assert_plane() warning on bootup with external display Date: Fri, 6 Jul 2018 11:37:30 -0700 Message-ID: <1530902250-44583-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 mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id D0AB56F10A for ; Fri, 6 Jul 2018 18:37:30 +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 YW5lcyB0byByZWNvbXB1dGUgdGhlaXIgc3RhdGVzCmluIHByb2JlLgoKQ2hhbmdlcyBpbiB2ODoK LSBBY3R1YWxseSBhZGQgUmV2aWV3ZWQtYnk6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFs YUBsaW51eC5pbnRlbC5jb20+CgpDaGFuZ2VzIGluIHY3OgotIE1vdmUgY2FsbCB0byBpbnRlbF9p bml0aWFsX2NvbW1pdCgpIGFmdGVyIHNhbml0aXplX3dhdGVybWFya3MoKQogIE90aGVyd2lzZSB0 aGUgcGxhbmUgdXBkYXRlIHdpbGwgc3RpbGwgY29uc3VsdCBwb3RlbnRpYWxseSBib2d1cwogIHdh dGVybWFya3Mgd2UgcmVhZCBvdXQgZnJvbSB0aGUgaGFyZHdhcmUuIChWaWxsZSkKLSBDYXJyeSBS ZXZpZXdlZC1ieTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNv bT4KICBmcm9tIHY2CgpDaGFuZ2VzIGluIHY2OgotIEhhbmRsZSBFREVBRExLIGZvciBkcm1fYXRv bWljX2dldF9jcnRjX3N0YXRlKCkgYW5kCiAgZHJtX2F0b21pY19hZGRfYWZmZWN0ZWRfcGxhbmVz KCkKLSBSZW1vdmUgb3B0aW1pemF0aW9uIG9mIGNhbGxpbmcgaW50ZWxfaW5pdGlhbF9jb21taXQo KQogIG9ubHkgd2hlbiB0aGVyZSBpcyBtb3JlIHRoYW4gb25lIGFjdGl2ZSBwaXBlIGluIHByb2Jl LgotIEF2b2lkIHVzaW5nIGludGVsXyB0eXBlcy4KCkNoYW5nZXMgaW4gdjU6Ci0gRHJvcCBkcm1f bW9kZXNldF9sb2NrX2FsbF9jdHgoKSBzaW5jZSBsb2NrcyB3aWxsIGJlIHRha2VuIGxhdGVyLgoK Q2hhbmdlcyBpbiB2NDoKLSBIYW5kbGUgbG9ja2luZyBpbiBpbnRlbF9pbml0aWFsX2NvbW1pdCgp Ci0gTW92ZSB0aGUgZm9yIGxvb3AgaW5zaWRlIGludGVsX2luaXRpYWxfY29tbWl0KCkgc28gdGhh dAogIGRybV9hdG9taWNfY29tbWl0KCkgaXMgY2FsbGVkIG9ubHkgb25jZQotIENhbGwgaW50ZWxf aW5pdGlhbF9jb21taXQoKSBvbmx5IGZvciBtb3JlIHRoYW4gb25lIGFjdGl2ZSBjcnRjIG9uIGJv b3QuCi0gU2F2ZSB0aGUgcmV0dXJuIHZhbHVlIG9mIGludGVsX2luaXRpYWxfY29tbWl0KCkgYW5k IHByaW50IGEgbWVzc2FnZSBpbgogIGNhc2Ugb2YgYW4gZXJyb3IKCkNoYW5nZXMgaW4gdjM6Ci0g QWRkIGNvbW1lbnRzCgpDaGFuZ2VzIGluIHYyOgotIEZvcmNlIGFsbCBwbGFuZXMgdG8gcmVjb21w dXRlIHRoZWlyIHN0YXRlcy4oVmlsbGUgU3lyasOkbMOkKQotIFVwZGF0ZSB0aGUgY29tbWl0IG1l c3NhZ2UKClNpZ25lZC1vZmYtYnk6IEF6aGFyIFNoYWlraCA8YXpoYXIuc2hhaWtoQGludGVsLmNv bT4KUmV2aWV3ZWQtYnk6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRl bC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgNjEgKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tCiAxIGZpbGUgY2hhbmdlZCwgNTkgaW5z ZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5 LmMKaW5kZXggNTY4MThhNDUxODFjLi4xYTM4NTBkZjdlZDMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kaXNwbGF5LmMKQEAgLTE1MDkyLDEyICsxNTA5Miw2MSBAQCBzdGF0aWMgdm9pZCBpbnRl bF91cGRhdGVfZmRpX3BsbF9mcmVxKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikK IAlEUk1fREVCVUdfRFJJVkVSKCJGREkgUExMIGZyZXE9JWRcbiIsIGRldl9wcml2LT5mZGlfcGxs X2ZyZXEpOwogfQogCitzdGF0aWMgaW50IGludGVsX2luaXRpYWxfY29tbWl0KHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYpCit7CisJc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlID0gTlVMTDsK KwlzdHJ1Y3QgZHJtX21vZGVzZXRfYWNxdWlyZV9jdHggY3R4OworCXN0cnVjdCBkcm1fY3J0YyAq Y3J0YzsKKwlzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNydGNfc3RhdGU7CisJaW50IHJldCA9IDA7 CisKKwlzdGF0ZSA9IGRybV9hdG9taWNfc3RhdGVfYWxsb2MoZGV2KTsKKwlpZiAoIXN0YXRlKQor CQlyZXR1cm4gLUVOT01FTTsKKworCWRybV9tb2Rlc2V0X2FjcXVpcmVfaW5pdCgmY3R4LCAwKTsK KworcmV0cnk6CisJc3RhdGUtPmFjcXVpcmVfY3R4ID0gJmN0eDsKKworCWRybV9mb3JfZWFjaF9j cnRjKGNydGMsIGRldikgeworCQljcnRjX3N0YXRlID0gZHJtX2F0b21pY19nZXRfY3J0Y19zdGF0 ZShzdGF0ZSwgY3J0Yyk7CisJCWlmIChJU19FUlIoY3J0Y19zdGF0ZSkpIHsKKwkJCXJldCA9IFBU Ul9FUlIoY3J0Y19zdGF0ZSk7CisJCQlnb3RvIG91dDsKKwkJfQorCisJCWlmIChjcnRjX3N0YXRl LT5hY3RpdmUpIHsKKwkJCXJldCA9IGRybV9hdG9taWNfYWRkX2FmZmVjdGVkX3BsYW5lcyhzdGF0 ZSwgY3J0Yyk7CisJCQlpZiAocmV0KQorCQkJCWdvdG8gb3V0OworCQl9CisJfQorCisJcmV0ID0g ZHJtX2F0b21pY19jb21taXQoc3RhdGUpOworCitvdXQ6CisJaWYgKHJldCA9PSAtRURFQURMSykg eworCQlkcm1fYXRvbWljX3N0YXRlX2NsZWFyKHN0YXRlKTsKKwkJZHJtX21vZGVzZXRfYmFja29m ZigmY3R4KTsKKwkJZ290byByZXRyeTsKKwl9CisKKwlkcm1fYXRvbWljX3N0YXRlX3B1dChzdGF0 ZSk7CisKKwlkcm1fbW9kZXNldF9kcm9wX2xvY2tzKCZjdHgpOworCWRybV9tb2Rlc2V0X2FjcXVp cmVfZmluaSgmY3R4KTsKKworCXJldHVybiByZXQ7Cit9CisKIGludCBpbnRlbF9tb2Rlc2V0X2lu aXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CiAJc3RydWN0IGk5MTVfZ2d0dCAqZ2d0dCA9ICZkZXZf cHJpdi0+Z2d0dDsKIAllbnVtIHBpcGUgcGlwZTsKIAlzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YzsK KwlpbnQgcmV0OwogCiAJZGV2X3ByaXYtPm1vZGVzZXRfd3EgPSBhbGxvY19vcmRlcmVkX3dvcmtx dWV1ZSgiaTkxNV9tb2Rlc2V0IiwgMCk7CiAKQEAgLTE1MTcyLDggKzE1MjIxLDYgQEAgaW50IGlu dGVsX21vZGVzZXRfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQkgICAgICBJTlRFTF9J TkZPKGRldl9wcml2KS0+bnVtX3BpcGVzID4gMSA/ICJzIiA6ICIiKTsKIAogCWZvcl9lYWNoX3Bp cGUoZGV2X3ByaXYsIHBpcGUpIHsKLQkJaW50IHJldDsKLQogCQlyZXQgPSBpbnRlbF9jcnRjX2lu aXQoZGV2X3ByaXYsIHBpcGUpOwogCQlpZiAocmV0KSB7CiAJCQlkcm1fbW9kZV9jb25maWdfY2xl YW51cChkZXYpOwpAQCAtMTUyMjksNiArMTUyNzYsMTYgQEAgaW50IGludGVsX21vZGVzZXRfaW5p dChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCWlmICghSEFTX0dNQ0hfRElTUExBWShkZXZfcHJp dikpCiAJCXNhbml0aXplX3dhdGVybWFya3MoZGV2KTsKIAorCS8qCisJICogRm9yY2UgYWxsIGFj dGl2ZSBwbGFuZXMgdG8gcmVjb21wdXRlIHRoZWlyIHN0YXRlcy4gU28gdGhhdCBvbgorCSAqIG1v ZGVfc2V0Y3J0YyBhZnRlciBwcm9iZSwgYWxsIHRoZSBpbnRlbF9wbGFuZV9zdGF0ZSB2YXJpYWJs ZXMKKwkgKiBhcmUgYWxyZWFkeSBjYWxjdWxhdGVkIGFuZCB0aGVyZSBpcyBubyBhc3NlcnRfcGxh bmUgd2FybmluZ3MKKwkgKiBkdXJpbmcgYm9vdHVwLgorCSAqLworCXJldCA9IGludGVsX2luaXRp YWxfY29tbWl0KGRldik7CisJaWYgKHJldCkKKwkJRFJNX0RFQlVHX0tNUygiSW5pdGlhbCBjb21t aXQgaW4gcHJvYmUgZmFpbGVkLlxuIik7CisKIAlyZXR1cm4gMDsKIH0KIAotLSAKMS45LjEKCl9f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBt YWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3Rz LmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=