From: Dave Gordon Subject: [PATCH v2 4/5] drm/i915/guc: rework guc_add_workqueue_item() Date: Wed, 27 Apr 2016 19:03:14 +0100 Message-ID: <1461780195-17434-4-git-send-email-david.s.gordon@intel.com> References: <1461780195-17434-1-git-send-email-david.s.gordon@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 544226E07D for ; Wed, 27 Apr 2016 18:04:09 +0000 (UTC) In-Reply-To: <1461780195-17434-1-git-send-email-david.s.gordon@intel.com> 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 TW9zdGx5IGxpdHRsZSBvcHRpbWlzYXRpb25zOyBmb3IgaW5zdGFuY2UsIGlmIHRoZSBkcml2ZXIg aXMgY29ycmVjdGx5CmZvbGxvd2luZyB0aGUgc3VibWlzc2lvbiBwcm90b2NvbCwgdGhlICJvdXQg b2Ygc3BhY2UiIGNvbmRpdGlvbiBpcwppbXBvc3NpYmxlLCBzbyB0aGUgcHJldmlvdXMgcnVudGlt ZSBXQVJOX09OKCkgaXMgcHJvbW90ZWQgdG8gYQpHRU1fQlVHX09OKCkgZm9yIGEgbW9yZSBkcmFt YXRpYyBlZmZlY3QgaW4gZGV2ZWxvcG1lbnQgYW5kIGxlc3MgaW1wYWN0CmluIGVuZC11c2VyIHN5 c3RlbXMuCgpTaW1pbGFybHkgd2UgY2FuIHJlcGxhY2Ugb3RoZXIgV0FSTl9PTigpIGNvbmRpdGlv bnMgdGhhdCBkb24ndCByZWxhdGUgdG8KdGhlIGhhcmR3YXJlIHN0YXRlIHdpdGggZWl0aGVyIEJV SUxEX0JVR19PTigpIGZvciBjb21waWxlLXRpbWUtCmRldGVjdGFibGUgaXNzdWVzLCBvciBHRU1f QlVHX09OKCkgZm9yIGxvZ2ljYWwgImNhbid0IGhhcHBlbiIgZXJyb3JzLgoKV2l0aCB0aG9zZSBj aGFuZ2VzLCB3ZSBjYW4gY29udmVydCBpdCB0byB2b2lkLCBhcyBzdWdnZXN0ZWQgYnkgQ2hyaXMK V2lsc29uLCBhbmQgdXBkYXRlIHRoZSBjYWxsaW5nIGNvZGUgYXBwcm9wcmlhdGVseS4KClNpZ25l ZC1vZmYtYnk6IERhdmUgR29yZG9uIDxkYXZpZC5zLmdvcmRvbkBpbnRlbC5jb20+CkNjOiBDaHJp cyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KCi0tLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jIHwgNjkgKysrKysrKysrKysrKysrLS0tLS0tLS0t LS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWMuaCAgICAgICAgICAgfCAgMiAr LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2Z3aWYuaCAgICAgIHwgIDMgKy0KIDMg ZmlsZXMgY2hhbmdlZCwgMzcgaW5zZXJ0aW9ucygrKSwgMzcgZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jCmluZGV4IDY2MjZlZmYuLjRkMmVh ODQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24u YworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMKQEAgLTQ3 MCwyMyArNDcwLDI4IEBAIGludCBpOTE1X2d1Y193cV9jaGVja19zcGFjZShzdHJ1Y3QgZHJtX2k5 MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3QpCiAJcmV0dXJuIC1FQUdBSU47CiB9CiAKLXN0YXRpYyBp bnQgZ3VjX2FkZF93b3JrcXVldWVfaXRlbShzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50ICpnYywKLQkJ CQkgIHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcnEpCitzdGF0aWMgdm9pZCBndWNfYWRk X3dvcmtxdWV1ZV9pdGVtKHN0cnVjdCBpOTE1X2d1Y19jbGllbnQgKmdjLAorCQkJCSAgIHN0cnVj dCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcnEpCiB7CisJLyogd3FpX2xlbiBpcyBpbiBEV29yZHMs IGFuZCBkb2VzIG5vdCBpbmNsdWRlIHRoZSBvbmUtd29yZCBoZWFkZXIgKi8KKwljb25zdCBzaXpl X3Qgd3FpX3NpemUgPSBzaXplb2Yoc3RydWN0IGd1Y193cV9pdGVtKTsKKwljb25zdCB1MzIgd3Fp X2xlbiA9IHdxaV9zaXplL3NpemVvZih1MzIpIC0gMTsKIAlzdHJ1Y3QgZ3VjX3Byb2Nlc3NfZGVz YyAqZGVzYzsKIAlzdHJ1Y3QgZ3VjX3dxX2l0ZW0gKndxaTsKIAl2b2lkICpiYXNlOwotCXUzMiB0 YWlsLCB3cV9sZW4sIHdxX29mZiwgc3BhY2U7CisJdTMyIHNwYWNlLCB0YWlsLCB3cV9vZmYsIHdx X3BhZ2U7CiAKIAlkZXNjID0gZ2MtPmNsaWVudF9iYXNlICsgZ2MtPnByb2NfZGVzY19vZmZzZXQ7 CisKKwkvKiBTcGFjZSB3YXMgY2hlY2tlZCBlYXJsaWVyLCBpbiBpOTE1X2d1Y193cV9jaGVja19z cGFjZSgpIGFib3ZlICovCiAJc3BhY2UgPSBDSVJDX1NQQUNFKGdjLT53cV90YWlsLCBkZXNjLT5o ZWFkLCBnYy0+d3Ffc2l6ZSk7Ci0JaWYgKFdBUk5fT04oc3BhY2UgPCBzaXplb2Yoc3RydWN0IGd1 Y193cV9pdGVtKSkpCi0JCXJldHVybiAtRU5PU1BDOyAvKiBzaG91bGRuJ3QgaGFwcGVuICovCisJ R0VNX0JVR19PTihzcGFjZSA8IHdxaV9zaXplKTsKIAotCS8qIHBvc3RpbmNyZW1lbnQgV1EgdGFp bCBmb3IgbmV4dCB0aW1lICovCi0Jd3Ffb2ZmID0gZ2MtPndxX3RhaWw7Ci0JZ2MtPndxX3RhaWwg Kz0gc2l6ZW9mKHN0cnVjdCBndWNfd3FfaXRlbSk7Ci0JZ2MtPndxX3RhaWwgJj0gZ2MtPndxX3Np emUgLSAxOworCS8qIFRoZSBHdUMgZmlybXdhcmUgd2FudHMgdGhlIHRhaWwgaW5kZXggaW4gUVdv cmRzLCBub3QgYnl0ZXMgKi8KKwl0YWlsID0gcnEtPnRhaWw7CisJR0VNX0JVR19PTih0YWlsICYg Nyk7CisJdGFpbCA+Pj0gMzsKKwlHRU1fQlVHX09OKHRhaWwgPiBXUV9SSU5HX1RBSUxfTUFYKTsK IAogCS8qIEZvciBub3cgd29ya3F1ZXVlIGl0ZW0gaXMgNCBEV3M7IHdvcmtxdWV1ZSBidWZmZXIg aXMgMiBwYWdlcy4gU28gd2UKIAkgKiBzaG91bGQgbm90IGhhdmUgdGhlIGNhc2Ugd2hlcmUgc3Ry dWN0dXJlIHdxaSBpcyBhY3Jvc3MgcGFnZSwgbmVpdGhlcgpAQCAtNDk1LDE5ICs1MDAsMjMgQEAg c3RhdGljIGludCBndWNfYWRkX3dvcmtxdWV1ZV9pdGVtKHN0cnVjdCBpOTE1X2d1Y19jbGllbnQg KmdjLAogCSAqIFhYWDogaWYgbm90IHRoZSBjYXNlLCB3ZSBuZWVkIHNhdmUgZGF0YSB0byBhIHRl bXAgd3FpIGFuZCBjb3B5IGl0IHRvCiAJICogd29ya3F1ZXVlIGJ1ZmZlciBkdyBieSBkdy4KIAkg Ki8KLQlXQVJOX09OKHNpemVvZihzdHJ1Y3QgZ3VjX3dxX2l0ZW0pICE9IDE2KTsKLQlXQVJOX09O KHdxX29mZiAmIDMpOworCUJVSUxEX0JVR19PTih3cWlfc2l6ZSAhPSAxNik7CiAKLQkvKiB3cSBz dGFydHMgZnJvbSB0aGUgcGFnZSBhZnRlciBkb29yYmVsbCAvIHByb2Nlc3NfZGVzYyAqLwotCWJh c2UgPSBrbWFwX2F0b21pYyhpOTE1X2dlbV9vYmplY3RfZ2V0X3BhZ2UoZ2MtPmNsaWVudF9vYmos Ci0JCQkod3Ffb2ZmICsgR1VDX0RCX1NJWkUpID4+IFBBR0VfU0hJRlQpKTsKKwkvKiBwb3N0aW5j cmVtZW50IFdRIHRhaWwgZm9yIG5leHQgdGltZSAqLworCXdxX29mZiA9IGdjLT53cV90YWlsOwor CWdjLT53cV90YWlsICs9IHdxaV9zaXplOworCWdjLT53cV90YWlsICY9IGdjLT53cV9zaXplIC0g MTsKKwlHRU1fQlVHX09OKHdxX29mZiAmICh3cWlfc2l6ZSAtIDEpKTsKKworCS8qIFdRIHN0YXJ0 cyBmcm9tIHRoZSBwYWdlIGFmdGVyIGRvb3JiZWxsIC8gcHJvY2Vzc19kZXNjICovCisJd3FfcGFn ZSA9ICh3cV9vZmYgKyBHVUNfREJfU0laRSkgPj4gUEFHRV9TSElGVDsKIAl3cV9vZmYgJj0gUEFH RV9TSVpFIC0gMTsKKwliYXNlID0ga21hcF9hdG9taWMoaTkxNV9nZW1fb2JqZWN0X2dldF9wYWdl KGdjLT5jbGllbnRfb2JqLCB3cV9wYWdlKSk7CiAJd3FpID0gKHN0cnVjdCBndWNfd3FfaXRlbSAq KSgoY2hhciAqKWJhc2UgKyB3cV9vZmYpOwogCi0JLyogbGVuIGRvZXMgbm90IGluY2x1ZGUgdGhl IGhlYWRlciAqLwotCXdxX2xlbiA9IHNpemVvZihzdHJ1Y3QgZ3VjX3dxX2l0ZW0pIC8gc2l6ZW9m KHUzMikgLSAxOworCS8qIE5vdyBmaWxsIGluIHRoZSA0LXdvcmQgd29yayBxdWV1ZSBpdGVtICov CiAJd3FpLT5oZWFkZXIgPSBXUV9UWVBFX0lOT1JERVIgfAotCQkJKHdxX2xlbiA8PCBXUV9MRU5f U0hJRlQpIHwKKwkJCSh3cWlfbGVuIDw8IFdRX0xFTl9TSElGVCkgfAogCQkJKHJxLT5lbmdpbmUt Pmd1Y19pZCA8PCBXUV9UQVJHRVRfU0hJRlQpIHwKIAkJCVdRX05PX1dDRkxVU0hfV0FJVDsKIApA QCAtNTE1LDE0ICs1MjQsMTAgQEAgc3RhdGljIGludCBndWNfYWRkX3dvcmtxdWV1ZV9pdGVtKHN0 cnVjdCBpOTE1X2d1Y19jbGllbnQgKmdjLAogCXdxaS0+Y29udGV4dF9kZXNjID0gKHUzMilpbnRl bF9scl9jb250ZXh0X2Rlc2NyaXB0b3IocnEtPmN0eCwKIAkJCQkJCQkgICAgIHJxLT5lbmdpbmUp OwogCi0JLyogVGhlIEd1QyBmaXJtd2FyZSB3YW50cyB0aGUgdGFpbCBpbmRleCBpbiBRV29yZHMs IG5vdCBieXRlcyAqLwotCXRhaWwgPSBycS0+cmluZ2J1Zi0+dGFpbCA+PiAzOwogCXdxaS0+cmlu Z190YWlsID0gdGFpbCA8PCBXUV9SSU5HX1RBSUxfU0hJRlQ7Ci0Jd3FpLT5mZW5jZV9pZCA9IDA7 IC8qWFhYOiB3aGF0IGZlbmNlIHRvIGJlIGhlcmUgKi8KKwl3cWktPmZlbmNlX2lkID0gcnEtPnNl cW5vOwogCiAJa3VubWFwX2F0b21pYyhiYXNlKTsKLQotCXJldHVybiAwOwogfQogCiAvKioKQEAg LTUzNywyNiArNTQyLDIwIEBAIGludCBpOTE1X2d1Y19zdWJtaXQoc3RydWN0IGRybV9pOTE1X2dl bV9yZXF1ZXN0ICpycSkKIAl1bnNpZ25lZCBpbnQgZW5naW5lX2lkID0gcnEtPmVuZ2luZS0+Z3Vj X2lkOwogCXN0cnVjdCBpbnRlbF9ndWMgKmd1YyA9ICZycS0+aTkxNS0+Z3VjOwogCXN0cnVjdCBp OTE1X2d1Y19jbGllbnQgKmNsaWVudCA9IGd1Yy0+ZXhlY2J1Zl9jbGllbnQ7Ci0JaW50IHFfcmV0 LCBiX3JldDsKKwlpbnQgYl9yZXQ7CiAKLQlxX3JldCA9IGd1Y19hZGRfd29ya3F1ZXVlX2l0ZW0o Y2xpZW50LCBycSk7Ci0JaWYgKHFfcmV0ID09IDApCi0JCWJfcmV0ID0gZ3VjX3JpbmdfZG9vcmJl bGwoY2xpZW50KTsKKwlndWNfYWRkX3dvcmtxdWV1ZV9pdGVtKGNsaWVudCwgcnEpOworCWJfcmV0 ID0gZ3VjX3JpbmdfZG9vcmJlbGwoY2xpZW50KTsKIAogCWNsaWVudC0+c3VibWlzc2lvbnNbZW5n aW5lX2lkXSArPSAxOwotCWlmIChxX3JldCkgewotCQljbGllbnQtPnFfZmFpbCArPSAxOwotCQlj bGllbnQtPnJldGNvZGUgPSBxX3JldDsKLQl9IGVsc2UgaWYgKGJfcmV0KSB7CisJY2xpZW50LT5y ZXRjb2RlID0gYl9yZXQ7CisJaWYgKGJfcmV0KQogCQljbGllbnQtPmJfZmFpbCArPSAxOwotCQlj bGllbnQtPnJldGNvZGUgPSBxX3JldCA9IGJfcmV0OwotCX0gZWxzZSB7Ci0JCWNsaWVudC0+cmV0 Y29kZSA9IDA7Ci0JfQorCiAJZ3VjLT5zdWJtaXNzaW9uc1tlbmdpbmVfaWRdICs9IDE7CiAJZ3Vj LT5sYXN0X3NlcW5vW2VuZ2luZV9pZF0gPSBycS0+c2Vxbm87CiAKLQlyZXR1cm4gcV9yZXQ7CisJ cmV0dXJuIGJfcmV0OwogfQogCiAvKgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZ3VjLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWMuaAppbmRleCA0MzZm MmQ2Li4xMGUxZDVlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWMu aAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWMuaApAQCAtNzQsNyArNzQsNyBA QCBzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50IHsKIAkvKiBHdUMgc3VibWlzc2lvbiBzdGF0aXN0aWNz ICYgc3RhdHVzICovCiAJdWludDY0X3Qgc3VibWlzc2lvbnNbR1VDX01BWF9FTkdJTkVTX05VTV07 CiAJdWludDMyX3Qgbm9fd3Ffc3BhY2U7CQkvKiBTcGFjZSBwcmUtY2hlY2sgZmFpbGVkCSovCi0J dWludDMyX3QgcV9mYWlsOwkJLyogRmFpbGVkIHRvIHF1ZXVlIChNQlopCSovCisJdWludDMyX3Qg cV9mYWlsOwkJLyogTm8gbG9uZ2VyIHVzZWQJCSovCiAJdWludDMyX3QgYl9mYWlsOwkJLyogRG9v cmJlbGwgZmFpbHVyZSAoTUJaKQkqLwogCWludCByZXRjb2RlOwkJCS8qIFJlc3VsdCBvZiBsYXN0 IGd1Y19zdWJtaXQoKQkqLwogfTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2d1Y19md2lmLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfZndpZi5oCmlu ZGV4IDJkZTU3ZmYuLjk0NDc4NmQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2d1Y19md2lmLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2Z3aWYu aApAQCAtNzEsNyArNzEsOCBAQAogI2RlZmluZSAgIFdRX1dPUktMT0FEX1RPVUNICQkoMiA8PCBX UV9XT1JLTE9BRF9TSElGVCkKIAogI2RlZmluZSBXUV9SSU5HX1RBSUxfU0hJRlQJCTIwCi0jZGVm aW5lIFdRX1JJTkdfVEFJTF9NQVNLCQkoMHg3RkYgPDwgV1FfUklOR19UQUlMX1NISUZUKQorI2Rl ZmluZSBXUV9SSU5HX1RBSUxfTUFYCQkweDdGRgkvKiAyXjExIFFXb3JkcyAqLworI2RlZmluZSBX UV9SSU5HX1RBSUxfTUFTSwkJKFdRX1JJTkdfVEFJTF9NQVggPDwgV1FfUklOR19UQUlMX1NISUZU KQogCiAjZGVmaW5lIEdVQ19ET09SQkVMTF9FTkFCTEVECQkxCiAjZGVmaW5lIEdVQ19ET09SQkVM TF9ESVNBQkxFRAkJMAotLSAKMS45LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZy ZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3Rp bmZvL2ludGVsLWdmeAo=