From: Dave Gordon Subject: [PATCH v4 6/7] drm/i915/guc: rework guc_add_workqueue_item() Date: Fri, 13 May 2016 15:36:34 +0100 Message-ID: <1463150195-28805-7-git-send-email-david.s.gordon@intel.com> References: <1463150195-28805-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 mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 115716E595 for ; Fri, 13 May 2016 14:37:13 +0000 (UTC) In-Reply-To: <1463150195-28805-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 TW9zdGx5IGxpdHRsZSBvcHRpbWlzYXRpb25zIGFuZCBmdXR1cmUtcHJvb2ZpbmcgYWdhaW5zdCBj b2RlIGJyZWFrYWdlLgpGb3IgaW5zdGFuY2UsIGlmIHRoZSBkcml2ZXIgaXMgY29ycmVjdGx5IGZv bGxvd2luZyB0aGUgc3VibWlzc2lvbgpwcm90b2NvbCwgdGhlICJvdXQgb2Ygc3BhY2UiIGNvbmRp dGlvbiBpcyBpbXBvc3NpYmxlLCBzbyB0aGUgcHJldmlvdXMKcnVudGltZSBXQVJOX09OKCkgaXMg cHJvbW90ZWQgdG8gYSBHRU1fQlVHX09OKCkgZm9yIGEgbW9yZSBkcmFtYXRpYwplZmZlY3QgaW4g ZGV2ZWxvcG1lbnQgYW5kIGxlc3MgaW1wYWN0IGluIGVuZC11c2VyIHN5c3RlbXMuCgpTaW1pbGFy bHkgd2UgY2FuIG1ha2UgYWxpZ25tZW50IGNoZWNraW5nIG1vcmUgc3RyaW5nZW50IGFuZCByZXBs YWNlCm90aGVyIFdBUk5fT04oKSBjb25kaXRpb25zIHRoYXQgZG9uJ3QgcmVsYXRlIHRvIHRoZSBy dW50aW1lIGhhcmR3YXJlCnN0YXRlIHdpdGggZWl0aGVyIEJVSUxEX0JVR19PTigpIGZvciBjb21w aWxlLXRpbWUtZGV0ZWN0YWJsZSBpc3N1ZXMsIG9yCkdFTV9CVUdfT04oKSBmb3IgbG9naWNhbCAi Y2FuJ3QgaGFwcGVuIiBlcnJvcnMuCgpXaXRoIHRob3NlIGNoYW5nZXMsIHdlIGNhbiBjb252ZXJ0 IGl0IHRvIHZvaWQsIGFzIHN1Z2dlc3RlZCBieSBDaHJpcwpXaWxzb24sIGFuZCB1cGRhdGUgdGhl IGNhbGxpbmcgY29kZSBhcHByb3ByaWF0ZWx5LgoKdjI6CiAgICBOb3RlIHRoYXQgd2UncmUgbm93 IHB1dHRpbmcgdGhlIHJlcXVlc3Qgc2Vxbm8gaW4gdGhlICJmZW5jZV9pZCIKICAgIGZpZWxkIG9m IGVhY2ggR3VDLXdvcmstaXRlbSwgaW4gY2FzZSBpdCB0dXJucyB1cCBzb21ld2hlcmUgdXNlZnVs CiAgICAoZS5nLiBpbiBhIEd1QyBsb2cpIFtUdnJ0a28gVXJzdWxpbl0uCgpTaWduZWQtb2ZmLWJ5 OiBEYXZlIEdvcmRvbiA8ZGF2aWQucy5nb3Jkb25AaW50ZWwuY29tPgpSZXZpZXdlZC1ieTogVHZy dGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMgfCA3MSArKysrKysrKysrKysrKystLS0tLS0t LS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5oICAgICAgICAgICB8ICAy ICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfZndpZi5oICAgICAgfCAgMyArLQog MyBmaWxlcyBjaGFuZ2VkLCAzOCBpbnNlcnRpb25zKCspLCAzOCBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMKaW5kZXggODViMmI4OS4uNDJh ODUwOCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lv bi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYwpAQCAt NDg2LDIzICs0ODYsMjggQEAgaW50IGk5MTVfZ3VjX3dxX2NoZWNrX3NwYWNlKHN0cnVjdCBkcm1f aTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVzdCkKIAlyZXR1cm4gLUVBR0FJTjsKIH0KIAotc3RhdGlj IGludCBndWNfYWRkX3dvcmtxdWV1ZV9pdGVtKHN0cnVjdCBpOTE1X2d1Y19jbGllbnQgKmdjLAot CQkJCSAgc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpycSkKK3N0YXRpYyB2b2lkIGd1Y19h ZGRfd29ya3F1ZXVlX2l0ZW0oc3RydWN0IGk5MTVfZ3VjX2NsaWVudCAqZ2MsCisJCQkJICAgc3Ry dWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpycSkKIHsKKwkvKiB3cWlfbGVuIGlzIGluIERXb3Jk cywgYW5kIGRvZXMgbm90IGluY2x1ZGUgdGhlIG9uZS13b3JkIGhlYWRlciAqLworCWNvbnN0IHNp emVfdCB3cWlfc2l6ZSA9IHNpemVvZihzdHJ1Y3QgZ3VjX3dxX2l0ZW0pOworCWNvbnN0IHUzMiB3 cWlfbGVuID0gd3FpX3NpemUvc2l6ZW9mKHUzMikgLSAxOwogCXN0cnVjdCBndWNfcHJvY2Vzc19k ZXNjICpkZXNjOwogCXN0cnVjdCBndWNfd3FfaXRlbSAqd3FpOwogCXZvaWQgKmJhc2U7Ci0JdTMy IHRhaWwsIHdxX2xlbiwgd3Ffb2ZmLCBzcGFjZTsKKwl1MzIgZnJlZXNwYWNlLCB0YWlsLCB3cV9v ZmYsIHdxX3BhZ2U7CiAKIAlkZXNjID0gZ2MtPmNsaWVudF9iYXNlICsgZ2MtPnByb2NfZGVzY19v ZmZzZXQ7Ci0Jc3BhY2UgPSBDSVJDX1NQQUNFKGdjLT53cV90YWlsLCBkZXNjLT5oZWFkLCBnYy0+ d3Ffc2l6ZSk7Ci0JaWYgKFdBUk5fT04oc3BhY2UgPCBzaXplb2Yoc3RydWN0IGd1Y193cV9pdGVt KSkpCi0JCXJldHVybiAtRU5PU1BDOyAvKiBzaG91bGRuJ3QgaGFwcGVuICovCiAKLQkvKiBwb3N0 aW5jcmVtZW50IFdRIHRhaWwgZm9yIG5leHQgdGltZSAqLwotCXdxX29mZiA9IGdjLT53cV90YWls OwotCWdjLT53cV90YWlsICs9IHNpemVvZihzdHJ1Y3QgZ3VjX3dxX2l0ZW0pOwotCWdjLT53cV90 YWlsICY9IGdjLT53cV9zaXplIC0gMTsKKwkvKiBGcmVlIHNwYWNlIGlzIGd1YXJhbnRlZWQsIHNl ZSBpOTE1X2d1Y193cV9jaGVja19zcGFjZSgpIGFib3ZlICovCisJZnJlZXNwYWNlID0gQ0lSQ19T UEFDRShnYy0+d3FfdGFpbCwgZGVzYy0+aGVhZCwgZ2MtPndxX3NpemUpOworCUdFTV9CVUdfT04o ZnJlZXNwYWNlIDwgd3FpX3NpemUpOworCisJLyogVGhlIEd1QyBmaXJtd2FyZSB3YW50cyB0aGUg dGFpbCBpbmRleCBpbiBRV29yZHMsIG5vdCBieXRlcyAqLworCXRhaWwgPSBycS0+dGFpbDsKKwlH RU1fQlVHX09OKHRhaWwgJiA3KTsKKwl0YWlsID4+PSAzOworCUdFTV9CVUdfT04odGFpbCA+IFdR X1JJTkdfVEFJTF9NQVgpOwogCiAJLyogRm9yIG5vdyB3b3JrcXVldWUgaXRlbSBpcyA0IERXczsg d29ya3F1ZXVlIGJ1ZmZlciBpcyAyIHBhZ2VzLiBTbyB3ZQogCSAqIHNob3VsZCBub3QgaGF2ZSB0 aGUgY2FzZSB3aGVyZSBzdHJ1Y3R1cmUgd3FpIGlzIGFjcm9zcyBwYWdlLCBuZWl0aGVyCkBAIC01 MTEsMTkgKzUxNiwyMyBAQCBzdGF0aWMgaW50IGd1Y19hZGRfd29ya3F1ZXVlX2l0ZW0oc3RydWN0 IGk5MTVfZ3VjX2NsaWVudCAqZ2MsCiAJICogWFhYOiBpZiBub3QgdGhlIGNhc2UsIHdlIG5lZWQg c2F2ZSBkYXRhIHRvIGEgdGVtcCB3cWkgYW5kIGNvcHkgaXQgdG8KIAkgKiB3b3JrcXVldWUgYnVm ZmVyIGR3IGJ5IGR3LgogCSAqLwotCVdBUk5fT04oc2l6ZW9mKHN0cnVjdCBndWNfd3FfaXRlbSkg IT0gMTYpOwotCVdBUk5fT04od3Ffb2ZmICYgMyk7CisJQlVJTERfQlVHX09OKHdxaV9zaXplICE9 IDE2KTsKKworCS8qIHBvc3RpbmNyZW1lbnQgV1EgdGFpbCBmb3IgbmV4dCB0aW1lICovCisJd3Ff b2ZmID0gZ2MtPndxX3RhaWw7CisJZ2MtPndxX3RhaWwgKz0gd3FpX3NpemU7CisJZ2MtPndxX3Rh aWwgJj0gZ2MtPndxX3NpemUgLSAxOworCUdFTV9CVUdfT04od3Ffb2ZmICYgKHdxaV9zaXplIC0g MSkpOwogCi0JLyogd3Egc3RhcnRzIGZyb20gdGhlIHBhZ2UgYWZ0ZXIgZG9vcmJlbGwgLyBwcm9j ZXNzX2Rlc2MgKi8KLQliYXNlID0ga21hcF9hdG9taWMoaTkxNV9nZW1fb2JqZWN0X2dldF9wYWdl KGdjLT5jbGllbnRfb2JqLAotCQkJKHdxX29mZiArIEdVQ19EQl9TSVpFKSA+PiBQQUdFX1NISUZU KSk7CisJLyogV1Egc3RhcnRzIGZyb20gdGhlIHBhZ2UgYWZ0ZXIgZG9vcmJlbGwgLyBwcm9jZXNz X2Rlc2MgKi8KKwl3cV9wYWdlID0gKHdxX29mZiArIEdVQ19EQl9TSVpFKSA+PiBQQUdFX1NISUZU OwogCXdxX29mZiAmPSBQQUdFX1NJWkUgLSAxOworCWJhc2UgPSBrbWFwX2F0b21pYyhpOTE1X2dl bV9vYmplY3RfZ2V0X3BhZ2UoZ2MtPmNsaWVudF9vYmosIHdxX3BhZ2UpKTsKIAl3cWkgPSAoc3Ry dWN0IGd1Y193cV9pdGVtICopKChjaGFyICopYmFzZSArIHdxX29mZik7CiAKLQkvKiBsZW4gZG9l cyBub3QgaW5jbHVkZSB0aGUgaGVhZGVyICovCi0Jd3FfbGVuID0gc2l6ZW9mKHN0cnVjdCBndWNf d3FfaXRlbSkgLyBzaXplb2YodTMyKSAtIDE7CisJLyogTm93IGZpbGwgaW4gdGhlIDQtd29yZCB3 b3JrIHF1ZXVlIGl0ZW0gKi8KIAl3cWktPmhlYWRlciA9IFdRX1RZUEVfSU5PUkRFUiB8Ci0JCQko d3FfbGVuIDw8IFdRX0xFTl9TSElGVCkgfAorCQkJKHdxaV9sZW4gPDwgV1FfTEVOX1NISUZUKSB8 CiAJCQkocnEtPmVuZ2luZS0+Z3VjX2lkIDw8IFdRX1RBUkdFVF9TSElGVCkgfAogCQkJV1FfTk9f V0NGTFVTSF9XQUlUOwogCkBAIC01MzEsMTQgKzU0MCwxMCBAQCBzdGF0aWMgaW50IGd1Y19hZGRf d29ya3F1ZXVlX2l0ZW0oc3RydWN0IGk5MTVfZ3VjX2NsaWVudCAqZ2MsCiAJd3FpLT5jb250ZXh0 X2Rlc2MgPSAodTMyKWludGVsX2xyX2NvbnRleHRfZGVzY3JpcHRvcihycS0+Y3R4LAogCQkJCQkJ CSAgICAgcnEtPmVuZ2luZSk7CiAKLQkvKiBUaGUgR3VDIGZpcm13YXJlIHdhbnRzIHRoZSB0YWls IGluZGV4IGluIFFXb3Jkcywgbm90IGJ5dGVzICovCi0JdGFpbCA9IHJxLT5yaW5nYnVmLT50YWls ID4+IDM7CiAJd3FpLT5yaW5nX3RhaWwgPSB0YWlsIDw8IFdRX1JJTkdfVEFJTF9TSElGVDsKLQl3 cWktPmZlbmNlX2lkID0gMDsgLypYWFg6IHdoYXQgZmVuY2UgdG8gYmUgaGVyZSAqLworCXdxaS0+ ZmVuY2VfaWQgPSBycS0+c2Vxbm87CiAKIAlrdW5tYXBfYXRvbWljKGJhc2UpOwotCi0JcmV0dXJu IDA7CiB9CiAKIC8qKgpAQCAtNTY1LDI2ICs1NzAsMjAgQEAgaW50IGk5MTVfZ3VjX3N1Ym1pdChz dHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJxKQogCXVuc2lnbmVkIGludCBlbmdpbmVfaWQg PSBycS0+ZW5naW5lLT5ndWNfaWQ7CiAJc3RydWN0IGludGVsX2d1YyAqZ3VjID0gJnJxLT5pOTE1 LT5ndWM7CiAJc3RydWN0IGk5MTVfZ3VjX2NsaWVudCAqY2xpZW50ID0gZ3VjLT5leGVjYnVmX2Ns aWVudDsKLQlpbnQgcV9yZXQsIGJfcmV0OworCWludCBiX3JldDsKIAotCXFfcmV0ID0gZ3VjX2Fk ZF93b3JrcXVldWVfaXRlbShjbGllbnQsIHJxKTsKLQlpZiAocV9yZXQgPT0gMCkKLQkJYl9yZXQg PSBndWNfcmluZ19kb29yYmVsbChjbGllbnQpOworCWd1Y19hZGRfd29ya3F1ZXVlX2l0ZW0oY2xp ZW50LCBycSk7CisJYl9yZXQgPSBndWNfcmluZ19kb29yYmVsbChjbGllbnQpOwogCiAJY2xpZW50 LT5zdWJtaXNzaW9uc1tlbmdpbmVfaWRdICs9IDE7Ci0JaWYgKHFfcmV0KSB7Ci0JCWNsaWVudC0+ cV9mYWlsICs9IDE7Ci0JCWNsaWVudC0+cmV0Y29kZSA9IHFfcmV0OwotCX0gZWxzZSBpZiAoYl9y ZXQpIHsKKwljbGllbnQtPnJldGNvZGUgPSBiX3JldDsKKwlpZiAoYl9yZXQpCiAJCWNsaWVudC0+ Yl9mYWlsICs9IDE7Ci0JCWNsaWVudC0+cmV0Y29kZSA9IHFfcmV0ID0gYl9yZXQ7Ci0JfSBlbHNl IHsKLQkJY2xpZW50LT5yZXRjb2RlID0gMDsKLQl9CisKIAlndWMtPnN1Ym1pc3Npb25zW2VuZ2lu ZV9pZF0gKz0gMTsKIAlndWMtPmxhc3Rfc2Vxbm9bZW5naW5lX2lkXSA9IHJxLT5zZXFubzsKIAot CXJldHVybiBxX3JldDsKKwlyZXR1cm4gYl9yZXQ7CiB9CiAKIC8qCmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWMuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2d1Yy5oCmluZGV4IDM4MGE3NDMuLjdiMWE1YTMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2d1Yy5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5o CkBAIC04MSw3ICs4MSw3IEBAIHN0cnVjdCBpOTE1X2d1Y19jbGllbnQgewogCXVpbnQzMl90IHVu dXNlZDsJCS8qIFdhcyAnd3FfaGVhZCcJCSovCiAKIAl1aW50MzJfdCBub193cV9zcGFjZTsKLQl1 aW50MzJfdCBxX2ZhaWw7CisJdWludDMyX3QgcV9mYWlsOwkJLyogTm8gbG9uZ2VyIHVzZWQJCSov CiAJdWludDMyX3QgYl9mYWlsOwogCWludCByZXRjb2RlOwogCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfZndpZi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZ3VjX2Z3aWYuaAppbmRleCAyZGU1N2ZmLi45NDQ3ODZkIDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfZndpZi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2d1Y19md2lmLmgKQEAgLTcxLDcgKzcxLDggQEAKICNkZWZpbmUgICBXUV9XT1JLTE9B RF9UT1VDSAkJKDIgPDwgV1FfV09SS0xPQURfU0hJRlQpCiAKICNkZWZpbmUgV1FfUklOR19UQUlM X1NISUZUCQkyMAotI2RlZmluZSBXUV9SSU5HX1RBSUxfTUFTSwkJKDB4N0ZGIDw8IFdRX1JJTkdf VEFJTF9TSElGVCkKKyNkZWZpbmUgV1FfUklOR19UQUlMX01BWAkJMHg3RkYJLyogMl4xMSBRV29y ZHMgKi8KKyNkZWZpbmUgV1FfUklOR19UQUlMX01BU0sJCShXUV9SSU5HX1RBSUxfTUFYIDw8IFdR X1JJTkdfVEFJTF9TSElGVCkKIAogI2RlZmluZSBHVUNfRE9PUkJFTExfRU5BQkxFRAkJMQogI2Rl ZmluZSBHVUNfRE9PUkJFTExfRElTQUJMRUQJCTAKLS0gCjEuOS4xCgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0Cklu dGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK