From: Bruce Chang Subject: [PATCH] drm/i915: Fix a bug calling sleep function in atomic context Date: Tue, 12 Nov 2019 16:28:14 -0800 Message-ID: <20191113002814.14488-1-yu.bruce.chang@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8D0C66E154 for ; Wed, 13 Nov 2019 00:29: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 VGhlcmUgYXJlIHF1aXRlIGEgZmV3IHJlcG9ydHMgcmVnYXJkaW5nICJCVUc6IHNsZWVwaW5nIGZ1 bmN0aW9uIGNhbGxlZCBmcm9tCmludmFsaWQgY29udGV4dCBhdCBtbS9wYWdlX2FsbG9jLmMiCgpC YXNpY2FsbHkgYWZ0ZXIgdGhlIGlvX21hcHBpbmdfbWFwX2F0b21pY193Yy9rbWFwX2F0b21pYywg aXQgZW50ZXJzIGF0b21pYwpjb250ZXh0LCBidXQgY29tcHJlc3NfcGFnZSBjYW5ub3QgYmUgY2Fs bGVkIGluIGF0b21pYyBjb250ZXh0IGFzIGl0IHdpbGwKY2FsbCBwb29sX2FsbG9jIHdpdGggR0ZQ X0tFUk5FTCBmbGFnIHdoaWNoIGNhbiBnbyB0byBzbGVlcC4gVGhpcyBpcyB3aHkKdGhlIGJ1ZyBn b3QgcmVwb3J0ZWQuCgpTbywgY2hhbmdlZCB0byBub24gYXRvbWljIHZlcnNpb24gaW5zdGVhZC4K ClNpZ25lZC1vZmYtYnk6IEJydWNlIENoYW5nIDx5dS5icnVjZS5jaGFuZ0BpbnRlbC5jb20+Ci0t LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3IuYyB8IDggKysrKy0tLS0KIDEg ZmlsZSBjaGFuZ2VkLCA0IGluc2VydGlvbnMoKyksIDQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3IuYyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmMKaW5kZXggMWYyZjI2NmYyNmFmLi43MTE4ZWNiN2YxNDQg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3IuYwpAQCAtMTAwNyw2NyArMTAwNyw2 NyBAQCBpOTE1X2Vycm9yX29iamVjdF9jcmVhdGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5 MTUsCiAJY29tcHJlc3MtPndjID0gaTkxNV9nZW1fb2JqZWN0X2lzX2xtZW0odm1hLT5vYmopIHx8 CiAJCSAgICAgICBkcm1fbW1fbm9kZV9hbGxvY2F0ZWQoJmdndHQtPmVycm9yX2NhcHR1cmUpOwog CiAJcmV0ID0gLUVJTlZBTDsKIAlpZiAoZHJtX21tX25vZGVfYWxsb2NhdGVkKCZnZ3R0LT5lcnJv cl9jYXB0dXJlKSkgewogCQl2b2lkIF9faW9tZW0gKnM7CiAJCWRtYV9hZGRyX3QgZG1hOwogCiAJ CWZvcl9lYWNoX3NndF9kYWRkcihkbWEsIGl0ZXIsIHZtYS0+cGFnZXMpIHsKIAkJCWdndHQtPnZt Lmluc2VydF9wYWdlKCZnZ3R0LT52bSwgZG1hLCBzbG90LAogCQkJCQkgICAgIEk5MTVfQ0FDSEVf Tk9ORSwgMCk7CiAKIAkJCXMgPSBpb19tYXBwaW5nX21hcF93YygmZ2d0dC0+aW9tYXAsIHNsb3Qs IFBBR0VfU0laRSk7CiAJCQlyZXQgPSBjb21wcmVzc19wYWdlKGNvbXByZXNzLCAodm9pZCAgX19m b3JjZSAqKXMsIGRzdCk7CiAJCQlpb19tYXBwaW5nX3VubWFwKHMpOwogCQkJaWYgKHJldCkKIAkJ CQlicmVhazsKIAkJfQogCX0gZWxzZSBpZiAoaTkxNV9nZW1fb2JqZWN0X2lzX2xtZW0odm1hLT5v YmopKSB7CiAJCXN0cnVjdCBpbnRlbF9tZW1vcnlfcmVnaW9uICptZW0gPSB2bWEtPm9iai0+bW0u cmVnaW9uOwogCQlkbWFfYWRkcl90IGRtYTsKIAogCQlmb3JfZWFjaF9zZ3RfZGFkZHIoZG1hLCBp dGVyLCB2bWEtPnBhZ2VzKSB7CiAJCQl2b2lkIF9faW9tZW0gKnM7CiAKLQkJCXMgPSBpb19tYXBw aW5nX21hcF9hdG9taWNfd2MoJm1lbS0+aW9tYXAsIGRtYSk7CisJCQlzID0gaW9fbWFwcGluZ19t YXBfd2MoJm1lbS0+aW9tYXAsIGRtYSwgUEFHRV9TSVpFKTsKIAkJCXJldCA9IGNvbXByZXNzX3Bh Z2UoY29tcHJlc3MsICh2b2lkIF9fZm9yY2UgKilzLCBkc3QpOwotCQkJaW9fbWFwcGluZ191bm1h cF9hdG9taWMocyk7CisJCQlpb19tYXBwaW5nX3VubWFwKHMpOwogCQkJaWYgKHJldCkKIAkJCQli cmVhazsKIAkJfQogCX0gZWxzZSB7CiAJCXN0cnVjdCBwYWdlICpwYWdlOwogCiAJCWZvcl9lYWNo X3NndF9wYWdlKHBhZ2UsIGl0ZXIsIHZtYS0+cGFnZXMpIHsKIAkJCXZvaWQgKnM7CiAKIAkJCWRy bV9jbGZsdXNoX3BhZ2VzKCZwYWdlLCAxKTsKIAotCQkJcyA9IGttYXBfYXRvbWljKHBhZ2UpOwor CQkJcyA9IGttYXAocGFnZSk7CiAJCQlyZXQgPSBjb21wcmVzc19wYWdlKGNvbXByZXNzLCBzLCBk c3QpOwotCQkJa3VubWFwX2F0b21pYyhzKTsKKwkJCWt1bm1hcChzKTsKIAogCQkJZHJtX2NsZmx1 c2hfcGFnZXMoJnBhZ2UsIDEpOwogCiAJCQlpZiAocmV0KQogCQkJCWJyZWFrOwogCQl9CiAJfQog CiAJaWYgKHJldCB8fCBjb21wcmVzc19mbHVzaChjb21wcmVzcywgZHN0KSkgewogCQl3aGlsZSAo ZHN0LT5wYWdlX2NvdW50LS0pCiAJCQlwb29sX2ZyZWUoJmNvbXByZXNzLT5wb29sLCBkc3QtPnBh Z2VzW2RzdC0+cGFnZV9jb3VudF0pOwogCQlrZnJlZShkc3QpOwogCQlkc3QgPSBOVUxMOwogCX0K IAljb21wcmVzc19maW5pc2goY29tcHJlc3MpOwogCiAJcmV0dXJuIGRzdDsKIH0KIAogLyoKICAq IEdlbmVyYXRlIGEgc2VtaS11bmlxdWUgZXJyb3IgY29kZS4gVGhlIGNvZGUgaXMgbm90IG1lYW50 IHRvIGhhdmUgbWVhbmluZywgVGhlCiAgKiBjb2RlJ3Mgb25seSBwdXJwb3NlIGlzIHRvIHRyeSB0 byBwcmV2ZW50IGZhbHNlIGR1cGxpY2F0ZWQgYnVnIHJlcG9ydHMgYnkKICAqIGdyb3NzbHkgZXN0 aW1hdGluZyBhIEdQVSBlcnJvciBzdGF0ZS4KICAqCiAgKiBUT0RPIElkZWFsbHksIGhhc2hpbmcg dGhlIGJhdGNoYnVmZmVyIHdvdWxkIGJlIGEgdmVyeSBuaWNlIHdheSB0byBkZXRlcm1pbmUKLS0g CjIuMjQuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K SW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0 dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4