From: Arun Siluvery Subject: [PATCH 02/20] drm/i915: Generalise common GPU engine reset request/unrequest code Date: Wed, 13 Jan 2016 17:28:14 +0000 Message-ID: <1452706112-8617-3-git-send-email-arun.siluvery@linux.intel.com> References: <1452706112-8617-1-git-send-email-arun.siluvery@linux.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 ESMTP id A0F356E10B for ; Wed, 13 Jan 2016 09:28:38 -0800 (PST) In-Reply-To: <1452706112-8617-1-git-send-email-arun.siluvery@linux.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 Cc: Tomas Elf List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVG9tYXMgRWxmIDx0b21hcy5lbGZAaW50ZWwuY29tPgoKR1BVIGVuZ2luZSByZXNldCBo YW5kc2hha2luZyBpcyBzb21ldGhpbmcgdGhhdCBpcyBhcHBsaWNhYmxlIHRvIGJvdGggZnVsbCBH UFUKcmVzZXQgYW5kIGVuZ2luZSByZXNldCwgd2hpY2ggaXMgc29tZXRoaW5nIHRoYXQgaXMgcGFy dCBvZiB0aGUgdXBjb21pbmcgVERSCnBlci1lbmdpbmUgaGFuZyByZWNvdmVyeSBwYXRjaGVzLiBC cmVhayBvdXQgdGhlIGNvbW1vbiBlbmdpbmUgcmVzZXQKcmVxdWVzdC91bnJlcXVlc3QgY29kZSAo b3JpZ2luYWxseSB3cml0dGVuIGJ5IE1pa2EgS3VvcHBhbGEpIGZvciByZXVzZSBsYXRlciBpbgp0 aGUgVERSIGVuYWJsZW1lbnQgcGF0Y2ggc2VyaWVzLgoKU2lnbmVkLW9mZi1ieTogVG9tYXMgRWxm IDx0b21hcy5lbGZAaW50ZWwuY29tPgpDYzogTWlrYSBLdW9wcGFsYSA8bWlrYS5rdW9wcGFsYUBs aW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdW5jb3JlLmMg fCA0NiArKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdl ZCwgMzIgaW5zZXJ0aW9ucygrKSwgMTQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfdW5jb3JlLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF91bmNvcmUuYwppbmRleCBjM2MxM2RjLi4yZGY0MjQ2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF91bmNvcmUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF91bmNvcmUuYwpAQCAtMTUyOSwzMiArMTUyOSw1MCBAQCBzdGF0aWMgaW50IHdhaXRfZm9yX3Jl Z2lzdGVyKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAlyZXR1cm4gd2FpdF9m b3IoKEk5MTVfUkVBRChyZWcpICYgbWFzaykgPT0gdmFsdWUsIHRpbWVvdXRfbXMpOwogfQogCitz dGF0aWMgaW5saW5lIGludCBnZW44X3JlcXVlc3RfZW5naW5lX3Jlc2V0KHN0cnVjdCBpbnRlbF9l bmdpbmVfY3MgKmVuZ2luZSkKK3sKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYg PSBlbmdpbmUtPmRldi0+ZGV2X3ByaXZhdGU7CisJaW50IHJldCA9IDA7CisKKwlJOTE1X1dSSVRF KFJJTkdfUkVTRVRfQ1RMKGVuZ2luZS0+bW1pb19iYXNlKSwKKwkJICAgX01BU0tFRF9CSVRfRU5B QkxFKFJFU0VUX0NUTF9SRVFVRVNUX1JFU0VUKSk7CisKKwlyZXQgPSB3YWl0X2Zvcl9yZWdpc3Rl cihkZXZfcHJpdiwKKwkJCSAgICAgIFJJTkdfUkVTRVRfQ1RMKGVuZ2luZS0+bW1pb19iYXNlKSwK KwkJCSAgICAgIFJFU0VUX0NUTF9SRUFEWV9UT19SRVNFVCwKKwkJCSAgICAgIFJFU0VUX0NUTF9S RUFEWV9UT19SRVNFVCwKKwkJCSAgICAgIDcwMCk7CisJaWYgKHJldCkKKwkJRFJNX0VSUk9SKCIl czogcmVzZXQgcmVxdWVzdCB0aW1lb3V0XG4iLCBlbmdpbmUtPm5hbWUpOworCisJcmV0dXJuIHJl dDsKK30KKworc3RhdGljIGlubGluZSBpbnQgZ2VuOF91bnJlcXVlc3RfZW5naW5lX3Jlc2V0KHN0 cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKK3sKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYgPSBlbmdpbmUtPmRldi0+ZGV2X3ByaXZhdGU7CisKKwlJOTE1X1dSSVRFKFJJ TkdfUkVTRVRfQ1RMKGVuZ2luZS0+bW1pb19iYXNlKSwKKwkJX01BU0tFRF9CSVRfRElTQUJMRShS RVNFVF9DVExfUkVRVUVTVF9SRVNFVCkpOworCisJcmV0dXJuIDA7Cit9CisKIHN0YXRpYyBpbnQg Z2VuOF9kb19yZXNldChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogewogCXN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CiAJc3RydWN0IGludGVsX2Vu Z2luZV9jcyAqZW5naW5lOwogCWludCBpOwogCi0JZm9yX2VhY2hfcmluZyhlbmdpbmUsIGRldl9w cml2LCBpKSB7Ci0JCUk5MTVfV1JJVEUoUklOR19SRVNFVF9DVEwoZW5naW5lLT5tbWlvX2Jhc2Up LAotCQkJICAgX01BU0tFRF9CSVRfRU5BQkxFKFJFU0VUX0NUTF9SRVFVRVNUX1JFU0VUKSk7Ci0K LQkJaWYgKHdhaXRfZm9yX3JlZ2lzdGVyKGRldl9wcml2LAotCQkJCSAgICAgIFJJTkdfUkVTRVRf Q1RMKGVuZ2luZS0+bW1pb19iYXNlKSwKLQkJCQkgICAgICBSRVNFVF9DVExfUkVBRFlfVE9fUkVT RVQsCi0JCQkJICAgICAgUkVTRVRfQ1RMX1JFQURZX1RPX1JFU0VULAotCQkJCSAgICAgIDcwMCkp IHsKLQkJCURSTV9FUlJPUigiJXM6IHJlc2V0IHJlcXVlc3QgdGltZW91dFxuIiwgZW5naW5lLT5u YW1lKTsKKwlmb3JfZWFjaF9yaW5nKGVuZ2luZSwgZGV2X3ByaXYsIGkpCisJCWlmIChnZW44X3Jl cXVlc3RfZW5naW5lX3Jlc2V0KGVuZ2luZSkpCiAJCQlnb3RvIG5vdF9yZWFkeTsKLQkJfQotCX0K IAogCXJldHVybiBnZW42X2RvX3Jlc2V0KGRldik7CiAKIG5vdF9yZWFkeToKIAlmb3JfZWFjaF9y aW5nKGVuZ2luZSwgZGV2X3ByaXYsIGkpCi0JCUk5MTVfV1JJVEUoUklOR19SRVNFVF9DVEwoZW5n aW5lLT5tbWlvX2Jhc2UpLAotCQkJICAgX01BU0tFRF9CSVRfRElTQUJMRShSRVNFVF9DVExfUkVR VUVTVF9SRVNFVCkpOworCQlnZW44X3VucmVxdWVzdF9lbmdpbmVfcmVzZXQoZW5naW5lKTsKIAog CXJldHVybiAtRUlPOwogfQotLSAKMS45LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3Rz LmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlz dGluZm8vaW50ZWwtZ2Z4Cg==