From mboxrd@z Thu Jan 1 00:00:00 1970 From: yu.dai@intel.com Subject: [PATCH] drm/i915/guc: Move wait for GuC out of spinlock/unlock Date: Mon, 23 Nov 2015 15:02:58 -0800 Message-ID: <1448319778-29282-1-git-send-email-yu.dai@intel.com> References: <20151120084542.GU17050@phenom.ffwll.local> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 6E7E76E1B5 for ; Mon, 23 Nov 2015 15:05:33 -0800 (PST) In-Reply-To: <20151120084542.GU17050@phenom.ffwll.local> 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 RnJvbTogQWxleCBEYWkgPHl1LmRhaUBpbnRlbC5jb20+CgpXaGVuIEd1QyBXb3JrIFF1ZXVlIGlz IGZ1bGwsIGRyaXZlciB3aWxsIHdhaXQgR3VDIGZvciBhdmFsaWFibGUKc3BhY2UgYnkgZGVsYXlp bmcgMW1zLiBUaGUgd2FpdCBuZWVkcyB0byBiZSBvdXQgb2Ygc3BpbmxvY2tpcnEgLwp1bmxvY2su IE90aGVyd2lzZSwgbG9ja3VwIGhhcHBlbnMgYmVjYXVzZSBqaWZmaWVzIHdvbid0IGJlIHVwZGF0 ZWQKZHVyIHRvIGlycSBpcyBkaXNhYmxlZC4KCklzc3VlIGlzIGZvdW5kIGluIGlndC9nZW1fY2xv c2VfcmFjZS4KClNpZ25lZC1vZmYtYnk6IEFsZXggRGFpIDx5dS5kYWlAaW50ZWwuY29tPgotLS0K IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYyB8IDI3ICsrKysrKysr KysrKysrKysrLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDE3IGluc2VydGlvbnMoKyksIDEw IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3Vj X3N1Ym1pc3Npb24uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24u YwppbmRleCAwYTZiMDA3Li4xNDE4Mzk3IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n dWNfc3VibWlzc2lvbi5jCkBAIC0yMDEsMTAgKzIwMSwxMyBAQCBzdGF0aWMgaW50IGd1Y19yaW5n X2Rvb3JiZWxsKHN0cnVjdCBpOTE1X2d1Y19jbGllbnQgKmdjKQogCXVuaW9uIGd1Y19kb29yYmVs bF9xdyAqZGI7CiAJdm9pZCAqYmFzZTsKIAlpbnQgYXR0ZW1wdCA9IDIsIHJldCA9IC1FQUdBSU47 CisJdW5zaWduZWQgbG9uZyBmbGFnczsKIAogCWJhc2UgPSBrbWFwX2F0b21pYyhpOTE1X2dlbV9v YmplY3RfZ2V0X3BhZ2UoZ2MtPmNsaWVudF9vYmosIDApKTsKIAlkZXNjID0gYmFzZSArIGdjLT5w cm9jX2Rlc2Nfb2Zmc2V0OwogCisJc3Bpbl9sb2NrX2lycXNhdmUoJmdjLT53cV9sb2NrLCBmbGFn cyk7CisKIAkvKiBVcGRhdGUgdGhlIHRhaWwgc28gaXQgaXMgdmlzaWJsZSB0byBHdUMgKi8KIAlk ZXNjLT50YWlsID0gZ2MtPndxX3RhaWw7CiAKQEAgLTI0OCw3ICsyNTEsMTAgQEAgc3RhdGljIGlu dCBndWNfcmluZ19kb29yYmVsbChzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50ICpnYykKIAkJCWRiX2V4 Yy5jb29raWUgPSAxOwogCX0KIAorCXNwaW5fdW5sb2NrX2lycXJlc3RvcmUoJmdjLT53cV9sb2Nr LCBmbGFncyk7CisKIAlrdW5tYXBfYXRvbWljKGJhc2UpOworCiAJcmV0dXJuIHJldDsKIH0KIApA QCAtNDg3LDE2ICs0OTMsMTYgQEAgc3RhdGljIGludCBndWNfZ2V0X3dvcmtxdWV1ZV9zcGFjZShz dHJ1Y3QgaTkxNV9ndWNfY2xpZW50ICpnYywgdTMyICpvZmZzZXQpCiAJc3RydWN0IGd1Y19wcm9j ZXNzX2Rlc2MgKmRlc2M7CiAJdm9pZCAqYmFzZTsKIAl1MzIgc2l6ZSA9IHNpemVvZihzdHJ1Y3Qg Z3VjX3dxX2l0ZW0pOwotCWludCByZXQgPSAwLCB0aW1lb3V0X2NvdW50ZXIgPSAyMDA7CisJaW50 IHJldCA9IC1FVElNRURPVVQsIHRpbWVvdXRfY291bnRlciA9IDIwMDsKKwl1bnNpZ25lZCBsb25n IGZsYWdzOwogCiAJYmFzZSA9IGttYXBfYXRvbWljKGk5MTVfZ2VtX29iamVjdF9nZXRfcGFnZShn Yy0+Y2xpZW50X29iaiwgMCkpOwogCWRlc2MgPSBiYXNlICsgZ2MtPnByb2NfZGVzY19vZmZzZXQ7 CiAKIAl3aGlsZSAodGltZW91dF9jb3VudGVyLS0gPiAwKSB7Ci0JCXJldCA9IHdhaXRfZm9yX2F0 b21pYyhDSVJDX1NQQUNFKGdjLT53cV90YWlsLCBkZXNjLT5oZWFkLAotCQkJCWdjLT53cV9zaXpl KSA+PSBzaXplLCAxKTsKKwkJc3Bpbl9sb2NrX2lycXNhdmUoJmdjLT53cV9sb2NrLCBmbGFncyk7 CiAKLQkJaWYgKCFyZXQpIHsKKwkJaWYgKENJUkNfU1BBQ0UoZ2MtPndxX3RhaWwsIGRlc2MtPmhl YWQsIGdjLT53cV9zaXplKSA+PSBzaXplKSB7CiAJCQkqb2Zmc2V0ID0gZ2MtPndxX3RhaWw7CiAK IAkJCS8qIGFkdmFuY2UgdGhlIHRhaWwgZm9yIG5leHQgd29ya3F1ZXVlIGl0ZW0gKi8KQEAgLTUw NSw3ICs1MTEsMTMgQEAgc3RhdGljIGludCBndWNfZ2V0X3dvcmtxdWV1ZV9zcGFjZShzdHJ1Y3Qg aTkxNV9ndWNfY2xpZW50ICpnYywgdTMyICpvZmZzZXQpCiAKIAkJCS8qIHRoaXMgd2lsbCBicmVh ayB0aGUgbG9vcCAqLwogCQkJdGltZW91dF9jb3VudGVyID0gMDsKKwkJCXJldCA9IDA7CiAJCX0K KworCQlzcGluX3VubG9ja19pcnFyZXN0b3JlKCZnYy0+d3FfbG9jaywgZmxhZ3MpOworCisJCWlm ICh0aW1lb3V0X2NvdW50ZXIpCisJCQl1c2xlZXBfcmFuZ2UoMTAwMCwgMjAwMCk7CiAJfTsKIAog CWt1bm1hcF9hdG9taWMoYmFzZSk7CkBAIC01OTcsMTkgKzYwOSwxNyBAQCBpbnQgaTkxNV9ndWNf c3VibWl0KHN0cnVjdCBpOTE1X2d1Y19jbGllbnQgKmNsaWVudCwKIHsKIAlzdHJ1Y3QgaW50ZWxf Z3VjICpndWMgPSBjbGllbnQtPmd1YzsKIAllbnVtIGludGVsX3JpbmdfaWQgcmluZ19pZCA9IHJx LT5yaW5nLT5pZDsKLQl1bnNpZ25lZCBsb25nIGZsYWdzOwogCWludCBxX3JldCwgYl9yZXQ7CiAK IAkvKiBOZWVkIHRoaXMgYmVjYXVzZSBvZiB0aGUgZGVmZXJyZWQgcGluIGN0eCBhbmQgcmluZyAq LwogCS8qIFNoYWxsIHdlIG1vdmUgdGhpcyByaWdodCBhZnRlciByaW5nIGlzIHBpbm5lZD8gKi8K IAlscl9jb250ZXh0X3VwZGF0ZShycSk7CiAKLQlzcGluX2xvY2tfaXJxc2F2ZSgmY2xpZW50LT53 cV9sb2NrLCBmbGFncyk7Ci0KIAlxX3JldCA9IGd1Y19hZGRfd29ya3F1ZXVlX2l0ZW0oY2xpZW50 LCBycSk7CiAJaWYgKHFfcmV0ID09IDApCiAJCWJfcmV0ID0gZ3VjX3JpbmdfZG9vcmJlbGwoY2xp ZW50KTsKIAorCXNwaW5fbG9jaygmZ3VjLT5ob3N0Mmd1Y19sb2NrKTsKIAljbGllbnQtPnN1Ym1p c3Npb25zW3JpbmdfaWRdICs9IDE7CiAJaWYgKHFfcmV0KSB7CiAJCWNsaWVudC0+cV9mYWlsICs9 IDE7CkBAIC02MjAsOSArNjMwLDYgQEAgaW50IGk5MTVfZ3VjX3N1Ym1pdChzdHJ1Y3QgaTkxNV9n dWNfY2xpZW50ICpjbGllbnQsCiAJfSBlbHNlIHsKIAkJY2xpZW50LT5yZXRjb2RlID0gMDsKIAl9 Ci0Jc3Bpbl91bmxvY2tfaXJxcmVzdG9yZSgmY2xpZW50LT53cV9sb2NrLCBmbGFncyk7Ci0KLQlz cGluX2xvY2soJmd1Yy0+aG9zdDJndWNfbG9jayk7CiAJZ3VjLT5zdWJtaXNzaW9uc1tyaW5nX2lk XSArPSAxOwogCWd1Yy0+bGFzdF9zZXFub1tyaW5nX2lkXSA9IHJxLT5zZXFubzsKIAlzcGluX3Vu bG9jaygmZ3VjLT5ob3N0Mmd1Y19sb2NrKTsKLS0gCjIuNS4wCgpfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVs LWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9t YWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=