From: Dave Gordon Subject: [PATCH v3 2/3] drm/i915/guc: drop cached copy of 'wq_head' Date: Tue, 19 Apr 2016 12:45:49 +0100 Message-ID: <1461066350-32642-2-git-send-email-david.s.gordon@intel.com> References: <1461066350-32642-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 EF6C66E74B for ; Tue, 19 Apr 2016 11:45:55 +0000 (UTC) In-Reply-To: <1461066350-32642-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 RnJvbTogQWxleCBEYWkgPHl1LmRhaUBpbnRlbC5jb20+CgpOb3cgdGhhdCB3ZSBrZWVwIHRoZSBH dUMgY2xpZW50IHByb2Nlc3MgZGVzY3JpcHRvciBwZXJtYW5lbnRseSBtYXBwZWQsCndlIGRvbid0 IHJlYWxseSBuZWVkIHRvIGtlZXAgYSBsb2NhbCBjb3B5IG9mIHRoZSBHdUMncyB3b3JrLXF1ZXVl LWhlYWQuClNvIHdlIGNhbiBzaW1wbGlmeSB0aGUgY29kZSBhIGxpdHRsZSBieSBub3QgZG9pbmcg dGhpcy4KClNpZ25lZC1vZmYtYnk6IEFsZXggRGFpIDx5dS5kYWlAaW50ZWwuY29tPgpTaWduZWQt b2ZmLWJ5OiBEYXZlIEdvcmRvbiA8ZGF2aWQucy5nb3Jkb25AaW50ZWwuY29tPgotLS0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYyB8IDE2ICsrKystLS0tLS0tLS0t LS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5oICAgICAgICAgICB8ICAyICstCiAy IGZpbGVzIGNoYW5nZWQsIDUgaW5zZXJ0aW9ucygrKSwgMTMgZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jCmluZGV4IDk4YWY4Y2EuLjEzNWYw OTQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24u YworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMKQEAgLTIz OCw5ICsyMzgsNiBAQCBzdGF0aWMgaW50IGd1Y19yaW5nX2Rvb3JiZWxsKHN0cnVjdCBpOTE1X2d1 Y19jbGllbnQgKmdjKQogCQkJZGJfZXhjLmNvb2tpZSA9IDE7CiAJfQogCi0JLyogRmluYWxseSwg dXBkYXRlIHRoZSBjYWNoZWQgY29weSBvZiB0aGUgR3VDJ3MgV1EgaGVhZCAqLwotCWdjLT53cV9o ZWFkID0gZGVzYy0+aGVhZDsKLQogCXJldHVybiByZXQ7CiB9CiAKQEAgLTQ2NSwxNyArNDYyLDEw IEBAIGludCBpOTE1X2d1Y193cV9jaGVja19zcGFjZShzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50ICpn YykKIAlpZiAoIWdjKQogCQlyZXR1cm4gMDsKIAotCS8qIFF1aWNrbHkgcmV0dXJuIGlmIHdxIHNw YWNlIGlzIGF2YWlsYWJsZSBzaW5jZSBsYXN0IHRpbWUgd2UgY2FjaGUgdGhlCi0JICogaGVhZCBw b3NpdGlvbi4gKi8KLQlpZiAoQ0lSQ19TUEFDRShnYy0+d3FfdGFpbCwgZ2MtPndxX2hlYWQsIGdj LT53cV9zaXplKSA+PSBzaXplKQotCQlyZXR1cm4gMDsKLQogCWRlc2MgPSBnYy0+Y2xpZW50X2Jh c2UgKyBnYy0+cHJvY19kZXNjX29mZnNldDsKIAogCXdoaWxlICh0aW1lb3V0X2NvdW50ZXItLSA+ IDApIHsKLQkJZ2MtPndxX2hlYWQgPSBkZXNjLT5oZWFkOwotCi0JCWlmIChDSVJDX1NQQUNFKGdj LT53cV90YWlsLCBnYy0+d3FfaGVhZCwgZ2MtPndxX3NpemUpID49IHNpemUpIHsKKwkJaWYgKENJ UkNfU1BBQ0UoZ2MtPndxX3RhaWwsIGRlc2MtPmhlYWQsIGdjLT53cV9zaXplKSA+PSBzaXplKSB7 CiAJCQlyZXQgPSAwOwogCQkJYnJlYWs7CiAJCX0KQEAgLTQ5MCwxMSArNDgwLDEzIEBAIGludCBp OTE1X2d1Y193cV9jaGVja19zcGFjZShzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50ICpnYykKIHN0YXRp YyBpbnQgZ3VjX2FkZF93b3JrcXVldWVfaXRlbShzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50ICpnYywK IAkJCQkgIHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcnEpCiB7CisJc3RydWN0IGd1Y19w cm9jZXNzX2Rlc2MgKmRlc2M7CiAJc3RydWN0IGd1Y193cV9pdGVtICp3cWk7CiAJdm9pZCAqYmFz ZTsKIAl1MzIgdGFpbCwgd3FfbGVuLCB3cV9vZmYsIHNwYWNlOwogCi0Jc3BhY2UgPSBDSVJDX1NQ QUNFKGdjLT53cV90YWlsLCBnYy0+d3FfaGVhZCwgZ2MtPndxX3NpemUpOworCWRlc2MgPSBnYy0+ Y2xpZW50X2Jhc2UgKyBnYy0+cHJvY19kZXNjX29mZnNldDsKKwlzcGFjZSA9IENJUkNfU1BBQ0Uo Z2MtPndxX3RhaWwsIGRlc2MtPmhlYWQsIGdjLT53cV9zaXplKTsKIAlpZiAoV0FSTl9PTihzcGFj ZSA8IHNpemVvZihzdHJ1Y3QgZ3VjX3dxX2l0ZW0pKSkKIAkJcmV0dXJuIC1FTk9TUEM7IC8qIHNo b3VsZG4ndCBoYXBwZW4gKi8KIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZ3VjLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWMuaAppbmRleCAwNjA1MGMy NDFhLi4xOWNhNTkzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWMu aAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWMuaApAQCAtNDYsNyArNDYsNyBA QCBzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50IHsKIAl1aW50MzJfdCB3cV9vZmZzZXQ7CiAJdWludDMy X3Qgd3Ffc2l6ZTsKIAl1aW50MzJfdCB3cV90YWlsOwotCXVpbnQzMl90IHdxX2hlYWQ7CisJdWlu dDMyX3QgdW51c2VkOwkJLyogV2FzICd3cV9oZWFkJwkJKi8KIAogCS8qIEd1QyBzdWJtaXNzaW9u IHN0YXRpc3RpY3MgJiBzdGF0dXMgKi8KIAl1aW50NjRfdCBzdWJtaXNzaW9uc1tHVUNfTUFYX0VO R0lORVNfTlVNXTsKLS0gCjEuOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVl ZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m by9pbnRlbC1nZngK