From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tomas Elf Subject: [PATCH 02/20] drm/i915: Generalise common GPU engine reset request/unrequest code Date: Fri, 23 Oct 2015 02:32:24 +0100 Message-ID: <1445563962-20753-3-git-send-email-tomas.elf@intel.com> References: <1445563962-20753-1-git-send-email-tomas.elf@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id A18C86E43B for ; Thu, 22 Oct 2015 18:33:02 -0700 (PDT) In-Reply-To: <1445563962-20753-1-git-send-email-tomas.elf@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 R1BVIGVuZ2luZSByZXNldCBoYW5kc2hha2luZyBpcyBzb21ldGhpbmcgdGhhdCBpcyBhcHBsaWNh YmxlIHRvIGJvdGggZnVsbCBHUFUKcmVzZXQgYW5kIGVuZ2luZSByZXNldCwgd2hpY2ggaXMgc29t ZXRoaW5nIHRoYXQgaXMgcGFydCBvZiB0aGUgdXBjb21pbmcgVERSCnBlci1lbmdpbmUgaGFuZyBy ZWNvdmVyeSBwYXRjaGVzLiBCcmVhayBvdXQgdGhlIGNvbW1vbiBlbmdpbmUgcmVzZXQKcmVxdWVz dC91bnJlcXVlc3QgY29kZSAob3JpZ2luYWxseSB3cml0dGVuIGJ5IE1pa2EgS3VvcHBhbGEpIGZv ciByZXVzZSBsYXRlciBpbgp0aGUgVERSIGVuYWJsZW1lbnQgcGF0Y2ggc2VyaWVzLgoKU2lnbmVk LW9mZi1ieTogVG9tYXMgRWxmIDx0b21hcy5lbGZAaW50ZWwuY29tPgpDYzogTWlrYSBLdW9wcGFs YSA8bWlrYS5rdW9wcGFsYUBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfdW5jb3JlLmMgfCA0NiArKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0t LS0tCiAxIGZpbGUgY2hhbmdlZCwgMzIgaW5zZXJ0aW9ucygrKSwgMTQgZGVsZXRpb25zKC0pCgpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdW5jb3JlLmMgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF91bmNvcmUuYwppbmRleCAxNjYzZWE1Li42NjVkYmIzIDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91bmNvcmUuYworKysgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF91bmNvcmUuYwpAQCAtMTQ3OCwzMiArMTQ3OCw1MCBAQCBzdGF0 aWMgaW50IHdhaXRfZm9yX3JlZ2lzdGVyKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp diwKIAlyZXR1cm4gd2FpdF9mb3IoKEk5MTVfUkVBRChyZWcpICYgbWFzaykgPT0gdmFsdWUsIHRp bWVvdXRfbXMpOwogfQogCitzdGF0aWMgaW5saW5lIGludCBnZW44X3JlcXVlc3RfZW5naW5lX3Jl c2V0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKK3sKKwlzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYgPSBlbmdpbmUtPmRldi0+ZGV2X3ByaXZhdGU7CisJaW50IHJldCA9 IDA7CisKKwlJOTE1X1dSSVRFKFJJTkdfUkVTRVRfQ1RMKGVuZ2luZS0+bW1pb19iYXNlKSwKKwkJ ICAgX01BU0tFRF9CSVRfRU5BQkxFKFJFU0VUX0NUTF9SRVFVRVNUX1JFU0VUKSk7CisKKwlyZXQg PSB3YWl0X2Zvcl9yZWdpc3RlcihkZXZfcHJpdiwKKwkJCSAgICAgIFJJTkdfUkVTRVRfQ1RMKGVu Z2luZS0+bW1pb19iYXNlKSwKKwkJCSAgICAgIFJFU0VUX0NUTF9SRUFEWV9UT19SRVNFVCwKKwkJ CSAgICAgIFJFU0VUX0NUTF9SRUFEWV9UT19SRVNFVCwKKwkJCSAgICAgIDcwMCk7CisJaWYgKHJl dCkKKwkJRFJNX0VSUk9SKCIlczogcmVzZXQgcmVxdWVzdCB0aW1lb3V0XG4iLCBlbmdpbmUtPm5h bWUpOworCisJcmV0dXJuIHJldDsKK30KKworc3RhdGljIGlubGluZSBpbnQgZ2VuOF91bnJlcXVl c3RfZW5naW5lX3Jlc2V0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKK3sKKwlzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBlbmdpbmUtPmRldi0+ZGV2X3ByaXZhdGU7 CisKKwlJOTE1X1dSSVRFKFJJTkdfUkVTRVRfQ1RMKGVuZ2luZS0+bW1pb19iYXNlKSwKKwkJX01B U0tFRF9CSVRfRElTQUJMRShSRVNFVF9DVExfUkVRVUVTVF9SRVNFVCkpOworCisJcmV0dXJuIDA7 Cit9CisKIHN0YXRpYyBpbnQgZ2VuOF9kb19yZXNldChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQog ewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7 CiAJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lOwogCWludCBpOwogCi0JZm9yX2VhY2hf cmluZyhlbmdpbmUsIGRldl9wcml2LCBpKSB7Ci0JCUk5MTVfV1JJVEUoUklOR19SRVNFVF9DVEwo ZW5naW5lLT5tbWlvX2Jhc2UpLAotCQkJICAgX01BU0tFRF9CSVRfRU5BQkxFKFJFU0VUX0NUTF9S RVFVRVNUX1JFU0VUKSk7Ci0KLQkJaWYgKHdhaXRfZm9yX3JlZ2lzdGVyKGRldl9wcml2LAotCQkJ CSAgICAgIFJJTkdfUkVTRVRfQ1RMKGVuZ2luZS0+bW1pb19iYXNlKSwKLQkJCQkgICAgICBSRVNF VF9DVExfUkVBRFlfVE9fUkVTRVQsCi0JCQkJICAgICAgUkVTRVRfQ1RMX1JFQURZX1RPX1JFU0VU LAotCQkJCSAgICAgIDcwMCkpIHsKLQkJCURSTV9FUlJPUigiJXM6IHJlc2V0IHJlcXVlc3QgdGlt ZW91dFxuIiwgZW5naW5lLT5uYW1lKTsKKwlmb3JfZWFjaF9yaW5nKGVuZ2luZSwgZGV2X3ByaXYs IGkpCisJCWlmIChnZW44X3JlcXVlc3RfZW5naW5lX3Jlc2V0KGVuZ2luZSkpCiAJCQlnb3RvIG5v dF9yZWFkeTsKLQkJfQotCX0KIAogCXJldHVybiBnZW42X2RvX3Jlc2V0KGRldik7CiAKIG5vdF9y ZWFkeToKIAlmb3JfZWFjaF9yaW5nKGVuZ2luZSwgZGV2X3ByaXYsIGkpCi0JCUk5MTVfV1JJVEUo UklOR19SRVNFVF9DVEwoZW5naW5lLT5tbWlvX2Jhc2UpLAotCQkJICAgX01BU0tFRF9CSVRfRElT QUJMRShSRVNFVF9DVExfUkVRVUVTVF9SRVNFVCkpOworCQlnZW44X3VucmVxdWVzdF9lbmdpbmVf cmVzZXQoZW5naW5lKTsKIAogCXJldHVybiAtRUlPOwogfQotLSAKMS45LjEKCl9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxp c3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0 b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==