From: Michel Thierry Subject: [PATCH v6 02/20] drm/i915: Rename gen8_(un)request_engine_reset to gen8_reset_engine_start/cancel Date: Tue, 18 Apr 2017 13:23:17 -0700 Message-ID: <20170418202335.35232-3-michel.thierry@intel.com> References: <20170418202335.35232-1-michel.thierry@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id 34F7E6E1AF for ; Tue, 18 Apr 2017 20:23:36 +0000 (UTC) In-Reply-To: <20170418202335.35232-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 c2luZwpyZXNldF9lbmdpbmUuCgp2MjogcmVtb3ZlIF9yZXF1ZXN0XyBhbmQgdXNlIHN0YXJ0L2Nh bmNlbCBpbnN0ZWFkIChDaHJpcykKCkNjOiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNv bi5jby51az4KU2lnbmVkLW9mZi1ieTogTWljaGVsIFRoaWVycnkgPG1pY2hlbC50aGllcnJ5QGlu dGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91bmNvcmUuYyB8IDggKysr Ky0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA0IGluc2VydGlvbnMoKyksIDQgZGVsZXRpb25zKC0pCgpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdW5jb3JlLmMgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF91bmNvcmUuYwppbmRleCBhMTBkODg2M2IwYTkuLjA3YTcyMmY3 NGZhMSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdW5jb3JlLmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdW5jb3JlLmMKQEAgLTE2ODMsNyArMTY4Myw3 IEBAIGludCBpbnRlbF93YWl0X2Zvcl9yZWdpc3RlcihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYsCiAJcmV0dXJuIHJldDsKIH0KIAotc3RhdGljIGludCBnZW44X3JlcXVlc3RfZW5n aW5lX3Jlc2V0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKK3N0YXRpYyBpbnQgZ2Vu OF9yZXNldF9lbmdpbmVfc3RhcnQoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogewog CXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGVuZ2luZS0+aTkxNTsKIAlpbnQg cmV0OwpAQCAtMTcwMiw3ICsxNzAyLDcgQEAgc3RhdGljIGludCBnZW44X3JlcXVlc3RfZW5naW5l X3Jlc2V0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIAlyZXR1cm4gcmV0OwogfQog Ci1zdGF0aWMgdm9pZCBnZW44X3VucmVxdWVzdF9lbmdpbmVfcmVzZXQoc3RydWN0IGludGVsX2Vu Z2luZV9jcyAqZW5naW5lKQorc3RhdGljIHZvaWQgZ2VuOF9yZXNldF9lbmdpbmVfY2FuY2VsKHN0 cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYgPSBlbmdpbmUtPmk5MTU7CiAKQEAgLTE3MTcsMTQgKzE3MTcsMTQgQEAgc3Rh dGljIGludCBnZW44X3Jlc2V0X2VuZ2luZXMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2LAogCXVuc2lnbmVkIGludCB0bXA7CiAKIAlmb3JfZWFjaF9lbmdpbmVfbWFza2VkKGVuZ2lu ZSwgZGV2X3ByaXYsIGVuZ2luZV9tYXNrLCB0bXApCi0JCWlmIChnZW44X3JlcXVlc3RfZW5naW5l X3Jlc2V0KGVuZ2luZSkpCisJCWlmIChnZW44X3Jlc2V0X2VuZ2luZV9zdGFydChlbmdpbmUpKQog CQkJZ290byBub3RfcmVhZHk7CiAKIAlyZXR1cm4gZ2VuNl9yZXNldF9lbmdpbmVzKGRldl9wcml2 LCBlbmdpbmVfbWFzayk7CiAKIG5vdF9yZWFkeToKIAlmb3JfZWFjaF9lbmdpbmVfbWFza2VkKGVu Z2luZSwgZGV2X3ByaXYsIGVuZ2luZV9tYXNrLCB0bXApCi0JCWdlbjhfdW5yZXF1ZXN0X2VuZ2lu ZV9yZXNldChlbmdpbmUpOworCQlnZW44X3Jlc2V0X2VuZ2luZV9jYW5jZWwoZW5naW5lKTsKIAog CXJldHVybiAtRUlPOwogfQotLSAKMi4xMS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0 cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9s aXN0aW5mby9pbnRlbC1nZngK