From: Michel Thierry Subject: [PATCH v5 02/18] drm/i915: Rename gen8_(un)request_engine_reset to gen8_(un)request_reset_engine Date: Fri, 24 Mar 2017 18:29:54 -0700 Message-ID: <20170325013010.36244-3-michel.thierry@intel.com> References: <20170325013010.36244-1-michel.thierry@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8FDAE6EC9B for ; Sat, 25 Mar 2017 01:30:14 +0000 (UTC) In-Reply-To: <20170325013010.36244-1-michel.thierry@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 QXMgYWxsIG90aGVyIGZ1bmN0aW9ucyByZWxhdGVkIHRvIHJlc2V0dGluZyBlbmdpbmVzIGFyZSB1 c2luZyByZXNldF9lbmdpbmUuCgpTaWduZWQtb2ZmLWJ5OiBNaWNoZWwgVGhpZXJyeSA8bWljaGVs LnRoaWVycnlAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VuY29y ZS5jIHwgOCArKysrLS0tLQogMSBmaWxlIGNoYW5nZWQsIDQgaW5zZXJ0aW9ucygrKSwgNCBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91bmNvcmUu YyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VuY29yZS5jCmluZGV4IDZkMWVhMjZiMjQ5 My4uNWY4MTVhMTAwYThkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91 bmNvcmUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91bmNvcmUuYwpAQCAtMTY1 OCw3ICsxNjU4LDcgQEAgaW50IGludGVsX3dhaXRfZm9yX3JlZ2lzdGVyKHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiwKIAlyZXR1cm4gcmV0OwogfQogCi1zdGF0aWMgaW50IGdlbjhf cmVxdWVzdF9lbmdpbmVfcmVzZXQoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQorc3Rh dGljIGludCBnZW44X3JlcXVlc3RfcmVzZXRfZW5naW5lKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3Mg KmVuZ2luZSkKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBlbmdpbmUt Pmk5MTU7CiAJaW50IHJldDsKQEAgLTE2NzcsNyArMTY3Nyw3IEBAIHN0YXRpYyBpbnQgZ2VuOF9y ZXF1ZXN0X2VuZ2luZV9yZXNldChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiAJcmV0 dXJuIHJldDsKIH0KIAotc3RhdGljIHZvaWQgZ2VuOF91bnJlcXVlc3RfZW5naW5lX3Jlc2V0KHN0 cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKK3N0YXRpYyB2b2lkIGdlbjhfdW5yZXF1ZXN0 X3Jlc2V0X2VuZ2luZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiB7CiAJc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZW5naW5lLT5pOTE1OwogCkBAIC0xNjkyLDE0 ICsxNjkyLDE0IEBAIHN0YXRpYyBpbnQgZ2VuOF9yZXNldF9lbmdpbmVzKHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiwKIAl1bnNpZ25lZCBpbnQgdG1wOwogCiAJZm9yX2VhY2hfZW5n aW5lX21hc2tlZChlbmdpbmUsIGRldl9wcml2LCBlbmdpbmVfbWFzaywgdG1wKQotCQlpZiAoZ2Vu OF9yZXF1ZXN0X2VuZ2luZV9yZXNldChlbmdpbmUpKQorCQlpZiAoZ2VuOF9yZXF1ZXN0X3Jlc2V0 X2VuZ2luZShlbmdpbmUpKQogCQkJZ290byBub3RfcmVhZHk7CiAKIAlyZXR1cm4gZ2VuNl9yZXNl dF9lbmdpbmVzKGRldl9wcml2LCBlbmdpbmVfbWFzayk7CiAKIG5vdF9yZWFkeToKIAlmb3JfZWFj aF9lbmdpbmVfbWFza2VkKGVuZ2luZSwgZGV2X3ByaXYsIGVuZ2luZV9tYXNrLCB0bXApCi0JCWdl bjhfdW5yZXF1ZXN0X2VuZ2luZV9yZXNldChlbmdpbmUpOworCQlnZW44X3VucmVxdWVzdF9yZXNl dF9lbmdpbmUoZW5naW5lKTsKIAogCXJldHVybiAtRUlPOwogfQotLSAKMi4xMS4wCgpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGlu ZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVl ZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK