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 12:51:40 +0300 Message-ID: <1434621100-9612-1-git-send-email-mika.kuoppala@intel.com> References: <20150618085040.GY24012@nuc-i3427.alporthouse.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 089466ECAD for ; Thu, 18 Jun 2015 02:52:59 -0700 (PDT) In-Reply-To: <20150618085040.GY24012@nuc-i3427.alporthouse.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 LCBEYW5pZWwpCnYzOiB1cGRhdGVkIGNvbW1pdCBtc2cKdjQ6IHRpbWVvdXRfbXMsIHNpbXBsZXIg ZXJyb3IgcGF0aCAoQ2hyaXMpCgpSZWZlcmVuY2VzOiBodHRwczovL2J1Z3MuZnJlZWRlc2t0b3Au b3JnL3Nob3dfYnVnLmNnaT9pZD04OTk1OQpSZWZlcmVuY2VzOiBodHRwczovL2J1Z3MuZnJlZWRl c2t0b3Aub3JnL3Nob3dfYnVnLmNnaT9pZD05MDg1NApUZXN0Y2FzZTogaWd0L2dlbV9jb25jdXJy ZW50X2JsaXQgLS1yIHBydy1ibHQtb3ZlcndyaXRlLXNvdXJjZS1yZWFkLXJjcy1mb3JrZWQKVGVz dGNhc2U6IGlndC9nZW1fY29uY3VycmVudF9ibGl0IC0tciBndHQtYmx0LW92ZXJ3cml0ZS1zb3Vy Y2UtcmVhZC1yY3MtZm9ya2VkCkNjOiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5j by51az4KQ2M6IERhbmllbCBWZXR0ZXIgPGRhbmllbC52ZXR0ZXJAZmZ3bGwuY2g+CkNjOiBUb21h cyBFbGYgPHRvbWFzLmVsZkBpbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IE1pa2EgS3VvcHBhbGEg PG1pa2Eua3VvcHBhbGFAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf cmVnLmggICAgIHwgIDMgKysrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91bmNvcmUuYyB8 IDQzICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0KIDIgZmlsZXMgY2hhbmdl ZCwgNDUgaW5zZXJ0aW9ucygrKSwgMSBkZWxldGlvbigtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfcmVnLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3JlZy5o CmluZGV4IDBiOTc5YWQuLjM2ODRmOTIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfcmVnLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaApAQCAtMTQ2 MSw2ICsxNDYxLDkgQEAgZW51bSBza2xfZGlzcF9wb3dlcl93ZWxscyB7CiAjZGVmaW5lIFJJTkdf TUFYX0lETEUoYmFzZSkJKChiYXNlKSsweDU0KQogI2RlZmluZSBSSU5HX0hXU19QR0EoYmFzZSkJ KChiYXNlKSsweDgwKQogI2RlZmluZSBSSU5HX0hXU19QR0FfR0VONihiYXNlKQkoKGJhc2UpKzB4 MjA4MCkKKyNkZWZpbmUgUklOR19SRVNFVF9DVEwoYmFzZSkJKChiYXNlKSsweGQwKQorI2RlZmlu ZSAgIFJFU0VUX0NUTF9SRVFVRVNUX1JFU0VUICAoMSA8PCAwKQorI2RlZmluZSAgIFJFU0VUX0NU TF9SRUFEWV9UT19SRVNFVCAoMSA8PCAxKQogCiAjZGVmaW5lIEhTV19HVFRfQ0FDSEVfRU4JMHg0 MDI0CiAjZGVmaW5lICAgR1RUX0NBQ0hFX0VOX0FMTAkweEYwMDA3RkZGCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91bmNvcmUuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3VuY29yZS5jCmluZGV4IDRhODZjZjAuLjE2MGE0N2EgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3VuY29yZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3VuY29yZS5jCkBAIC0xNDU1LDkgKzE0NTUsNTAgQEAgc3RhdGljIGludCBnZW42X2Rv X3Jlc2V0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJcmV0dXJuIHJldDsKIH0KIAorc3RhdGlj IGludCB3YWl0X2Zvcl9yZWdpc3RlcihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYs CisJCQkgICAgIGNvbnN0IHUzMiByZWcsCisJCQkgICAgIGNvbnN0IHUzMiBtYXNrLAorCQkJICAg ICBjb25zdCB1MzIgdmFsdWUsCisJCQkgICAgIGNvbnN0IHVuc2lnbmVkIGxvbmcgdGltZW91dF9t cykKK3sKKwlyZXR1cm4gd2FpdF9mb3IoKEk5MTVfUkVBRChyZWcpICYgbWFzaykgPT0gdmFsdWUs IHRpbWVvdXRfbXMpOworfQorCitzdGF0aWMgaW50IGdlbjhfZG9fcmVzZXQoc3RydWN0IGRybV9k ZXZpY2UgKmRldikKK3sKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYt PmRldl9wcml2YXRlOworCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZTsKKwlpbnQgaTsK KworCWZvcl9lYWNoX3JpbmcoZW5naW5lLCBkZXZfcHJpdiwgaSkgeworCQlJOTE1X1dSSVRFKFJJ TkdfUkVTRVRfQ1RMKGVuZ2luZS0+bW1pb19iYXNlKSwKKwkJCSAgIF9NQVNLRURfQklUX0VOQUJM RShSRVNFVF9DVExfUkVRVUVTVF9SRVNFVCkpOworCisJCWlmICh3YWl0X2Zvcl9yZWdpc3Rlcihk ZXZfcHJpdiwKKwkJCQkgICAgICBSSU5HX1JFU0VUX0NUTChlbmdpbmUtPm1taW9fYmFzZSksCisJ CQkJICAgICAgUkVTRVRfQ1RMX1JFQURZX1RPX1JFU0VULAorCQkJCSAgICAgIFJFU0VUX0NUTF9S RUFEWV9UT19SRVNFVCwKKwkJCQkgICAgICA3MDApKSB7CisJCQlEUk1fRVJST1IoIiVzOiByZXNl dCByZXF1ZXN0IHRpbWVvdXRcbiIsIGVuZ2luZS0+bmFtZSk7CisJCQlnb3RvIG5vdF9yZWFkeTsK KwkJfQorCX0KKworCXJldHVybiBnZW42X2RvX3Jlc2V0KGRldik7CisKK25vdF9yZWFkeToKKwlm b3JfZWFjaF9yaW5nKGVuZ2luZSwgZGV2X3ByaXYsIGkpCisJCUk5MTVfV1JJVEUoUklOR19SRVNF VF9DVEwoZW5naW5lLT5tbWlvX2Jhc2UpLAorCQkJICAgX01BU0tFRF9CSVRfRElTQUJMRShSRVNF VF9DVExfUkVRVUVTVF9SRVNFVCkpOworCisJcmV0dXJuIC1FSU87Cit9CisKIHN0YXRpYyBpbnQg KCppbnRlbF9nZXRfZ3B1X3Jlc2V0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpKShzdHJ1Y3QgZHJt X2RldmljZSAqKQogewotCWlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA+PSA2KQorCWlmIChJTlRF TF9JTkZPKGRldiktPmdlbiA+PSA4KQorCQlyZXR1cm4gZ2VuOF9kb19yZXNldDsKKwllbHNlIGlm IChJTlRFTF9JTkZPKGRldiktPmdlbiA+PSA2KQogCQlyZXR1cm4gZ2VuNl9kb19yZXNldDsKIAll bHNlIGlmIChJU19HRU41KGRldikpCiAJCXJldHVybiBpcm9ubGFrZV9kb19yZXNldDsKLS0gCjEu OS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRl bC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDov L2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=