From: Dave Gordon Subject: [PATCH 3/3] drm/i915/guc: drop cached copy of 'wq_head' Date: Thu, 14 Apr 2016 18:19:02 +0100 Message-ID: <1460654342-6071-3-git-send-email-david.s.gordon@intel.com> References: <1460654342-6071-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 mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 32BC86EAA6 for ; Thu, 14 Apr 2016 17:19:24 +0000 (UTC) In-Reply-To: <1460654342-6071-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 dUMgY2xpZW50IHN0cnVjdHVyZSAoYW5kIHRoZXJlZm9yZSB0aGUgcHJvY2VzcwpkZXNjcmlwdG9y IGVtYmVkZGVkIHRoZXJlaW4pIHBlcm1hbmVudGx5IG1hcHBlZCwgd2UgZG9uJ3QgcmVhbGx5IG5l ZWQgdG8Ka2VlcCBhIGxvY2FsIGNvcHkgb2YgdGhlIEd1QydzIHdvcmstcXVldWUtaGVhZC4gU28g d2UgY2FuIHNpbXBsaWZ5IHRoZQpjb2RlIGEgbGl0dGxlIGJ5IG5vdCBkb2luZyB0aGlzLgoKU2ln bmVkLW9mZi1ieTogQWxleCBEYWkgPHl1LmRhaUBpbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IERh dmUgR29yZG9uIDxkYXZpZC5zLmdvcmRvbkBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jIHwgMTYgKysrKy0tLS0tLS0tLS0tLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmggICAgICAgICAgIHwgIDIgKy0KIDIgZmlsZXMgY2hh bmdlZCwgNSBpbnNlcnRpb25zKCspLCAxMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMKaW5kZXggZmJkNTdjYS4uZmMyNzU5OSAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYwpAQCAtMjM4LDkgKzIzOCw2 IEBAIHN0YXRpYyBpbnQgZ3VjX3JpbmdfZG9vcmJlbGwoc3RydWN0IGk5MTVfZ3VjX2NsaWVudCAq Z2MpCiAJCQlkYl9leGMuY29va2llID0gMTsKIAl9CiAKLQkvKiBGaW5hbGx5LCB1cGRhdGUgdGhl IGNhY2hlZCBjb3B5IG9mIHRoZSBHdUMncyBXUSBoZWFkICovCi0JZ2MtPndxX2hlYWQgPSBkZXNj LT5oZWFkOwotCiAJcmV0dXJuIHJldDsKIH0KIApAQCAtNDY1LDE3ICs0NjIsMTAgQEAgaW50IGk5 MTVfZ3VjX3dxX2NoZWNrX3NwYWNlKHN0cnVjdCBpOTE1X2d1Y19jbGllbnQgKmdjKQogCWlmICgh Z2MpCiAJCXJldHVybiAwOwogCi0JLyogUXVpY2tseSByZXR1cm4gaWYgd3Egc3BhY2UgaXMgYXZh aWxhYmxlIHNpbmNlIGxhc3QgdGltZSB3ZSBjYWNoZSB0aGUKLQkgKiBoZWFkIHBvc2l0aW9uLiAq LwotCWlmIChDSVJDX1NQQUNFKGdjLT53cV90YWlsLCBnYy0+d3FfaGVhZCwgZ2MtPndxX3NpemUp ID49IHNpemUpCi0JCXJldHVybiAwOwotCiAJZGVzYyA9IGdjLT5jbGllbnRfYmFzZSArIGdjLT5w cm9jX2Rlc2Nfb2Zmc2V0OwogCiAJd2hpbGUgKHRpbWVvdXRfY291bnRlci0tID4gMCkgewotCQln Yy0+d3FfaGVhZCA9IGRlc2MtPmhlYWQ7Ci0KLQkJaWYgKENJUkNfU1BBQ0UoZ2MtPndxX3RhaWws IGdjLT53cV9oZWFkLCBnYy0+d3Ffc2l6ZSkgPj0gc2l6ZSkgeworCQlpZiAoQ0lSQ19TUEFDRShn Yy0+d3FfdGFpbCwgZGVzYy0+aGVhZCwgZ2MtPndxX3NpemUpID49IHNpemUpIHsKIAkJCXJldCA9 IDA7CiAJCQlicmVhazsKIAkJfQpAQCAtNDkwLDEwICs0ODAsMTIgQEAgaW50IGk5MTVfZ3VjX3dx X2NoZWNrX3NwYWNlKHN0cnVjdCBpOTE1X2d1Y19jbGllbnQgKmdjKQogc3RhdGljIGludCBndWNf YWRkX3dvcmtxdWV1ZV9pdGVtKHN0cnVjdCBpOTE1X2d1Y19jbGllbnQgKmdjLAogCQkJCSAgc3Ry dWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpycSkKIHsKKwlzdHJ1Y3QgZ3VjX3Byb2Nlc3NfZGVz YyAqZGVzYzsKIAlzdHJ1Y3QgZ3VjX3dxX2l0ZW0gKndxaTsKIAl1MzIgdGFpbCwgd3FfbGVuLCB3 cV9vZmYsIHNwYWNlOwogCi0Jc3BhY2UgPSBDSVJDX1NQQUNFKGdjLT53cV90YWlsLCBnYy0+d3Ff aGVhZCwgZ2MtPndxX3NpemUpOworCWRlc2MgPSBnYy0+Y2xpZW50X2Jhc2UgKyBnYy0+cHJvY19k ZXNjX29mZnNldDsKKwlzcGFjZSA9IENJUkNfU1BBQ0UoZ2MtPndxX3RhaWwsIGRlc2MtPmhlYWQs IGdjLT53cV9zaXplKTsKIAlpZiAoV0FSTl9PTihzcGFjZSA8IHNpemVvZihzdHJ1Y3QgZ3VjX3dx X2l0ZW0pKSkKIAkJcmV0dXJuIC1FTk9TUEM7IC8qIHNob3VsZG4ndCBoYXBwZW4gKi8KIApkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmggYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9ndWMuaAppbmRleCA5YWIzNTY0Li41NTg3OTNiIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWMuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9ndWMuaApAQCAtNDYsNyArNDYsNyBAQCBzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50IHsK IAl1aW50MzJfdCB3cV9vZmZzZXQ7CiAJdWludDMyX3Qgd3Ffc2l6ZTsKIAl1aW50MzJfdCB3cV90 YWlsOwotCXVpbnQzMl90IHdxX2hlYWQ7CisJdWludDMyX3QgdW51c2VkOwkJLyogV2FzICd3cV9o ZWFkJwkJKi8KIAogCS8qIEd1QyBzdWJtaXNzaW9uIHN0YXRpc3RpY3MgJiBzdGF0dXMgKi8KIAl1 aW50NjRfdCBzdWJtaXNzaW9uc1tHVUNfTUFYX0VOR0lORVNfTlVNXTsKLS0gCjEuOS4xCgpfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFp bGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK