From mboxrd@z Thu Jan 1 00:00:00 1970 From: Azhar Shaikh Subject: [PATCH v7] drm/i915: Fix assert_plane() warning on bootup with external display Date: Fri, 6 Jul 2018 11:28:14 -0700 Message-ID: <1530901694-44529-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 mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6A5896F105 for ; Fri, 6 Jul 2018 18:28:18 +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 YW5lcyB0byByZWNvbXB1dGUgdGhlaXIgc3RhdGVzCmluIHByb2JlLgoKQ2hhbmdlcyBpbiB2NzoK LSBNb3ZlIGNhbGwgdG8gaW50ZWxfaW5pdGlhbF9jb21taXQoKSBhZnRlciBzYW5pdGl6ZV93YXRl cm1hcmtzKCkKICBPdGhlcndpc2UgdGhlIHBsYW5lIHVwZGF0ZSB3aWxsIHN0aWxsIGNvbnN1bHQg cG90ZW50aWFsbHkgYm9ndXMKICB3YXRlcm1hcmtzIHdlIHJlYWQgb3V0IGZyb20gdGhlIGhhcmR3 YXJlLiAoVmlsbGUpCi0gQ2FycnkgUmV2aWV3ZWQtYnk6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUu c3lyamFsYUBsaW51eC5pbnRlbC5jb20+CiAgZnJvbSB2NgoKQ2hhbmdlcyBpbiB2NjoKLSBIYW5k bGUgRURFQURMSyBmb3IgZHJtX2F0b21pY19nZXRfY3J0Y19zdGF0ZSgpIGFuZAogIGRybV9hdG9t aWNfYWRkX2FmZmVjdGVkX3BsYW5lcygpCi0gUmVtb3ZlIG9wdGltaXphdGlvbiBvZiBjYWxsaW5n IGludGVsX2luaXRpYWxfY29tbWl0KCkKICBvbmx5IHdoZW4gdGhlcmUgaXMgbW9yZSB0aGFuIG9u ZSBhY3RpdmUgcGlwZSBpbiBwcm9iZS4KLSBBdm9pZCB1c2luZyBpbnRlbF8gdHlwZXMuCgpDaGFu Z2VzIGluIHY1OgotIERyb3AgZHJtX21vZGVzZXRfbG9ja19hbGxfY3R4KCkgc2luY2UgbG9ja3Mg d2lsbCBiZSB0YWtlbiBsYXRlci4KCkNoYW5nZXMgaW4gdjQ6Ci0gSGFuZGxlIGxvY2tpbmcgaW4g aW50ZWxfaW5pdGlhbF9jb21taXQoKQotIE1vdmUgdGhlIGZvciBsb29wIGluc2lkZSBpbnRlbF9p bml0aWFsX2NvbW1pdCgpIHNvIHRoYXQKICBkcm1fYXRvbWljX2NvbW1pdCgpIGlzIGNhbGxlZCBv bmx5IG9uY2UKLSBDYWxsIGludGVsX2luaXRpYWxfY29tbWl0KCkgb25seSBmb3IgbW9yZSB0aGFu IG9uZSBhY3RpdmUgY3J0YyBvbiBib290LgotIFNhdmUgdGhlIHJldHVybiB2YWx1ZSBvZiBpbnRl bF9pbml0aWFsX2NvbW1pdCgpIGFuZCBwcmludCBhIG1lc3NhZ2UgaW4KICBjYXNlIG9mIGFuIGVy cm9yCgpDaGFuZ2VzIGluIHYzOgotIEFkZCBjb21tZW50cwoKQ2hhbmdlcyBpbiB2MjoKLSBGb3Jj ZSBhbGwgcGxhbmVzIHRvIHJlY29tcHV0ZSB0aGVpciBzdGF0ZXMuKFZpbGxlIFN5cmrDpGzDpCkK LSBVcGRhdGUgdGhlIGNvbW1pdCBtZXNzYWdlCgpTaWduZWQtb2ZmLWJ5OiBBemhhciBTaGFpa2gg PGF6aGFyLnNoYWlraEBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZGlzcGxheS5jIHwgNjEgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tCiAxIGZp bGUgY2hhbmdlZCwgNTkgaW5zZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggNTY4MThhNDUxODFjLi4xYTM4NTBkZjdlZDMgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTE1MDkyLDEyICsxNTA5Miw2MSBA QCBzdGF0aWMgdm9pZCBpbnRlbF91cGRhdGVfZmRpX3BsbF9mcmVxKHN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdikKIAlEUk1fREVCVUdfRFJJVkVSKCJGREkgUExMIGZyZXE9JWRcbiIs IGRldl9wcml2LT5mZGlfcGxsX2ZyZXEpOwogfQogCitzdGF0aWMgaW50IGludGVsX2luaXRpYWxf Y29tbWl0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCit7CisJc3RydWN0IGRybV9hdG9taWNfc3Rh dGUgKnN0YXRlID0gTlVMTDsKKwlzdHJ1Y3QgZHJtX21vZGVzZXRfYWNxdWlyZV9jdHggY3R4Owor CXN0cnVjdCBkcm1fY3J0YyAqY3J0YzsKKwlzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNydGNfc3Rh dGU7CisJaW50IHJldCA9IDA7CisKKwlzdGF0ZSA9IGRybV9hdG9taWNfc3RhdGVfYWxsb2MoZGV2 KTsKKwlpZiAoIXN0YXRlKQorCQlyZXR1cm4gLUVOT01FTTsKKworCWRybV9tb2Rlc2V0X2FjcXVp cmVfaW5pdCgmY3R4LCAwKTsKKworcmV0cnk6CisJc3RhdGUtPmFjcXVpcmVfY3R4ID0gJmN0eDsK KworCWRybV9mb3JfZWFjaF9jcnRjKGNydGMsIGRldikgeworCQljcnRjX3N0YXRlID0gZHJtX2F0 b21pY19nZXRfY3J0Y19zdGF0ZShzdGF0ZSwgY3J0Yyk7CisJCWlmIChJU19FUlIoY3J0Y19zdGF0 ZSkpIHsKKwkJCXJldCA9IFBUUl9FUlIoY3J0Y19zdGF0ZSk7CisJCQlnb3RvIG91dDsKKwkJfQor CisJCWlmIChjcnRjX3N0YXRlLT5hY3RpdmUpIHsKKwkJCXJldCA9IGRybV9hdG9taWNfYWRkX2Fm ZmVjdGVkX3BsYW5lcyhzdGF0ZSwgY3J0Yyk7CisJCQlpZiAocmV0KQorCQkJCWdvdG8gb3V0Owor CQl9CisJfQorCisJcmV0ID0gZHJtX2F0b21pY19jb21taXQoc3RhdGUpOworCitvdXQ6CisJaWYg KHJldCA9PSAtRURFQURMSykgeworCQlkcm1fYXRvbWljX3N0YXRlX2NsZWFyKHN0YXRlKTsKKwkJ ZHJtX21vZGVzZXRfYmFja29mZigmY3R4KTsKKwkJZ290byByZXRyeTsKKwl9CisKKwlkcm1fYXRv bWljX3N0YXRlX3B1dChzdGF0ZSk7CisKKwlkcm1fbW9kZXNldF9kcm9wX2xvY2tzKCZjdHgpOwor CWRybV9tb2Rlc2V0X2FjcXVpcmVfZmluaSgmY3R4KTsKKworCXJldHVybiByZXQ7Cit9CisKIGlu dCBpbnRlbF9tb2Rlc2V0X2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIHsKIAlzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CiAJc3RydWN0IGk5MTVf Z2d0dCAqZ2d0dCA9ICZkZXZfcHJpdi0+Z2d0dDsKIAllbnVtIHBpcGUgcGlwZTsKIAlzdHJ1Y3Qg aW50ZWxfY3J0YyAqY3J0YzsKKwlpbnQgcmV0OwogCiAJZGV2X3ByaXYtPm1vZGVzZXRfd3EgPSBh bGxvY19vcmRlcmVkX3dvcmtxdWV1ZSgiaTkxNV9tb2Rlc2V0IiwgMCk7CiAKQEAgLTE1MTcyLDgg KzE1MjIxLDYgQEAgaW50IGludGVsX21vZGVzZXRfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 KQogCQkgICAgICBJTlRFTF9JTkZPKGRldl9wcml2KS0+bnVtX3BpcGVzID4gMSA/ICJzIiA6ICIi KTsKIAogCWZvcl9lYWNoX3BpcGUoZGV2X3ByaXYsIHBpcGUpIHsKLQkJaW50IHJldDsKLQogCQly ZXQgPSBpbnRlbF9jcnRjX2luaXQoZGV2X3ByaXYsIHBpcGUpOwogCQlpZiAocmV0KSB7CiAJCQlk cm1fbW9kZV9jb25maWdfY2xlYW51cChkZXYpOwpAQCAtMTUyMjksNiArMTUyNzYsMTYgQEAgaW50 IGludGVsX21vZGVzZXRfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCWlmICghSEFTX0dN Q0hfRElTUExBWShkZXZfcHJpdikpCiAJCXNhbml0aXplX3dhdGVybWFya3MoZGV2KTsKIAorCS8q CisJICogRm9yY2UgYWxsIGFjdGl2ZSBwbGFuZXMgdG8gcmVjb21wdXRlIHRoZWlyIHN0YXRlcy4g U28gdGhhdCBvbgorCSAqIG1vZGVfc2V0Y3J0YyBhZnRlciBwcm9iZSwgYWxsIHRoZSBpbnRlbF9w bGFuZV9zdGF0ZSB2YXJpYWJsZXMKKwkgKiBhcmUgYWxyZWFkeSBjYWxjdWxhdGVkIGFuZCB0aGVy ZSBpcyBubyBhc3NlcnRfcGxhbmUgd2FybmluZ3MKKwkgKiBkdXJpbmcgYm9vdHVwLgorCSAqLwor CXJldCA9IGludGVsX2luaXRpYWxfY29tbWl0KGRldik7CisJaWYgKHJldCkKKwkJRFJNX0RFQlVH X0tNUygiSW5pdGlhbCBjb21taXQgaW4gcHJvYmUgZmFpbGVkLlxuIik7CisKIAlyZXR1cm4gMDsK IH0KIAotLSAKMS45LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9w Lm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVs LWdmeAo=