From mboxrd@z Thu Jan  1 00:00:00 1970
From: Dave Airlie <airlied@gmail.com>
Subject: [PATCH] drm/mst: fix recursive sleep warning on qlock
Date: Wed, 28 Jan 2015 16:37:01 +1300
Message-ID: <1422416221-3484-1-git-send-email-airlied@gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://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: <http://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: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

RnJvbTogRGF2ZSBBaXJsaWUgPGFpcmxpZWRAcmVkaGF0LmNvbT4KCldpdGggZHJtLW5leHQsIHdl
IGNhbiBnZXQgYSBiYWNrdHJhY2UgbGlrZSBiZWxvdywKdGhpcyBpcyBkdWUgdG8gdGhlIGNhbGxi
YWNrIGNoZWNraW5nIHRoZSB0eG1zZyBzdGF0ZSB0YWtpbmcKdGhlIG11dGV4LCB3aGljaCBjYW4g
Y2F1c2UgYSBzbGVlcCBpbnNpZGUgYSBzbGVlcCwKCkZpeCB0aGlzIG15IGNyZWF0aW5nIGEgc3Bp
bmxvY2sgcHJvdGVjdGluZyB0aGUgdHhtc2cgc3RhdGUKYW5kIGxvY2tpbmcgaXQgaW4gYXBwcm9w
cmlhdGUgcGxhY2VzLgoKOiAtLS0tLS0tLS0tLS1bIGN1dCBoZXJlIF0tLS0tLS0tLS0tLS0KOiBX
QVJOSU5HOiBDUFU6IDMgUElEOiAyNTIgYXQga2VybmVsL3NjaGVkL2NvcmUuYzo3MzAwIF9fbWln
aHRfc2xlZXArMHhiZC8weGQwKCkKOiBkbyBub3QgY2FsbCBibG9ja2luZyBvcHMgd2hlbiAhVEFT
S19SVU5OSU5HOyBzdGF0ZT0yIHNldCBhdCBbPGZmZmZmZmZmODEwZGI4YWQ+XSBwcmVwYXJlX3Rv
X3dhaXRfZXZlbnQrMHg1ZC8weDExMAo6IE1vZHVsZXMgbGlua2VkIGluOiBpOTE1IGkyY19hbGdv
X2JpdCBkcm1fa21zX2hlbHBlciBkcm0gZTEwMDBlIHB0cCBwcHNfY29yZSBpMmNfY29yZSB2aWRl
bwo6IENQVTogMyBQSUQ6IDI1MiBDb21tOiBrd29ya2VyLzM6MiBOb3QgdGFpbnRlZCAzLjE5LjAt
cmM1KyAjMTgKOiBIYXJkd2FyZSBuYW1lOiBMRU5PVk8gMjBBUlMyNTcwMS8yMEFSUzI1NzAxLCBC
SU9TIEdKRVQ3MldXICgyLjIyICkgMDIvMjEvMjAxNAo6IFdvcmtxdWV1ZTogZXZlbnRzX2xvbmcg
ZHJtX2RwX21zdF9saW5rX3Byb2JlX3dvcmsgW2RybV9rbXNfaGVscGVyXQo6ICBmZmZmZmZmZjgx
YTQwMjdjIGZmZmY4ODAzMGE3NjNhZjggZmZmZmZmZmY4MTc1MjY5OSAwMDAwMDAwMDAwMDAwMDAw
CjogIGZmZmY4ODAzMGE3NjNiNDggZmZmZjg4MDMwYTc2M2IzOCBmZmZmZmZmZjgxMDk3NGNhIGZm
ZmY4ODAzMGE3NjNiMzgKOiAgZmZmZmZmZmY4MWE0MTEyMyAwMDAwMDAwMDAwMDAwMjZkIDAwMDAw
MDAwMDAwMDAwMDAgMDAwMDAwMDAwMDAwMGZhMAo6IENhbGwgVHJhY2U6CjogIFs8ZmZmZmZmZmY4
MTc1MjY5OT5dIGR1bXBfc3RhY2srMHg0Yy8weDY1CjogIFs8ZmZmZmZmZmY4MTA5NzRjYT5dIHdh
cm5fc2xvd3BhdGhfY29tbW9uKzB4OGEvMHhjMAo6ICBbPGZmZmZmZmZmODEwOTc1NDY+XSB3YXJu
X3Nsb3dwYXRoX2ZtdCsweDQ2LzB4NTAKOiAgWzxmZmZmZmZmZjgxMGRiOGFkPl0gPyBwcmVwYXJl
X3RvX3dhaXRfZXZlbnQrMHg1ZC8weDExMAo6ICBbPGZmZmZmZmZmODEwZGI4YWQ+XSA/IHByZXBh
cmVfdG9fd2FpdF9ldmVudCsweDVkLzB4MTEwCjogIFs8ZmZmZmZmZmY4MTBiZGFhZD5dIF9fbWln
aHRfc2xlZXArMHhiZC8weGQwCjogIFs8ZmZmZmZmZmY4MTc1NjZkZT5dIG11dGV4X2xvY2tfbmVz
dGVkKzB4MmUvMHgzZTAKOiAgWzxmZmZmZmZmZjgxMGRiOGU4Pl0gPyBwcmVwYXJlX3RvX3dhaXRf
ZXZlbnQrMHg5OC8weDExMAo6ICBbPGZmZmZmZmZmYTAwZTQzZDc+XSBkcm1fZHBfbXN0X3dhaXRf
dHhfcmVwbHkrMHhhNy8weDIyMCBbZHJtX2ttc19oZWxwZXJdCjogIFs8ZmZmZmZmZmY4MTBkYjc5
MD5dID8gd2FpdF93b2tlbisweGMwLzB4YzAKOiAgWzxmZmZmZmZmZmEwMGU2NDAxPl0gZHJtX2Rw
X3NlbmRfbGlua19hZGRyZXNzKzB4NjEvMHgyNDAgW2RybV9rbXNfaGVscGVyXQo6ICBbPGZmZmZm
ZmZmODEwYjFhYWY+XSA/IHByb2Nlc3Nfb25lX3dvcmsrMHgxNGYvMHg1MzAKOiAgWzxmZmZmZmZm
ZmEwMGU2YWJkPl0gZHJtX2RwX2NoZWNrX2FuZF9zZW5kX2xpbmtfYWRkcmVzcysweDhkLzB4YTAg
W2RybV9rbXNfaGVscGVyXQo6ICBbPGZmZmZmZmZmYTAwZTZhZWM+XSBkcm1fZHBfbXN0X2xpbmtf
cHJvYmVfd29yaysweDFjLzB4MjAgW2RybV9rbXNfaGVscGVyXQo6ICBbPGZmZmZmZmZmODEwYjFi
MjY+XSBwcm9jZXNzX29uZV93b3JrKzB4MWM2LzB4NTMwCjogIFs8ZmZmZmZmZmY4MTBiMWFhZj5d
ID8gcHJvY2Vzc19vbmVfd29yaysweDE0Zi8weDUzMAo6ICBbPGZmZmZmZmZmODEwYjIyNGI+XSB3
b3JrZXJfdGhyZWFkKzB4NmIvMHg0OTAKOiAgWzxmZmZmZmZmZjgxMGIyMWUwPl0gPyByZXNjdWVy
X3RocmVhZCsweDM1MC8weDM1MAo6ICBbPGZmZmZmZmZmODEwYjczZWE+XSBrdGhyZWFkKzB4MTBh
LzB4MTIwCjogIFs8ZmZmZmZmZmY4MTc1YTgwMD5dID8gX3Jhd19zcGluX3VubG9ja19pcnErMHgz
MC8weDUwCjogIFs8ZmZmZmZmZmY4MTBiNzJlMD5dID8ga3RocmVhZF9jcmVhdGVfb25fbm9kZSsw
eDIyMC8weDIyMAo6ICBbPGZmZmZmZmZmODE3NWIxZmM+XSByZXRfZnJvbV9mb3JrKzB4N2MvMHhi
MAo6ICBbPGZmZmZmZmZmODEwYjcyZTA+XSA/IGt0aHJlYWRfY3JlYXRlX29uX25vZGUrMHgyMjAv
MHgyMjAKOiAtLS1bIGVuZCB0cmFjZSBiYjExYzk2MzRhNzIxN2M2IF0tLS0KClNpZ25lZC1vZmYt
Ynk6IERhdmUgQWlybGllIDxhaXJsaWVkQHJlZGhhdC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJt
L2RybV9kcF9tc3RfdG9wb2xvZ3kuYyB8IDE1ICsrKysrKysrKysrKystLQogaW5jbHVkZS9kcm0v
ZHJtX2RwX21zdF9oZWxwZXIuaCAgICAgICB8ICA0ICsrKy0KIDIgZmlsZXMgY2hhbmdlZCwgMTYg
aW5zZXJ0aW9ucygrKSwgMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k
cm0vZHJtX2RwX21zdF90b3BvbG9neS5jIGIvZHJpdmVycy9ncHUvZHJtL2RybV9kcF9tc3RfdG9w
b2xvZ3kuYwppbmRleCA5YTViNjg3Li4wNzY2MmFlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k
cm0vZHJtX2RwX21zdF90b3BvbG9neS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fZHBfbXN0
X3RvcG9sb2d5LmMKQEAgLTczMywxMCArNzMzLDEwIEBAIHN0YXRpYyBib29sIGNoZWNrX3R4bXNn
X3N0YXRlKHN0cnVjdCBkcm1fZHBfbXN0X3RvcG9sb2d5X21nciAqbWdyLAogCQkJICAgICAgc3Ry
dWN0IGRybV9kcF9zaWRlYmFuZF9tc2dfdHggKnR4bXNnKQogewogCWJvb2wgcmV0OwotCW11dGV4
X2xvY2soJm1nci0+cWxvY2spOworCXNwaW5fbG9jaygmbWdyLT5zdGF0ZV9sb2NrKTsKIAlyZXQg
PSAodHhtc2ctPnN0YXRlID09IERSTV9EUF9TSURFQkFORF9UWF9SWCB8fAogCSAgICAgICB0eG1z
Zy0+c3RhdGUgPT0gRFJNX0RQX1NJREVCQU5EX1RYX1RJTUVPVVQpOwotCW11dGV4X3VubG9jaygm
bWdyLT5xbG9jayk7CisJc3Bpbl91bmxvY2soJm1nci0+c3RhdGVfbG9jayk7CiAJcmV0dXJuIHJl
dDsKIH0KIApAQCAtNzUwLDYgKzc1MCw3IEBAIHN0YXRpYyBpbnQgZHJtX2RwX21zdF93YWl0X3R4
X3JlcGx5KHN0cnVjdCBkcm1fZHBfbXN0X2JyYW5jaCAqbXN0YiwKIAkJCQkgY2hlY2tfdHhtc2df
c3RhdGUobWdyLCB0eG1zZyksCiAJCQkJICg0ICogSFopKTsKIAltdXRleF9sb2NrKCZtc3RiLT5t
Z3ItPnFsb2NrKTsKKwlzcGluX2xvY2soJm1nci0+c3RhdGVfbG9jayk7CiAJaWYgKHJldCA+IDAp
IHsKIAkJaWYgKHR4bXNnLT5zdGF0ZSA9PSBEUk1fRFBfU0lERUJBTkRfVFhfVElNRU9VVCkgewog
CQkJcmV0ID0gLUVJTzsKQEAgLTc3Myw2ICs3NzQsNyBAQCBzdGF0aWMgaW50IGRybV9kcF9tc3Rf
d2FpdF90eF9yZXBseShzdHJ1Y3QgZHJtX2RwX21zdF9icmFuY2ggKm1zdGIsCiAJCX0KIAl9CiBv
dXQ6CisJc3Bpbl91bmxvY2soJm1nci0+c3RhdGVfbG9jayk7CiAJbXV0ZXhfdW5sb2NrKCZtZ3It
PnFsb2NrKTsKIAogCXJldHVybiByZXQ7CkBAIC0xMzE4LDEwICsxMzIwLDEyIEBAIHN0YXRpYyBp
bnQgcHJvY2Vzc19zaW5nbGVfdHhfcWxvY2soc3RydWN0IGRybV9kcF9tc3RfdG9wb2xvZ3lfbWdy
ICptZ3IsCiAKIAltZW1zZXQoJmhkciwgMCwgc2l6ZW9mKHN0cnVjdCBkcm1fZHBfc2lkZWJhbmRf
bXNnX2hkcikpOwogCisJc3Bpbl9sb2NrKCZtZ3ItPnN0YXRlX2xvY2spOwogCWlmICh0eG1zZy0+
c3RhdGUgPT0gRFJNX0RQX1NJREVCQU5EX1RYX1FVRVVFRCkgewogCQl0eG1zZy0+c2Vxbm8gPSAt
MTsKIAkJdHhtc2ctPnN0YXRlID0gRFJNX0RQX1NJREVCQU5EX1RYX1NUQVJUX1NFTkQ7CiAJfQor
CXNwaW5fdW5sb2NrKCZtZ3ItPnN0YXRlX2xvY2spOwogCiAJLyogbWFrZSBoZHIgZnJvbSBkc3Qg
bXN0IC0gZm9yIHJlcGxpZXMgdXNlIHNlcW5vCiAJICAgb3RoZXJ3aXNlIGFzc2lnbiBvbmUgKi8K
QEAgLTEzNTcsNyArMTM2MSw5IEBAIHN0YXRpYyBpbnQgcHJvY2Vzc19zaW5nbGVfdHhfcWxvY2so
c3RydWN0IGRybV9kcF9tc3RfdG9wb2xvZ3lfbWdyICptZ3IsCiAKIAl0eG1zZy0+Y3VyX29mZnNl
dCArPSB0b3NlbmQ7CiAJaWYgKHR4bXNnLT5jdXJfb2Zmc2V0ID09IHR4bXNnLT5jdXJfbGVuKSB7
CisJCXNwaW5fbG9jaygmbWdyLT5zdGF0ZV9sb2NrKTsKIAkJdHhtc2ctPnN0YXRlID0gRFJNX0RQ
X1NJREVCQU5EX1RYX1NFTlQ7CisJCXNwaW5fdW5sb2NrKCZtZ3ItPnN0YXRlX2xvY2spOwogCQly
ZXR1cm4gMTsKIAl9CiAJcmV0dXJuIDA7CkBAIC0xMzg2LDcgKzEzOTIsOSBAQCBzdGF0aWMgdm9p
ZCBwcm9jZXNzX3NpbmdsZV9kb3duX3R4X3Fsb2NrKHN0cnVjdCBkcm1fZHBfbXN0X3RvcG9sb2d5
X21nciAqbWdyKQogCQlsaXN0X2RlbCgmdHhtc2ctPm5leHQpOwogCQlpZiAodHhtc2ctPnNlcW5v
ICE9IC0xKQogCQkJdHhtc2ctPmRzdC0+dHhfc2xvdHNbdHhtc2ctPnNlcW5vXSA9IE5VTEw7CisJ
CXNwaW5fbG9jaygmbWdyLT5zdGF0ZV9sb2NrKTsKIAkJdHhtc2ctPnN0YXRlID0gRFJNX0RQX1NJ
REVCQU5EX1RYX1RJTUVPVVQ7CisJCXNwaW5fdW5sb2NrKCZtZ3ItPnN0YXRlX2xvY2spOwogCQl3
YWtlX3VwKCZtZ3ItPnR4X3dhaXRxKTsKIAl9CiAJaWYgKGxpc3RfZW1wdHkoJm1nci0+dHhfbXNn
X2Rvd25xKSkgewpAQCAtMjA4Myw3ICsyMDkxLDkgQEAgc3RhdGljIGludCBkcm1fZHBfbXN0X2hh
bmRsZV9kb3duX3JlcChzdHJ1Y3QgZHJtX2RwX21zdF90b3BvbG9neV9tZ3IgKm1ncikKIAkJZHJt
X2RwX3B1dF9tc3RfYnJhbmNoX2RldmljZShtc3RiKTsKIAogCQltdXRleF9sb2NrKCZtZ3ItPnFs
b2NrKTsKKwkJc3Bpbl9sb2NrKCZtZ3ItPnN0YXRlX2xvY2spOwogCQl0eG1zZy0+c3RhdGUgPSBE
Uk1fRFBfU0lERUJBTkRfVFhfUlg7CisJCXNwaW5fdW5sb2NrKCZtZ3ItPnN0YXRlX2xvY2spOwog
CQltc3RiLT50eF9zbG90c1tzbG90XSA9IE5VTEw7CiAJCW11dGV4X3VubG9jaygmbWdyLT5xbG9j
ayk7CiAKQEAgLTI2MzMsNiArMjY0Myw3IEBAIGludCBkcm1fZHBfbXN0X3RvcG9sb2d5X21ncl9p
bml0KHN0cnVjdCBkcm1fZHBfbXN0X3RvcG9sb2d5X21nciAqbWdyLAogCW11dGV4X2luaXQoJm1n
ci0+bG9jayk7CiAJbXV0ZXhfaW5pdCgmbWdyLT5xbG9jayk7CiAJbXV0ZXhfaW5pdCgmbWdyLT5w
YXlsb2FkX2xvY2spOworCXNwaW5fbG9ja19pbml0KCZtZ3ItPnN0YXRlX2xvY2spOwogCUlOSVRf
TElTVF9IRUFEKCZtZ3ItPnR4X21zZ191cHEpOwogCUlOSVRfTElTVF9IRUFEKCZtZ3ItPnR4X21z
Z19kb3ducSk7CiAJSU5JVF9XT1JLKCZtZ3ItPndvcmssIGRybV9kcF9tc3RfbGlua19wcm9iZV93
b3JrKTsKZGlmZiAtLWdpdCBhL2luY2x1ZGUvZHJtL2RybV9kcF9tc3RfaGVscGVyLmggYi9pbmNs
dWRlL2RybS9kcm1fZHBfbXN0X2hlbHBlci5oCmluZGV4IDAwYzFkYTkuLjdjZDE3MzUgMTAwNjQ0
Ci0tLSBhL2luY2x1ZGUvZHJtL2RybV9kcF9tc3RfaGVscGVyLmgKKysrIGIvaW5jbHVkZS9kcm0v
ZHJtX2RwX21zdF9oZWxwZXIuaApAQCAtNDQ1LDggKzQ0NSwxMCBAQCBzdHJ1Y3QgZHJtX2RwX21z
dF90b3BvbG9neV9tZ3IgewogCiAJLyogbWVzc2FnZXMgdG8gYmUgdHJhbnNtaXR0ZWQgKi8KIAkv
KiBxbG9jayBwcm90ZWN0cyB0aGUgdXBxL2Rvd25xIGFuZCBpbl9wcm9ncmVzcywKLQkgICB0aGUg
bXN0YiB0eF9zbG90cyBhbmQgdHhtc2ctPnN0YXRlIG9uY2UgdGhleSBhcmUgcXVldWVkICovCisJ
ICAgdGhlIG1zdGIgdHhfc2xvdHMgb25jZSB0aGV5IGFyZSBxdWV1ZWQgKi8KIAlzdHJ1Y3QgbXV0
ZXggcWxvY2s7CisJLyogc3RhdGUgbG9jayBwcm90ZWN0cyB0eG1zZy0+c3RhdGUgKi8KKwlzcGlu
bG9ja190IHN0YXRlX2xvY2s7CiAJc3RydWN0IGxpc3RfaGVhZCB0eF9tc2dfZG93bnE7CiAJc3Ry
dWN0IGxpc3RfaGVhZCB0eF9tc2dfdXBxOwogCWJvb2wgdHhfZG93bl9pbl9wcm9ncmVzczsKLS0g
CjIuMS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJ
bnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0
cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=