From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mika Kuoppala Subject: [PATCH] drm/i915: Reset request handling for gen8+ Date: Thu, 18 Jun 2015 11:36:00 +0300 Message-ID: <1434616560-32187-1-git-send-email-mika.kuoppala@intel.com> References: <1434544528-21584-1-git-send-email-mika.kuoppala@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id 84FCB6EB3D for ; Thu, 18 Jun 2015 01:35:51 -0700 (PDT) In-Reply-To: <1434544528-21584-1-git-send-email-mika.kuoppala@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: Daniel Vetter List-Id: intel-gfx@lists.freedesktop.org SW4gb3JkZXIgZm9yIGdlbjgrIGhhcmR3YXJlIHRvIGd1YXJhbnRlZSB0aGF0IG5vIGNvbnRleHQg c3dpdGNoCnRha2VzIHBsYWNlIGR1cmluZyBlbmdpbmUgcmVzZXQgYW5kIHRoYXQgY3VycmVudCBj b250ZXh0IGlzIHByb3Blcmx5CnNhdmVkLCB0aGUgZHJpdmVyIG5lZWRzIHRvIG5vdGlmeSBhbmQg cXVlcnkgaHcgYmVmb3JlIGNvbW1lbmNpbmcKd2l0aCByZXNldC4KClRoZXJlIGFyZSBncHUgaGFu Z3Mgd2hlcmUgdGhlIGVuZ2luZSBnZXRzIHNvIHN0dWNrIHRoYXQgaXQgbmV2ZXIgd2lsbApyZXBv cnQgdG8gYmUgcmVhZHkgZm9yIHJlc2V0LiBXZSBjb3VsZCBwcm9jZWVkIHdpdGggcmVzZXQgYW55 d2F5LCBidXQKd2l0aCBzb21lIGhhbmdzIHdpdGggc2tsLCB0aGUgZm9yY2VkIGdwdSByZXNldCB3 aWxsIHJlc3VsdCBpbiBhIHN5c3RlbQpoYW5nLiBCeSBpbnNwZWN0aW5nIHRoZSB1bnJlYWRpbmVz cyBmb3IgcmVzZXQgc2VlbXMgdG8gY29ycmVsYXRlIHdpdGgKdGhlIHByb2JhYmxlIHN5c3RlbSBo YW5nLgoKV2Ugd2lsbCBvbmx5IHByb2NlZWQgd2l0aCByZXNldCBpZiBhbGwgZW5naW5lcyByZXBv cnQgdGhhdCB0aGV5CmFyZSByZWFkeSBmb3IgcmVzZXQuIElmIHJvb3QgY2F1c2UgZm9yIHN5c3Rl bSBoYW5nIGlzIGZvdW5kIGFuZApjYW4gYmUgd29ya2VkIGFyb3VuZCB3aXRoIGFub3RoZXIgbWVh bnMsIHdlIGNhbiByZWNvbnNpZGVyIGlmCndlIGNhbiByZWluc3RhdGUgZnVsbCByZXNldCBmb3Ig dW5yZWFkaW5lc3MgY2FzZS4KCnYyOiAtRUlPLCBSZWNvdmVyeSwgZ2VuOCAoQ2hyaXMsIFRvbWFz LCBEYW5pZWwpCnYzOiB1cGRhdGVkIGNvbW1pdCBtc2cKClJlZmVyZW5jZXM6IGh0dHBzOi8vYnVn cy5mcmVlZGVza3RvcC5vcmcvc2hvd19idWcuY2dpP2lkPTg5OTU5ClJlZmVyZW5jZXM6IGh0dHBz Oi8vYnVncy5mcmVlZGVza3RvcC5vcmcvc2hvd19idWcuY2dpP2lkPTkwODU0ClRlc3RjYXNlOiBp Z3QvZ2VtX2NvbmN1cnJlbnRfYmxpdCAtLXIgcHJ3LWJsdC1vdmVyd3JpdGUtc291cmNlLXJlYWQt cmNzLWZvcmtlZApUZXN0Y2FzZTogaWd0L2dlbV9jb25jdXJyZW50X2JsaXQgLS1yIGd0dC1ibHQt b3ZlcndyaXRlLXNvdXJjZS1yZWFkLXJjcy1mb3JrZWQKQ2M6IENocmlzIFdpbHNvbiA8Y2hyaXNA Y2hyaXMtd2lsc29uLmNvLnVrPgpDYzogRGFuaWVsIFZldHRlciA8ZGFuaWVsLnZldHRlckBmZnds bC5jaD4KQ2M6IFRvbWFzIEVsZiA8dG9tYXMuZWxmQGludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTog TWlrYSBLdW9wcGFsYSA8bWlrYS5rdW9wcGFsYUBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9yZWcuaCAgICAgfCAgMyArKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3VuY29yZS5jIHwgNDUgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrLQog MiBmaWxlcyBjaGFuZ2VkLCA0NyBpbnNlcnRpb25zKCspLCAxIGRlbGV0aW9uKC0pCgpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaCBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfcmVnLmgKaW5kZXggMGI5NzlhZC4uMzY4NGY5MiAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X3JlZy5oCkBAIC0xNDYxLDYgKzE0NjEsOSBAQCBlbnVtIHNrbF9kaXNwX3Bvd2VyX3dlbGxzIHsK ICNkZWZpbmUgUklOR19NQVhfSURMRShiYXNlKQkoKGJhc2UpKzB4NTQpCiAjZGVmaW5lIFJJTkdf SFdTX1BHQShiYXNlKQkoKGJhc2UpKzB4ODApCiAjZGVmaW5lIFJJTkdfSFdTX1BHQV9HRU42KGJh c2UpCSgoYmFzZSkrMHgyMDgwKQorI2RlZmluZSBSSU5HX1JFU0VUX0NUTChiYXNlKQkoKGJhc2Up KzB4ZDApCisjZGVmaW5lICAgUkVTRVRfQ1RMX1JFUVVFU1RfUkVTRVQgICgxIDw8IDApCisjZGVm aW5lICAgUkVTRVRfQ1RMX1JFQURZX1RPX1JFU0VUICgxIDw8IDEpCiAKICNkZWZpbmUgSFNXX0dU VF9DQUNIRV9FTgkweDQwMjQKICNkZWZpbmUgICBHVFRfQ0FDSEVfRU5fQUxMCTB4RjAwMDdGRkYK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VuY29yZS5jIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfdW5jb3JlLmMKaW5kZXggNGE4NmNmMC4uNmExOWIzZSAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdW5jb3JlLmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfdW5jb3JlLmMKQEAgLTE0NTUsOSArMTQ1NSw1MiBAQCBzdGF0 aWMgaW50IGdlbjZfZG9fcmVzZXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlyZXR1cm4gcmV0 OwogfQogCitzdGF0aWMgaW50IHdhaXRfZm9yX3JlZ2lzdGVyKHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdiwKKwkJCSAgICAgY29uc3QgdTMyIHJlZywKKwkJCSAgICAgY29uc3QgdTMy IG1hc2ssCisJCQkgICAgIGNvbnN0IHUzMiB2YWx1ZSwKKwkJCSAgICAgY29uc3QgdW5zaWduZWQg bG9uZyB0aW1lb3V0KQoreworCXJldHVybiB3YWl0X2ZvcigoSTkxNV9SRUFEKHJlZykgJiBtYXNr KSA9PSB2YWx1ZSwgdGltZW91dCk7Cit9CisKK3N0YXRpYyBpbnQgZ2VuOF9kb19yZXNldChzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2KQoreworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp diA9IGRldi0+ZGV2X3ByaXZhdGU7CisJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lOwor CWludCByZXQsIGk7CisKKwlmb3JfZWFjaF9yaW5nKGVuZ2luZSwgZGV2X3ByaXYsIGkpIHsKKwkJ STkxNV9XUklURShSSU5HX1JFU0VUX0NUTChlbmdpbmUtPm1taW9fYmFzZSksCisJCQkgICBfTUFT S0VEX0JJVF9FTkFCTEUoUkVTRVRfQ1RMX1JFUVVFU1RfUkVTRVQpKTsKKworCQlyZXQgPSB3YWl0 X2Zvcl9yZWdpc3RlcihkZXZfcHJpdiwKKwkJCQkJUklOR19SRVNFVF9DVEwoZW5naW5lLT5tbWlv X2Jhc2UpLAorCQkJCQlSRVNFVF9DVExfUkVBRFlfVE9fUkVTRVQsCisJCQkJCVJFU0VUX0NUTF9S RUFEWV9UT19SRVNFVCwKKwkJCQkJNzAwKTsKKwkJaWYgKHJldCkgeworCQkJRFJNX0VSUk9SKCIl czogcmVzZXQgcmVxdWVzdCB0aW1lb3V0XG4iLCBlbmdpbmUtPm5hbWUpOworCQkJcmV0ID0gLUVJ TzsKKwkJCWdvdG8gbm90X3JlYWR5OworCQl9CisJfQorCisJcmV0dXJuIGdlbjZfZG9fcmVzZXQo ZGV2KTsKKworbm90X3JlYWR5OgorCWZvcl9lYWNoX3JpbmcoZW5naW5lLCBkZXZfcHJpdiwgaSkK KwkJSTkxNV9XUklURShSSU5HX1JFU0VUX0NUTChlbmdpbmUtPm1taW9fYmFzZSksCisJCQkgICBf TUFTS0VEX0JJVF9ESVNBQkxFKFJFU0VUX0NUTF9SRVFVRVNUX1JFU0VUKSk7CisKKwlyZXR1cm4g cmV0OworfQorCiBzdGF0aWMgaW50ICgqaW50ZWxfZ2V0X2dwdV9yZXNldChzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2KSkoc3RydWN0IGRybV9kZXZpY2UgKikKIHsKLQlpZiAoSU5URUxfSU5GTyhkZXYp LT5nZW4gPj0gNikKKwlpZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPj0gOCkKKwkJcmV0dXJuIGdl bjhfZG9fcmVzZXQ7CisJZWxzZSBpZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPj0gNikKIAkJcmV0 dXJuIGdlbjZfZG9fcmVzZXQ7CiAJZWxzZSBpZiAoSVNfR0VONShkZXYpKQogCQlyZXR1cm4gaXJv bmxha2VfZG9fcmVzZXQ7Ci0tIAoxLjkuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMu ZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0 aW5mby9pbnRlbC1nZngK