From: Sagar Arun Kamble Subject: [PATCH v4 6/9] drm/i915/guc: Fix GuC cleanup in unload path Date: Wed, 20 Sep 2017 23:08:21 +0530 Message-ID: <1505929104-28823-7-git-send-email-sagar.a.kamble@intel.com> References: <1505929104-28823-1-git-send-email-sagar.a.kamble@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id BDC226E799 for ; Wed, 20 Sep 2017 17:35:08 +0000 (UTC) In-Reply-To: <1505929104-28823-1-git-send-email-sagar.a.kamble@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 V2UgZW5zdXJlIHRoYXQgR3VDIGlzIGNvbXBsZXRlbHkgc3VzcGVuZGVkIGFuZCBjbGllbnQgaXMg ZGVzdHJveWVkCmluIGk5MTVfZ2VtX3N1c3BlbmQgZHVyaW5nIGk5MTVfZHJpdmVyX3VubG9hZC4g U28gbm93IGludGVsX3VjX2ZpbmlfaHcKc2hvdWxkIGp1c3QgdGFrZSBjYXJlIG9mIGNsZWFudXAs CmhlbmNlIHMvaW50ZWxfdWNfZmluaV9ody9pbnRlbF91Y19jbGVhbnVwLiBDb3JyZXNwb25kaW5n bHkKd2UgYWxzbyB1cGRhdGVkIGFzIHMvaTkxNV9ndWNfc3VibWlzc2lvbl9maW5pL2k5MTVfZ3Vj X3N1Ym1pc3Npb25fY2xlYW51cApPdGhlciBmdW5jdGlvbmFsaXR5IHRvIGRpc2FibGUgY29tbXVu aWNhdGlvbiwgZGlzYWJsZSBpbnRlcnJ1cHRzIGFuZAp1cGRhdGUgb2YgZ2d0dC5pbnZhbGlkYXRl IGlzIHRha2VuIGNhcmUgYnkgaW50ZWxfdWNfc3VzcGVuZC4KV2l0aCB0aGlzIHBhdGNoIHdlIGFy ZSBhbHNvIGRvaW5nIGd1Y19mcmVlX2xvYWRfZXJyX2xvZyBvbmx5CmlmIGk5MTUuZW5hYmxlX2d1 Y19sb2FkaW5nIGlzIHNldC4KQ3JlYXRlZCBpbnRlbF9ndWNfY2xlYW51cCBmdW5jdGlvbiB0byB3 cmFwIHRoZSBjbGVhbnVwIGZ1bmN0aW9ucwpzcGVjaWZpYyB0byBHdUMuCgp2MjogUmViYXNlIHcu ci50IHJlbW92YWwgb2YgR3VDIGNvZGUgcmVzdHJ1Y3R1cmluZy4KCkNjOiBNaWNoYWwgV2FqZGVj emtvIDxtaWNoYWwud2FqZGVjemtvQGludGVsLmNvbT4KQ2M6IE1pY2hhxYIgV2luaWFyc2tpIDxt aWNoYWwud2luaWFyc2tpQGludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogU2FnYXIgQXJ1biBLYW1i bGUgPHNhZ2FyLmEua2FtYmxlQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2Rydi5jICAgICAgICAgICAgfCAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n dWNfc3VibWlzc2lvbi5jIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VjLmMg ICAgICAgICAgICB8IDIxICsrKysrKysrKysrLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfdWMuaCAgICAgICAgICAgIHwgIDQgKystLQogNCBmaWxlcyBjaGFuZ2VkLCAxNSBp bnNlcnRpb25zKCspLCAxNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2Rydi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYwppbmRl eCA4NjM1ZjQwLi42ZjM2Y2VkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2Rydi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKQEAgLTYwMiw3ICs2 MDIsNyBAQCBzdGF0aWMgdm9pZCBpOTE1X2dlbV9maW5pKHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdikKIAlpOTE1X2dlbV9kcmFpbl93b3JrcXVldWUoZGV2X3ByaXYpOwogCiAJbXV0 ZXhfbG9jaygmZGV2X3ByaXYtPmRybS5zdHJ1Y3RfbXV0ZXgpOwotCWludGVsX3VjX2ZpbmlfaHco ZGV2X3ByaXYpOworCWludGVsX3VjX2NsZWFudXAoZGV2X3ByaXYpOwogCWk5MTVfZ2VtX2NsZWFu dXBfZW5naW5lcyhkZXZfcHJpdik7CiAJaTkxNV9nZW1fY29udGV4dHNfZmluaShkZXZfcHJpdik7 CiAJaTkxNV9nZW1fY2xlYW51cF91c2VycHRyKGRldl9wcml2KTsKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYwppbmRleCA5NGVmZTMyLi4xMmYxMTk1IDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jCkBAIC0xMDUwLDcgKzEwNTAs NyBAQCBpbnQgaTkxNV9ndWNfc3VibWlzc2lvbl9pbml0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdikKIAlyZXR1cm4gcmV0OwogfQogCi12b2lkIGk5MTVfZ3VjX3N1Ym1pc3Npb25f ZmluaShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCit2b2lkIGk5MTVfZ3VjX3N1 Ym1pc3Npb25fY2xlYW51cChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7CiAJ c3RydWN0IGludGVsX2d1YyAqZ3VjID0gJmRldl9wcml2LT5ndWM7CiAKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VjLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF91Yy5jCmluZGV4IGFhYzg1MjYuLjhjNDIzNDQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX3VjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdWMuYwpA QCAtNDE4LDcgKzQxOCw3IEBAIGludCBpbnRlbF91Y19pbml0X2h3KHN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdikKIAlndWNfY2FwdHVyZV9sb2FkX2Vycl9sb2coZ3VjKTsKIGVycl9z dWJtaXNzaW9uOgogCWlmIChpOTE1LmVuYWJsZV9ndWNfc3VibWlzc2lvbikKLQkJaTkxNV9ndWNf c3VibWlzc2lvbl9maW5pKGRldl9wcml2KTsKKwkJaTkxNV9ndWNfc3VibWlzc2lvbl9jbGVhbnVw KGRldl9wcml2KTsKIGVycl9ndWM6CiAJaTkxNV9nZ3R0X2Rpc2FibGVfZ3VjKGRldl9wcml2KTsK IApAQCAtNDM5LDIxICs0MzksMjIgQEAgaW50IGludGVsX3VjX2luaXRfaHcoc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2KQogCXJldHVybiByZXQ7CiB9CiAKLXZvaWQgaW50ZWxfdWNf ZmluaV9odyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCitzdGF0aWMgdm9pZCBp bnRlbF9ndWNfY2xlYW51cChzdHJ1Y3QgaW50ZWxfZ3VjICpndWMpCiB7Ci0JZ3VjX2ZyZWVfbG9h ZF9lcnJfbG9nKCZkZXZfcHJpdi0+Z3VjKTsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYgPSBndWNfdG9faTkxNShndWMpOworCisJaWYgKGk5MTUuZW5hYmxlX2d1Y19zdWJtaXNz aW9uKQorCQlpOTE1X2d1Y19zdWJtaXNzaW9uX2NsZWFudXAoZGV2X3ByaXYpOworfQogCit2b2lk IGludGVsX3VjX2NsZWFudXAoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQorewog CWlmICghaTkxNS5lbmFibGVfZ3VjX2xvYWRpbmcpCiAJCXJldHVybjsKIAotCWd1Y19kaXNhYmxl X2NvbW11bmljYXRpb24oJmRldl9wcml2LT5ndWMpOwotCi0JaWYgKGk5MTUuZW5hYmxlX2d1Y19z dWJtaXNzaW9uKSB7Ci0JCWdlbjlfZGlzYWJsZV9ndWNfaW50ZXJydXB0cyhkZXZfcHJpdik7Ci0J CWk5MTVfZ3VjX3N1Ym1pc3Npb25fZmluaShkZXZfcHJpdik7Ci0JfQorCWd1Y19mcmVlX2xvYWRf ZXJyX2xvZygmZGV2X3ByaXYtPmd1Yyk7CiAKLQlpOTE1X2dndHRfZGlzYWJsZV9ndWMoZGV2X3By aXYpOworCWludGVsX2d1Y19jbGVhbnVwKCZkZXZfcHJpdi0+Z3VjKTsKIH0KIAogaW50IGludGVs X2d1Y19zZW5kX25vcChzdHJ1Y3QgaW50ZWxfZ3VjICpndWMsIGNvbnN0IHUzMiAqYWN0aW9uLCB1 MzIgbGVuKQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdWMuaCBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VjLmgKaW5kZXggMDY5YzJiMi4uODU1N2UzMyAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdWMuaAorKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF91Yy5oCkBAIC0yMDcsNyArMjA3LDcgQEAgc3RydWN0IGludGVsX2h1 YyB7CiB2b2lkIGludGVsX3VjX2luaXRfZncoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2KTsKIHZvaWQgaW50ZWxfdWNfZmluaV9mdyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYpOwogaW50IGludGVsX3VjX2luaXRfaHcoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2KTsKLXZvaWQgaW50ZWxfdWNfZmluaV9odyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYpOwordm9pZCBpbnRlbF91Y19jbGVhbnVwKHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdik7CiBpbnQgaW50ZWxfdWNfcnVudGltZV9zdXNwZW5kKHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdik7CiBpbnQgaW50ZWxfdWNfcnVudGltZV9yZXN1bWUoc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKIGludCBpbnRlbF91Y19zdXNwZW5kKHN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7CkBAIC0yMzYsNyArMjM2LDcgQEAgc3RhdGlj IGlubGluZSB2b2lkIGludGVsX2d1Y19ub3RpZnkoc3RydWN0IGludGVsX2d1YyAqZ3VjKQogaW50 IGk5MTVfZ3VjX3N1Ym1pc3Npb25faW5pdChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYpOwogaW50IGk5MTVfZ3VjX3N1Ym1pc3Npb25fZW5hYmxlKHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdik7CiB2b2lkIGk5MTVfZ3VjX3N1Ym1pc3Npb25fZGlzYWJsZShzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwotdm9pZCBpOTE1X2d1Y19zdWJtaXNzaW9uX2Zp bmkoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKK3ZvaWQgaTkxNV9ndWNfc3Vi bWlzc2lvbl9jbGVhbnVwKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7CiBzdHJ1 Y3QgaTkxNV92bWEgKmludGVsX2d1Y19hbGxvY2F0ZV92bWEoc3RydWN0IGludGVsX2d1YyAqZ3Vj LCB1MzIgc2l6ZSk7CiAKIC8qIGludGVsX2d1Y19sb2cuYyAqLwotLSAKMS45LjEKCl9fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5n IGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVk ZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=