From: Dave Gordon Subject: [PATCH v2 3/3] drm/i915/guc: drop cached copy of 'wq_head' Date: Mon, 18 Apr 2016 11:15:09 +0100 Message-ID: <1460974509-22616-3-git-send-email-david.s.gordon@intel.com> References: <5710D3AF.3000004@linux.intel.com> <1460974509-22616-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 ESMTPS id 562286E57C for ; Mon, 18 Apr 2016 10:15:19 +0000 (UTC) In-Reply-To: <1460974509-22616-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 ZWQKdG8ga2VlcCBhIGxvY2FsIGNvcHkgb2YgdGhlIEd1QydzIHdvcmstcXVldWUtaGVhZC4gU28g d2UgY2FuIHNpbXBsaWZ5CnRoZSBjb2RlIGEgbGl0dGxlIGJ5IG5vdCBkb2luZyB0aGlzLiBBbHNv LCBvcHRpbWlzZSBhd2F5IGEgZmV3IGNhbGxzCmJ5IGNhY2hpbmcgcmVzdWx0cyBpbiBsb2NhbCB2 YXJpYWJsZXMuCgp2MjoKICAgIEFkZGVkIGxvY2FsIG9wdGltaXNhdGlvbnMgKERhdmUgR29yZG9u KQoKU2lnbmVkLW9mZi1ieTogQWxleCBEYWkgPHl1LmRhaUBpbnRlbC5jb20+ClNpZ25lZC1vZmYt Ynk6IERhdmUgR29yZG9uIDxkYXZpZC5zLmdvcmRvbkBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jIHwgNTQgKysrKysrKysrKysrLS0tLS0t LS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWMuaCAgICAgICAgICAg fCAgMiArLQogMiBmaWxlcyBjaGFuZ2VkLCAyMyBpbnNlcnRpb25zKCspLCAzMyBkZWxldGlvbnMo LSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9u LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMKaW5kZXggMzUy MzFmZC4uNWQzNTU3MCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNf c3VibWlzc2lvbi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Np b24uYwpAQCAtMjM4LDkgKzIzOCw2IEBAIHN0YXRpYyBpbnQgZ3VjX3JpbmdfZG9vcmJlbGwoc3Ry dWN0IGk5MTVfZ3VjX2NsaWVudCAqZ2MpCiAJCQlkYl9leGMuY29va2llID0gMTsKIAl9CiAKLQkv KiBGaW5hbGx5LCB1cGRhdGUgdGhlIGNhY2hlZCBjb3B5IG9mIHRoZSBHdUMncyBXUSBoZWFkICov Ci0JZ2MtPndxX2hlYWQgPSBkZXNjLT5oZWFkOwotCiAJcmV0dXJuIHJldDsKIH0KIApAQCAtMzYx LDEyICszNTgsMTQgQEAgc3RhdGljIHZvaWQgZ3VjX2luaXRfcHJvY19kZXNjKHN0cnVjdCBpbnRl bF9ndWMgKmd1YywKIHN0YXRpYyB2b2lkIGd1Y19pbml0X2N0eF9kZXNjKHN0cnVjdCBpbnRlbF9n dWMgKmd1YywKIAkJCSAgICAgIHN0cnVjdCBpOTE1X2d1Y19jbGllbnQgKmNsaWVudCkKIHsKKwlz dHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqY2xpZW50X29iaiA9IGNsaWVudC0+Y2xpZW50X29i ajsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBndWNfdG9faTkxNShndWMp OwogCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZTsKIAlzdHJ1Y3QgaW50ZWxfY29udGV4 dCAqY3R4ID0gY2xpZW50LT5vd25lcjsKIAlzdHJ1Y3QgZ3VjX2NvbnRleHRfZGVzYyBkZXNjOwog CXN0cnVjdCBzZ190YWJsZSAqc2c7CiAJZW51bSBpbnRlbF9lbmdpbmVfaWQgaWQ7CisJdTMyIGdm eF9hZGRyOwogCiAJbWVtc2V0KCZkZXNjLCAwLCBzaXplb2YoZGVzYykpOwogCkBAIC0zOTUsMTYg KzM5NCwxNyBAQCBzdGF0aWMgdm9pZCBndWNfaW5pdF9jdHhfZGVzYyhzdHJ1Y3QgaW50ZWxfZ3Vj ICpndWMsCiAJCWxyYy0+Y29udGV4dF9kZXNjID0gKHUzMiljdHhfZGVzYzsKIAogCQkvKiBUaGUg c3RhdGUgcGFnZSBpcyBhZnRlciBQUEhXU1AgKi8KLQkJbHJjLT5yaW5nX2xjcmEgPSBpOTE1X2dl bV9vYmpfZ2d0dF9vZmZzZXQob2JqKSArCi0JCQkJTFJDX1NUQVRFX1BOICogUEFHRV9TSVpFOwor CQlnZnhfYWRkciA9IGk5MTVfZ2VtX29ial9nZ3R0X29mZnNldChvYmopOworCQlscmMtPnJpbmdf bGNyYSA9IGdmeF9hZGRyICsgTFJDX1NUQVRFX1BOICogUEFHRV9TSVpFOwogCQlscmMtPmNvbnRl eHRfaWQgPSAoY2xpZW50LT5jdHhfaW5kZXggPDwgR1VDX0VMQ19DVFhJRF9PRkZTRVQpIHwKIAkJ CQkoZW5naW5lLT5ndWNfaWQgPDwgR1VDX0VMQ19FTkdJTkVfT0ZGU0VUKTsKIAogCQlvYmogPSBj dHgtPmVuZ2luZVtpZF0ucmluZ2J1Zi0+b2JqOworCQlnZnhfYWRkciA9IGk5MTVfZ2VtX29ial9n Z3R0X29mZnNldChvYmopOwogCi0JCWxyYy0+cmluZ19iZWdpbiA9IGk5MTVfZ2VtX29ial9nZ3R0 X29mZnNldChvYmopOwotCQlscmMtPnJpbmdfZW5kID0gbHJjLT5yaW5nX2JlZ2luICsgb2JqLT5i YXNlLnNpemUgLSAxOwotCQlscmMtPnJpbmdfbmV4dF9mcmVlX2xvY2F0aW9uID0gbHJjLT5yaW5n X2JlZ2luOworCQlscmMtPnJpbmdfYmVnaW4gPSBnZnhfYWRkcjsKKwkJbHJjLT5yaW5nX2VuZCA9 IGdmeF9hZGRyICsgb2JqLT5iYXNlLnNpemUgLSAxOworCQlscmMtPnJpbmdfbmV4dF9mcmVlX2xv Y2F0aW9uID0gZ2Z4X2FkZHI7CiAJCWxyYy0+cmluZ19jdXJyZW50X3RhaWxfcG9pbnRlcl92YWx1 ZSA9IDA7CiAKIAkJZGVzYy5lbmdpbmVzX3VzZWQgfD0gKDEgPDwgZW5naW5lLT5ndWNfaWQpOwpA QCAtNDEzLDIyICs0MTMsMTcgQEAgc3RhdGljIHZvaWQgZ3VjX2luaXRfY3R4X2Rlc2Moc3RydWN0 IGludGVsX2d1YyAqZ3VjLAogCVdBUk5fT04oZGVzYy5lbmdpbmVzX3VzZWQgPT0gMCk7CiAKIAkv KgotCSAqIFRoZSBDUFUgYWRkcmVzcyBpcyBvbmx5IG5lZWRlZCBhdCBjZXJ0YWluIHBvaW50cywg c28ga21hcF9hdG9taWMgb24KLQkgKiBkZW1hbmQgaW5zdGVhZCBvZiBzdG9yaW5nIGl0IGluIHRo ZSBjdHggZGVzY3JpcHRvci4KLQkgKiBYWFg6IE1heSBtYWtlIGRlYnVnIGVhc2llciB0byBoYXZl IGl0IG1hcHBlZAorCSAqIFRoZSBkb29yYmVsbCwgcHJvY2VzcyBkZXNjcmlwdG9yLCBhbmQgd29y a3F1ZXVlIGFyZSBhbGwgcGFydHMKKwkgKiBvZiB0aGUgY2xpZW50IG9iamVjdCwgd2hpY2ggdGhl IEd1QyB3aWxsIHJlZmVyZW5jZSB2aWEgdGhlIEdHVFQKIAkgKi8KLQlkZXNjLmRiX3RyaWdnZXJf Y3B1ID0gMDsKLQlkZXNjLmRiX3RyaWdnZXJfdWsgPSBjbGllbnQtPmRvb3JiZWxsX29mZnNldCAr Ci0JCWk5MTVfZ2VtX29ial9nZ3R0X29mZnNldChjbGllbnQtPmNsaWVudF9vYmopOwotCWRlc2Mu ZGJfdHJpZ2dlcl9waHkgPSBjbGllbnQtPmRvb3JiZWxsX29mZnNldCArCi0JCXNnX2RtYV9hZGRy ZXNzKGNsaWVudC0+Y2xpZW50X29iai0+cGFnZXMtPnNnbCk7Ci0KLQlkZXNjLnByb2Nlc3NfZGVz YyA9IGNsaWVudC0+cHJvY19kZXNjX29mZnNldCArCi0JCWk5MTVfZ2VtX29ial9nZ3R0X29mZnNl dChjbGllbnQtPmNsaWVudF9vYmopOwotCi0JZGVzYy53cV9hZGRyID0gY2xpZW50LT53cV9vZmZz ZXQgKwotCQlpOTE1X2dlbV9vYmpfZ2d0dF9vZmZzZXQoY2xpZW50LT5jbGllbnRfb2JqKTsKLQor CWdmeF9hZGRyID0gaTkxNV9nZW1fb2JqX2dndHRfb2Zmc2V0KGNsaWVudF9vYmopOworCWRlc2Mu ZGJfdHJpZ2dlcl9waHkgPSBzZ19kbWFfYWRkcmVzcyhjbGllbnRfb2JqLT5wYWdlcy0+c2dsKSAr CisJCQkJY2xpZW50LT5kb29yYmVsbF9vZmZzZXQ7CisJZGVzYy5kYl90cmlnZ2VyX2NwdSA9ICh1 aW50cHRyX3QpY2xpZW50LT5jbGllbnRfYmFzZSArCisJCQkJY2xpZW50LT5kb29yYmVsbF9vZmZz ZXQ7CisJZGVzYy5kYl90cmlnZ2VyX3VrID0gZ2Z4X2FkZHIgKyBjbGllbnQtPmRvb3JiZWxsX29m ZnNldDsKKwlkZXNjLnByb2Nlc3NfZGVzYyA9IGdmeF9hZGRyICsgY2xpZW50LT5wcm9jX2Rlc2Nf b2Zmc2V0OworCWRlc2Mud3FfYWRkciA9IGdmeF9hZGRyICsgY2xpZW50LT53cV9vZmZzZXQ7CiAJ ZGVzYy53cV9zaXplID0gY2xpZW50LT53cV9zaXplOwogCiAJLyoKQEAgLTQ2NSwxNyArNDYwLDEw IEBAIGludCBpOTE1X2d1Y193cV9jaGVja19zcGFjZShzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50ICpn YykKIAlpZiAoIWdjKQogCQlyZXR1cm4gMDsKIAotCS8qIFF1aWNrbHkgcmV0dXJuIGlmIHdxIHNw YWNlIGlzIGF2YWlsYWJsZSBzaW5jZSBsYXN0IHRpbWUgd2UgY2FjaGUgdGhlCi0JICogaGVhZCBw b3NpdGlvbi4gKi8KLQlpZiAoQ0lSQ19TUEFDRShnYy0+d3FfdGFpbCwgZ2MtPndxX2hlYWQsIGdj LT53cV9zaXplKSA+PSBzaXplKQotCQlyZXR1cm4gMDsKLQogCWRlc2MgPSBnYy0+Y2xpZW50X2Jh c2UgKyBnYy0+cHJvY19kZXNjX29mZnNldDsKIAogCXdoaWxlICh0aW1lb3V0X2NvdW50ZXItLSA+ IDApIHsKLQkJZ2MtPndxX2hlYWQgPSBkZXNjLT5oZWFkOwotCi0JCWlmIChDSVJDX1NQQUNFKGdj LT53cV90YWlsLCBnYy0+d3FfaGVhZCwgZ2MtPndxX3NpemUpID49IHNpemUpIHsKKwkJaWYgKENJ UkNfU1BBQ0UoZ2MtPndxX3RhaWwsIGRlc2MtPmhlYWQsIGdjLT53cV9zaXplKSA+PSBzaXplKSB7 CiAJCQlyZXQgPSAwOwogCQkJYnJlYWs7CiAJCX0KQEAgLTQ5MCwxMCArNDc4LDEyIEBAIGludCBp OTE1X2d1Y193cV9jaGVja19zcGFjZShzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50ICpnYykKIHN0YXRp YyBpbnQgZ3VjX2FkZF93b3JrcXVldWVfaXRlbShzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50ICpnYywK IAkJCQkgIHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcnEpCiB7CisJc3RydWN0IGd1Y19w cm9jZXNzX2Rlc2MgKmRlc2M7CiAJc3RydWN0IGd1Y193cV9pdGVtICp3cWk7CiAJdTMyIHRhaWws IHdxX2xlbiwgd3Ffb2ZmLCBzcGFjZTsKIAotCXNwYWNlID0gQ0lSQ19TUEFDRShnYy0+d3FfdGFp bCwgZ2MtPndxX2hlYWQsIGdjLT53cV9zaXplKTsKKwlkZXNjID0gZ2MtPmNsaWVudF9iYXNlICsg Z2MtPnByb2NfZGVzY19vZmZzZXQ7CisJc3BhY2UgPSBDSVJDX1NQQUNFKGdjLT53cV90YWlsLCBk ZXNjLT5oZWFkLCBnYy0+d3Ffc2l6ZSk7CiAJaWYgKFdBUk5fT04oc3BhY2UgPCBzaXplb2Yoc3Ry dWN0IGd1Y193cV9pdGVtKSkpCiAJCXJldHVybiAtRU5PU1BDOyAvKiBzaG91bGRuJ3QgaGFwcGVu ICovCiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5oIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmgKaW5kZXggZjJjMDUxZS4uY2MzMmExOCAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmgKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmgKQEAgLTY4LDcgKzY4LDcgQEAgc3RydWN0IGk5MTVfZ3Vj X2NsaWVudCB7CiAJdWludDMyX3Qgd3Ffb2Zmc2V0OwogCXVpbnQzMl90IHdxX3NpemU7CiAJdWlu dDMyX3Qgd3FfdGFpbDsKLQl1aW50MzJfdCB3cV9oZWFkOworCXVpbnQzMl90IHVudXNlZDsJCS8q IFdhcyAnd3FfaGVhZCcJCSovCiAKIAkvKiBHdUMgc3VibWlzc2lvbiBzdGF0aXN0aWNzICYgc3Rh dHVzICovCiAJdWludDY0X3Qgc3VibWlzc2lvbnNbR1VDX01BWF9FTkdJTkVTX05VTV07Ci0tIAox LjkuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50 ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBz Oi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==