From mboxrd@z Thu Jan  1 00:00:00 1970
From: Azhar Shaikh <azhar.shaikh@intel.com>
Subject: [PATCH v6] drm/i915: Fix assert_plane() warning on
 bootup with external display
Date: Tue,  3 Jul 2018 13:21:02 -0700
Message-ID: <1530649262-94772-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: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mga12.intel.com (mga12.intel.com [192.55.52.136])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 7C9D76E213
 for <intel-gfx@lists.freedesktop.org>; Tue,  3 Jul 2018 20:21:03 +0000 (UTC)
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
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
YW5lcyB0byByZWNvbXB1dGUgdGhlaXIgc3RhdGVzCmluIHByb2JlLgoKQ2hhbmdlcyBpbiB2NjoK
LSBIYW5kbGUgRURFQURMSyBmb3IgZHJtX2F0b21pY19nZXRfY3J0Y19zdGF0ZSgpIGFuZAogIGRy
bV9hdG9taWNfYWRkX2FmZmVjdGVkX3BsYW5lcygpCi0gUmVtb3ZlIG9wdGltaXphdGlvbiBvZiBj
YWxsaW5nIGludGVsX2luaXRpYWxfY29tbWl0KCkKICBvbmx5IHdoZW4gdGhlcmUgaXMgbW9yZSB0
aGFuIG9uZSBhY3RpdmUgcGlwZSBpbiBwcm9iZS4KLSBBdm9pZCB1c2luZyBpbnRlbF8gdHlwZXMu
CgpDaGFuZ2VzIGluIHY1OgotIERyb3AgZHJtX21vZGVzZXRfbG9ja19hbGxfY3R4KCkgc2luY2Ug
bG9ja3Mgd2lsbCBiZSB0YWtlbiBsYXRlci4KCkNoYW5nZXMgaW4gdjQ6Ci0gSGFuZGxlIGxvY2tp
bmcgaW4gaW50ZWxfaW5pdGlhbF9jb21taXQoKQotIE1vdmUgdGhlIGZvciBsb29wIGluc2lkZSBp
bnRlbF9pbml0aWFsX2NvbW1pdCgpIHNvIHRoYXQKICBkcm1fYXRvbWljX2NvbW1pdCgpIGlzIGNh
bGxlZCBvbmx5IG9uY2UKLSBDYWxsIGludGVsX2luaXRpYWxfY29tbWl0KCkgb25seSBmb3IgbW9y
ZSB0aGFuIG9uZSBhY3RpdmUgY3J0YyBvbiBib290LgotIFNhdmUgdGhlIHJldHVybiB2YWx1ZSBv
ZiBpbnRlbF9pbml0aWFsX2NvbW1pdCgpIGFuZCBwcmludCBhIG1lc3NhZ2UgaW4KICBjYXNlIG9m
IGFuIGVycm9yCgpDaGFuZ2VzIGluIHYzOgotIEFkZCBjb21tZW50cwoKQ2hhbmdlcyBpbiB2MjoK
LSBGb3JjZSBhbGwgcGxhbmVzIHRvIHJlY29tcHV0ZSB0aGVpciBzdGF0ZXMuKFZpbGxlIFN5cmrD
pGzDpCkKLSBVcGRhdGUgdGhlIGNvbW1pdCBtZXNzYWdlCgpTaWduZWQtb2ZmLWJ5OiBBemhhciBT
aGFpa2ggPGF6aGFyLnNoYWlraEBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUv
aW50ZWxfZGlzcGxheS5jIHwgNjEgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0t
CiAxIGZpbGUgY2hhbmdlZCwgNTkgaW5zZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMoLSkKCmRpZmYg
LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dw
dS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggNTY4MThhNDUxODFjLi5kMjdiNjNmZTJm
YzAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysg
Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTE1MDkyLDEyICsxNTA5
Miw2MSBAQCBzdGF0aWMgdm9pZCBpbnRlbF91cGRhdGVfZmRpX3BsbF9mcmVxKHN0cnVjdCBkcm1f
aTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAlEUk1fREVCVUdfRFJJVkVSKCJGREkgUExMIGZyZXE9
JWRcbiIsIGRldl9wcml2LT5mZGlfcGxsX2ZyZXEpOwogfQogCitzdGF0aWMgaW50IGludGVsX2lu
aXRpYWxfY29tbWl0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCit7CisJc3RydWN0IGRybV9hdG9t
aWNfc3RhdGUgKnN0YXRlID0gTlVMTDsKKwlzdHJ1Y3QgZHJtX21vZGVzZXRfYWNxdWlyZV9jdHgg
Y3R4OworCXN0cnVjdCBkcm1fY3J0YyAqY3J0YzsKKwlzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNy
dGNfc3RhdGU7CisJaW50IHJldCA9IDA7CisKKwlzdGF0ZSA9IGRybV9hdG9taWNfc3RhdGVfYWxs
b2MoZGV2KTsKKwlpZiAoIXN0YXRlKQorCQlyZXR1cm4gLUVOT01FTTsKKworCWRybV9tb2Rlc2V0
X2FjcXVpcmVfaW5pdCgmY3R4LCAwKTsKKworcmV0cnk6CisJc3RhdGUtPmFjcXVpcmVfY3R4ID0g
JmN0eDsKKworCWRybV9mb3JfZWFjaF9jcnRjKGNydGMsIGRldikgeworCQljcnRjX3N0YXRlID0g
ZHJtX2F0b21pY19nZXRfY3J0Y19zdGF0ZShzdGF0ZSwgY3J0Yyk7CisJCWlmIChJU19FUlIoY3J0
Y19zdGF0ZSkpIHsKKwkJCXJldCA9IFBUUl9FUlIoY3J0Y19zdGF0ZSk7CisJCQlnb3RvIG91dDsK
KwkJfQorCisJCWlmIChjcnRjX3N0YXRlLT5hY3RpdmUpIHsKKwkJCXJldCA9IGRybV9hdG9taWNf
YWRkX2FmZmVjdGVkX3BsYW5lcyhzdGF0ZSwgY3J0Yyk7CisJCQlpZiAocmV0KQorCQkJCWdvdG8g
b3V0OworCQl9CisJfQorCisJcmV0ID0gZHJtX2F0b21pY19jb21taXQoc3RhdGUpOworCitvdXQ6
CisJaWYgKHJldCA9PSAtRURFQURMSykgeworCQlkcm1fYXRvbWljX3N0YXRlX2NsZWFyKHN0YXRl
KTsKKwkJZHJtX21vZGVzZXRfYmFja29mZigmY3R4KTsKKwkJZ290byByZXRyeTsKKwl9CisKKwlk
cm1fYXRvbWljX3N0YXRlX3B1dChzdGF0ZSk7CisKKwlkcm1fbW9kZXNldF9kcm9wX2xvY2tzKCZj
dHgpOworCWRybV9tb2Rlc2V0X2FjcXVpcmVfZmluaSgmY3R4KTsKKworCXJldHVybiByZXQ7Cit9
CisKIGludCBpbnRlbF9tb2Rlc2V0X2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIHsKIAlz
dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CiAJc3RydWN0
IGk5MTVfZ2d0dCAqZ2d0dCA9ICZkZXZfcHJpdi0+Z2d0dDsKIAllbnVtIHBpcGUgcGlwZTsKIAlz
dHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YzsKKwlpbnQgcmV0OwogCiAJZGV2X3ByaXYtPm1vZGVzZXRf
d3EgPSBhbGxvY19vcmRlcmVkX3dvcmtxdWV1ZSgiaTkxNV9tb2Rlc2V0IiwgMCk7CiAKQEAgLTE1
MTcyLDggKzE1MjIxLDYgQEAgaW50IGludGVsX21vZGVzZXRfaW5pdChzdHJ1Y3QgZHJtX2Rldmlj
ZSAqZGV2KQogCQkgICAgICBJTlRFTF9JTkZPKGRldl9wcml2KS0+bnVtX3BpcGVzID4gMSA/ICJz
IiA6ICIiKTsKIAogCWZvcl9lYWNoX3BpcGUoZGV2X3ByaXYsIHBpcGUpIHsKLQkJaW50IHJldDsK
LQogCQlyZXQgPSBpbnRlbF9jcnRjX2luaXQoZGV2X3ByaXYsIHBpcGUpOwogCQlpZiAocmV0KSB7
CiAJCQlkcm1fbW9kZV9jb25maWdfY2xlYW51cChkZXYpOwpAQCAtMTUyMjIsNiArMTUyNjksMTYg
QEAgaW50IGludGVsX21vZGVzZXRfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCX0KIAog
CS8qCisJICogRm9yY2UgYWxsIGFjdGl2ZSBwbGFuZXMgdG8gcmVjb21wdXRlIHRoZWlyIHN0YXRl
cy4gU28gdGhhdCBvbgorCSAqIG1vZGVfc2V0Y3J0YyBhZnRlciBwcm9iZSwgYWxsIHRoZSBpbnRl
bF9wbGFuZV9zdGF0ZSB2YXJpYWJsZXMKKwkgKiBhcmUgYWxyZWFkeSBjYWxjdWxhdGVkIGFuZCB0
aGVyZSBpcyBubyBhc3NlcnRfcGxhbmUgd2FybmluZ3MKKwkgKiBkdXJpbmcgYm9vdHVwLgorCSAq
LworCXJldCA9IGludGVsX2luaXRpYWxfY29tbWl0KGRldik7CisJaWYgKHJldCkKKwkJRFJNX0RF
QlVHX0tNUygiSW5pdGlhbCBjb21taXQgaW4gcHJvYmUgZmFpbGVkLlxuIik7CisKKwkvKgogCSAq
IE1ha2Ugc3VyZSBoYXJkd2FyZSB3YXRlcm1hcmtzIHJlYWxseSBtYXRjaCB0aGUgc3RhdGUgd2Ug
cmVhZCBvdXQuCiAJICogTm90ZSB0aGF0IHdlIG5lZWQgdG8gZG8gdGhpcyBhZnRlciByZWNvbnN0
cnVjdGluZyB0aGUgQklPUyBmYidzCiAJICogc2luY2UgdGhlIHdhdGVybWFyayBjYWxjdWxhdGlv
biBkb25lIGhlcmUgd2lsbCB1c2UgcHN0YXRlLT5mYi4KLS0gCjEuOS4xCgpfX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0
CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3Rv
cC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK