From: Dave Gordon Subject: [PATCH v3 5/6] drm/i915/guc: rework guc_add_workqueue_item() Date: Fri, 6 May 2016 20:31:34 +0100 Message-ID: <1462563095-13233-5-git-send-email-david.s.gordon@intel.com> References: <1462563095-13233-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 mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTP id CDB566E2C3 for ; Fri, 6 May 2016 19:31:55 +0000 (UTC) In-Reply-To: <1462563095-13233-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 IGNhbGxpbmcgY29kZSBhcHByb3ByaWF0ZWx5LgoKdjM6CiAgTm90ZSB0aGF0IHdlJ3JlIG5vdyBw dXR0aW5nIHRoZSByZXF1ZXN0IHNlcW5vIGluIHRoZSAiZmVuY2VfaWQiIGZpZWxkCiAgb2YgZWFj aCBHdUMtd29yay1pdGVtLCBpbiBjYXNlIGl0IHR1cm5zIHVwIHNvbWV3aGVyZSB1c2VmdWwgKFR2 cnRrbykuCgpTaWduZWQtb2ZmLWJ5OiBEYXZlIEdvcmRvbiA8ZGF2aWQucy5nb3Jkb25AaW50ZWwu Y29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYyB8IDcx ICsrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZ3VjLmggICAgICAgICAgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1 Y19md2lmLmggICAgICB8ICAzICstCiAzIGZpbGVzIGNoYW5nZWQsIDM4IGluc2VydGlvbnMoKyks IDM4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Z3VjX3N1Ym1pc3Npb24uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Np b24uYwppbmRleCAyMWQzNjAzLi43OTg5N2IwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9ndWNfc3VibWlzc2lvbi5jCkBAIC00ODcsMjMgKzQ4NywyOCBAQCBpbnQgaTkxNV9ndWNfd3Ff Y2hlY2tfc3BhY2Uoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0KQogCXJldHVy biAtRUFHQUlOOwogfQogCi1zdGF0aWMgaW50IGd1Y19hZGRfd29ya3F1ZXVlX2l0ZW0oc3RydWN0 IGk5MTVfZ3VjX2NsaWVudCAqZ2MsCi0JCQkJICBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3Qg KnJxKQorc3RhdGljIHZvaWQgZ3VjX2FkZF93b3JrcXVldWVfaXRlbShzdHJ1Y3QgaTkxNV9ndWNf Y2xpZW50ICpnYywKKwkJCQkgICBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJxKQogewor CS8qIHdxaV9sZW4gaXMgaW4gRFdvcmRzLCBhbmQgZG9lcyBub3QgaW5jbHVkZSB0aGUgb25lLXdv cmQgaGVhZGVyICovCisJY29uc3Qgc2l6ZV90IHdxaV9zaXplID0gc2l6ZW9mKHN0cnVjdCBndWNf d3FfaXRlbSk7CisJY29uc3QgdTMyIHdxaV9sZW4gPSB3cWlfc2l6ZS9zaXplb2YodTMyKSAtIDE7 CiAJc3RydWN0IGd1Y19wcm9jZXNzX2Rlc2MgKmRlc2M7CiAJc3RydWN0IGd1Y193cV9pdGVtICp3 cWk7CiAJdm9pZCAqYmFzZTsKLQl1MzIgdGFpbCwgd3FfbGVuLCB3cV9vZmYsIHNwYWNlOworCXUz MiBmcmVlc3BhY2UsIHRhaWwsIHdxX29mZiwgd3FfcGFnZTsKIAogCWRlc2MgPSBnYy0+Y2xpZW50 X2Jhc2UgKyBnYy0+cHJvY19kZXNjX29mZnNldDsKLQlzcGFjZSA9IENJUkNfU1BBQ0UoZ2MtPndx X3RhaWwsIGRlc2MtPmhlYWQsIGdjLT53cV9zaXplKTsKLQlpZiAoV0FSTl9PTihzcGFjZSA8IHNp emVvZihzdHJ1Y3QgZ3VjX3dxX2l0ZW0pKSkKLQkJcmV0dXJuIC1FTk9TUEM7IC8qIHNob3VsZG4n dCBoYXBwZW4gKi8KIAotCS8qIHBvc3RpbmNyZW1lbnQgV1EgdGFpbCBmb3IgbmV4dCB0aW1lICov Ci0Jd3Ffb2ZmID0gZ2MtPndxX3RhaWw7Ci0JZ2MtPndxX3RhaWwgKz0gc2l6ZW9mKHN0cnVjdCBn dWNfd3FfaXRlbSk7Ci0JZ2MtPndxX3RhaWwgJj0gZ2MtPndxX3NpemUgLSAxOworCS8qIEZyZWUg c3BhY2UgaXMgZ3VhcmFudGVlZCwgc2VlIGk5MTVfZ3VjX3dxX2NoZWNrX3NwYWNlKCkgYWJvdmUg Ki8KKwlmcmVlc3BhY2UgPSBDSVJDX1NQQUNFKGdjLT53cV90YWlsLCBkZXNjLT5oZWFkLCBnYy0+ d3Ffc2l6ZSk7CisJR0VNX0JVR19PTihmcmVlc3BhY2UgPCB3cWlfc2l6ZSk7CisKKwkvKiBUaGUg R3VDIGZpcm13YXJlIHdhbnRzIHRoZSB0YWlsIGluZGV4IGluIFFXb3Jkcywgbm90IGJ5dGVzICov CisJdGFpbCA9IHJxLT50YWlsOworCUdFTV9CVUdfT04odGFpbCAmIDcpOworCXRhaWwgPj49IDM7 CisJR0VNX0JVR19PTih0YWlsID4gV1FfUklOR19UQUlMX01BWCk7CiAKIAkvKiBGb3Igbm93IHdv cmtxdWV1ZSBpdGVtIGlzIDQgRFdzOyB3b3JrcXVldWUgYnVmZmVyIGlzIDIgcGFnZXMuIFNvIHdl CiAJICogc2hvdWxkIG5vdCBoYXZlIHRoZSBjYXNlIHdoZXJlIHN0cnVjdHVyZSB3cWkgaXMgYWNy b3NzIHBhZ2UsIG5laXRoZXIKQEAgLTUxMiwxOSArNTE3LDIzIEBAIHN0YXRpYyBpbnQgZ3VjX2Fk ZF93b3JrcXVldWVfaXRlbShzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50ICpnYywKIAkgKiBYWFg6IGlm IG5vdCB0aGUgY2FzZSwgd2UgbmVlZCBzYXZlIGRhdGEgdG8gYSB0ZW1wIHdxaSBhbmQgY29weSBp dCB0bwogCSAqIHdvcmtxdWV1ZSBidWZmZXIgZHcgYnkgZHcuCiAJICovCi0JV0FSTl9PTihzaXpl b2Yoc3RydWN0IGd1Y193cV9pdGVtKSAhPSAxNik7Ci0JV0FSTl9PTih3cV9vZmYgJiAzKTsKKwlC VUlMRF9CVUdfT04od3FpX3NpemUgIT0gMTYpOworCisJLyogcG9zdGluY3JlbWVudCBXUSB0YWls IGZvciBuZXh0IHRpbWUgKi8KKwl3cV9vZmYgPSBnYy0+d3FfdGFpbDsKKwlnYy0+d3FfdGFpbCAr PSB3cWlfc2l6ZTsKKwlnYy0+d3FfdGFpbCAmPSBnYy0+d3Ffc2l6ZSAtIDE7CisJR0VNX0JVR19P Tih3cV9vZmYgJiAod3FpX3NpemUgLSAxKSk7CiAKLQkvKiB3cSBzdGFydHMgZnJvbSB0aGUgcGFn ZSBhZnRlciBkb29yYmVsbCAvIHByb2Nlc3NfZGVzYyAqLwotCWJhc2UgPSBrbWFwX2F0b21pYyhp OTE1X2dlbV9vYmplY3RfZ2V0X3BhZ2UoZ2MtPmNsaWVudF9vYmosCi0JCQkod3Ffb2ZmICsgR1VD X0RCX1NJWkUpID4+IFBBR0VfU0hJRlQpKTsKKwkvKiBXUSBzdGFydHMgZnJvbSB0aGUgcGFnZSBh ZnRlciBkb29yYmVsbCAvIHByb2Nlc3NfZGVzYyAqLworCXdxX3BhZ2UgPSAod3Ffb2ZmICsgR1VD X0RCX1NJWkUpID4+IFBBR0VfU0hJRlQ7CiAJd3Ffb2ZmICY9IFBBR0VfU0laRSAtIDE7CisJYmFz ZSA9IGttYXBfYXRvbWljKGk5MTVfZ2VtX29iamVjdF9nZXRfcGFnZShnYy0+Y2xpZW50X29iaiwg d3FfcGFnZSkpOwogCXdxaSA9IChzdHJ1Y3QgZ3VjX3dxX2l0ZW0gKikoKGNoYXIgKiliYXNlICsg d3Ffb2ZmKTsKIAotCS8qIGxlbiBkb2VzIG5vdCBpbmNsdWRlIHRoZSBoZWFkZXIgKi8KLQl3cV9s ZW4gPSBzaXplb2Yoc3RydWN0IGd1Y193cV9pdGVtKSAvIHNpemVvZih1MzIpIC0gMTsKKwkvKiBO b3cgZmlsbCBpbiB0aGUgNC13b3JkIHdvcmsgcXVldWUgaXRlbSAqLwogCXdxaS0+aGVhZGVyID0g V1FfVFlQRV9JTk9SREVSIHwKLQkJCSh3cV9sZW4gPDwgV1FfTEVOX1NISUZUKSB8CisJCQkod3Fp X2xlbiA8PCBXUV9MRU5fU0hJRlQpIHwKIAkJCShycS0+ZW5naW5lLT5ndWNfaWQgPDwgV1FfVEFS R0VUX1NISUZUKSB8CiAJCQlXUV9OT19XQ0ZMVVNIX1dBSVQ7CiAKQEAgLTUzMiwxNCArNTQxLDEw IEBAIHN0YXRpYyBpbnQgZ3VjX2FkZF93b3JrcXVldWVfaXRlbShzdHJ1Y3QgaTkxNV9ndWNfY2xp ZW50ICpnYywKIAl3cWktPmNvbnRleHRfZGVzYyA9ICh1MzIpaW50ZWxfbHJfY29udGV4dF9kZXNj cmlwdG9yKHJxLT5jdHgsCiAJCQkJCQkJICAgICBycS0+ZW5naW5lKTsKIAotCS8qIFRoZSBHdUMg ZmlybXdhcmUgd2FudHMgdGhlIHRhaWwgaW5kZXggaW4gUVdvcmRzLCBub3QgYnl0ZXMgKi8KLQl0 YWlsID0gcnEtPnJpbmdidWYtPnRhaWwgPj4gMzsKIAl3cWktPnJpbmdfdGFpbCA9IHRhaWwgPDwg V1FfUklOR19UQUlMX1NISUZUOwotCXdxaS0+ZmVuY2VfaWQgPSAwOyAvKlhYWDogd2hhdCBmZW5j ZSB0byBiZSBoZXJlICovCisJd3FpLT5mZW5jZV9pZCA9IHJxLT5zZXFubzsKIAogCWt1bm1hcF9h dG9taWMoYmFzZSk7Ci0KLQlyZXR1cm4gMDsKIH0KIAogLyoqCkBAIC01NjYsMjYgKzU3MSwyMCBA QCBpbnQgaTkxNV9ndWNfc3VibWl0KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcnEpCiAJ dW5zaWduZWQgaW50IGVuZ2luZV9pZCA9IHJxLT5lbmdpbmUtPmd1Y19pZDsKIAlzdHJ1Y3QgaW50 ZWxfZ3VjICpndWMgPSAmcnEtPmk5MTUtPmd1YzsKIAlzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50ICpj bGllbnQgPSBndWMtPmV4ZWNidWZfY2xpZW50OwotCWludCBxX3JldCwgYl9yZXQ7CisJaW50IGJf cmV0OwogCi0JcV9yZXQgPSBndWNfYWRkX3dvcmtxdWV1ZV9pdGVtKGNsaWVudCwgcnEpOwotCWlm IChxX3JldCA9PSAwKQotCQliX3JldCA9IGd1Y19yaW5nX2Rvb3JiZWxsKGNsaWVudCk7CisJZ3Vj X2FkZF93b3JrcXVldWVfaXRlbShjbGllbnQsIHJxKTsKKwliX3JldCA9IGd1Y19yaW5nX2Rvb3Ji ZWxsKGNsaWVudCk7CiAKIAljbGllbnQtPnN1Ym1pc3Npb25zW2VuZ2luZV9pZF0gKz0gMTsKLQlp ZiAocV9yZXQpIHsKLQkJY2xpZW50LT5xX2ZhaWwgKz0gMTsKLQkJY2xpZW50LT5yZXRjb2RlID0g cV9yZXQ7Ci0JfSBlbHNlIGlmIChiX3JldCkgeworCWNsaWVudC0+cmV0Y29kZSA9IGJfcmV0Owor CWlmIChiX3JldCkKIAkJY2xpZW50LT5iX2ZhaWwgKz0gMTsKLQkJY2xpZW50LT5yZXRjb2RlID0g cV9yZXQgPSBiX3JldDsKLQl9IGVsc2UgewotCQljbGllbnQtPnJldGNvZGUgPSAwOwotCX0KKwog CWd1Yy0+c3VibWlzc2lvbnNbZW5naW5lX2lkXSArPSAxOwogCWd1Yy0+bGFzdF9zZXFub1tlbmdp bmVfaWRdID0gcnEtPnNlcW5vOwogCi0JcmV0dXJuIHFfcmV0OworCXJldHVybiBiX3JldDsKIH0K IAogLyoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5oIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmgKaW5kZXggNDM2ZjJkNi4uMTBlMWQ1ZSAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmgKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmgKQEAgLTc0LDcgKzc0LDcgQEAgc3RydWN0IGk5MTVfZ3Vj X2NsaWVudCB7CiAJLyogR3VDIHN1Ym1pc3Npb24gc3RhdGlzdGljcyAmIHN0YXR1cyAqLwogCXVp bnQ2NF90IHN1Ym1pc3Npb25zW0dVQ19NQVhfRU5HSU5FU19OVU1dOwogCXVpbnQzMl90IG5vX3dx X3NwYWNlOwkJLyogU3BhY2UgcHJlLWNoZWNrIGZhaWxlZAkqLwotCXVpbnQzMl90IHFfZmFpbDsJ CS8qIEZhaWxlZCB0byBxdWV1ZSAoTUJaKQkqLworCXVpbnQzMl90IHFfZmFpbDsJCS8qIE5vIGxv bmdlciB1c2VkCQkqLwogCXVpbnQzMl90IGJfZmFpbDsJCS8qIERvb3JiZWxsIGZhaWx1cmUgKE1C WikJKi8KIAlpbnQgcmV0Y29kZTsJCQkvKiBSZXN1bHQgb2YgbGFzdCBndWNfc3VibWl0KCkJKi8K IH07CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfZndpZi5oIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2Z3aWYuaAppbmRleCAyZGU1N2ZmLi45NDQ3 ODZkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfZndpZi5oCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19md2lmLmgKQEAgLTcxLDcgKzcxLDgg QEAKICNkZWZpbmUgICBXUV9XT1JLTE9BRF9UT1VDSAkJKDIgPDwgV1FfV09SS0xPQURfU0hJRlQp CiAKICNkZWZpbmUgV1FfUklOR19UQUlMX1NISUZUCQkyMAotI2RlZmluZSBXUV9SSU5HX1RBSUxf TUFTSwkJKDB4N0ZGIDw8IFdRX1JJTkdfVEFJTF9TSElGVCkKKyNkZWZpbmUgV1FfUklOR19UQUlM X01BWAkJMHg3RkYJLyogMl4xMSBRV29yZHMgKi8KKyNkZWZpbmUgV1FfUklOR19UQUlMX01BU0sJ CShXUV9SSU5HX1RBSUxfTUFYIDw8IFdRX1JJTkdfVEFJTF9TSElGVCkKIAogI2RlZmluZSBHVUNf RE9PUkJFTExfRU5BQkxFRAkJMQogI2RlZmluZSBHVUNfRE9PUkJFTExfRElTQUJMRUQJCTAKLS0g CjEuOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJ bnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0 cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK