From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [RFC 22/39] drm/i915: Add scheduler hook to GPU reset Date: Fri, 17 Jul 2015 15:33:31 +0100 Message-ID: <1437143628-6329-23-git-send-email-John.C.Harrison@Intel.com> References: <1437143628-6329-1-git-send-email-John.C.Harrison@Intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id D18006E4FD for ; Fri, 17 Jul 2015 07:34:15 -0700 (PDT) In-Reply-To: <1437143628-6329-1-git-send-email-John.C.Harrison@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 RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KCldoZW4gdGhl IHdhdGNoZG9nIHJlc2V0cyB0aGUgR1BVLCB0aGUgc2NoZWR1bGVyIG5lZWRzIHRvIGtub3cgc28g dGhhdCBpdCBjYW4KY2xlYW4gdXAgaXQncyB2aWV3IG9mIHRoZSB3b3JsZC4gQWxsIGluIGZsaWdo dCBub2RlcyBtdXN0IGJlIG1hcmtlZCBhcyBkZWFkIHNvCnRoYXQgdGhlIHNjaGVkdWxlciBkb2Vz IG5vdCB3YWl0IGZvcmV2ZXIgZm9yIHRoZW0gdG8gY29tcGxldGUuIEFsc28sIGFsbCBxdWV1ZWQK bm9kZXMgbXVzdCBiZSBtYXJrZWQgYXMgZGVhZCBzbyB0aGF0IHRoZSBzY2hlZHVsZXIgZG9lcyBu b3QgZGVhZCBsb2NrIHRoZSByZXNldApjb2RlIGJ5IHNheWluZyB0aGF0IHRoZSByaW5nIGNhbiBu b3QgYmUgaWRsZWQgYW5kIGl0IG11c3QgY29tZSBiYWNrIGFnYWluIGxhdGVyLgoKQ2hhbmdlLUlk OiBJMTg0ZWI1OWM1YzFhMTM4NWY5YzE3ZGI2NmM3Y2M0NmY4OTA0ZWViZApGb3I6IFZJWi0xNTg3 ClNpZ25lZC1vZmYtYnk6IEpvaG4gSGFycmlzb24gPEpvaG4uQy5IYXJyaXNvbkBJbnRlbC5jb20+ Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyAgICAgICB8ICAyICsrCiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3NjaGVkdWxlci5jIHwgNjMgKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKystLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfc2NoZWR1bGVyLmgg fCAgOCArKysrLQogMyBmaWxlcyBjaGFuZ2VkLCA2OCBpbnNlcnRpb25zKCspLCA1IGRlbGV0aW9u cygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCmluZGV4IDYxNDJlNjguLjZkNzJjYWEgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9nZW0uYwpAQCAtMzE4Nyw2ICszMTg3LDggQEAgdm9pZCBpOTE1X2dlbV9y ZXNldChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJp bmc7CiAJaW50IGk7CiAKKwlpOTE1X3NjaGVkdWxlcl9raWxsX2FsbChkZXYpOworCiAJLyoKIAkg KiBCZWZvcmUgd2UgZnJlZSB0aGUgb2JqZWN0cyBmcm9tIHRoZSByZXF1ZXN0cywgd2UgbmVlZCB0 byBpbnNwZWN0CiAJICogdGhlbSBmb3IgZmluZGluZyB0aGUgZ3VpbHR5IHBhcnR5LiBBcyB0aGUg cmVxdWVzdHMgb25seSBib3Jyb3cKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfc2NoZWR1bGVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3NjaGVkdWxlci5jCmlu ZGV4IDczYzliYTYuLjMxNTVmNDIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfc2NoZWR1bGVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9zY2hlZHVsZXIu YwpAQCAtMzQxLDYgKzM0MSw1NiBAQCBzdGF0aWMgdm9pZCBpOTE1X3NjaGVkdWxlcl9ub2RlX2tp bGwoc3RydWN0IGk5MTVfc2NoZWR1bGVyX3F1ZXVlX2VudHJ5ICpub2RlKQogCW5vZGUtPnN0YXR1 cyA9IGk5MTVfc3FzX2RlYWQ7CiB9CiAKKy8qIEFiYW5kb24gYSBxdWV1ZWQgbm9kZSBjb21wbGV0 ZWx5LiBGb3IgZXhhbXBsZSBiZWNhdXNlIHRoZSBkcml2ZXIgaXMgYmVpbmcKKyAqIHJlc2V0IGFu ZCBpdCBpcyBub3QgdmFsaWQgdG8gcHJlc2VydmUgYWJzb2x1dGVseSBhbnkgc3RhdGUgYXQgYWxs IGFjcm9zcyB0aGUKKyAqIHJlaW5pdGlhbGlzYXRpb24gc2VxdWVuY2UuICovCitzdGF0aWMgdm9p ZCBpOTE1X3NjaGVkdWxlcl9ub2RlX2tpbGxfcXVldWVkKHN0cnVjdCBpOTE1X3NjaGVkdWxlcl9x dWV1ZV9lbnRyeSAqbm9kZSkKK3sKKwlCVUdfT04oIW5vZGUpOworCUJVR19PTighSTkxNV9TUVNf SVNfUVVFVUVEKG5vZGUpKTsKKworCW5vZGUtPnN0YXR1cyA9IGk5MTVfc3FzX2RlYWQ7Cit9CisK Ky8qIFRoZSBzeXN0ZW0gaXMgdG9hc3QuIFRlcm1pbmF0ZSBhbGwgbm9kZXMgd2l0aCBleHRyZW1l IHByZWp1ZGljZS4gKi8KK3ZvaWQgaTkxNV9zY2hlZHVsZXJfa2lsbF9hbGwoc3RydWN0IGRybV9k ZXZpY2UgKmRldikKK3sKKwlzdHJ1Y3QgaTkxNV9zY2hlZHVsZXJfcXVldWVfZW50cnkgICAqbm9k ZTsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAgICAgICAgICAgICAqZGV2X3ByaXYgPSBkZXYt PmRldl9wcml2YXRlOworCXN0cnVjdCBpOTE1X3NjaGVkdWxlciAgICAgICAgICAgICAgICpzY2hl ZHVsZXIgPSBkZXZfcHJpdi0+c2NoZWR1bGVyOworCXVuc2lnbmVkIGxvbmcgICBmbGFnczsKKwlp bnQgICAgICAgICAgICAgcjsKKworCXNwaW5fbG9ja19pcnFzYXZlKCZzY2hlZHVsZXItPmxvY2ss IGZsYWdzKTsKKworCWZvciAociA9IDA7IHIgPCBJOTE1X05VTV9SSU5HUzsgcisrKSB7CisJCWxp c3RfZm9yX2VhY2hfZW50cnkobm9kZSwgJnNjaGVkdWxlci0+bm9kZV9xdWV1ZVtyXSwgbGluaykg eworCQkJc3dpdGNoIChub2RlLT5zdGF0dXMpIHsKKwkJCWNhc2UgSTkxNV9TUVNfQ0FTRV9DT01Q TEVURToKKwkJCWJyZWFrOworCisJCQljYXNlIEk5MTVfU1FTX0NBU0VfRkxZSU5HOgorCQkJCWk5 MTVfc2NoZWR1bGVyX25vZGVfa2lsbChub2RlKTsKKwkJCWJyZWFrOworCisJCQljYXNlIEk5MTVf U1FTX0NBU0VfUVVFVUVEOgorCQkJCWk5MTVfc2NoZWR1bGVyX25vZGVfa2lsbF9xdWV1ZWQobm9k ZSk7CisJCQlicmVhazsKKworCQkJZGVmYXVsdDoKKwkJCQkvKiBXb3Qgbm8gc3RhdGU/ISAqLwor CQkJCUJVRygpOworCQkJfQorCQl9CisJfQorCisJbWVtc2V0KHNjaGVkdWxlci0+bGFzdF9pcnFf c2Vxbm8sIDB4MDAsIHNpemVvZihzY2hlZHVsZXItPmxhc3RfaXJxX3NlcW5vKSk7CisKKwlzcGlu X3VubG9ja19pcnFyZXN0b3JlKCZzY2hlZHVsZXItPmxvY2ssIGZsYWdzKTsKKworCXF1ZXVlX3dv cmsoZGV2X3ByaXYtPndxLCAmZGV2X3ByaXYtPm1tLnNjaGVkdWxlcl93b3JrKTsKK30KKwogLyoK ICAqIFRoZSBiYXRjaCB0YWdnZWQgd2l0aCB0aGUgaW5kaWNhdGVkIHNlcWVuY2UgbnVtYmVyIGhh cyBjb21wbGV0ZWQuCiAgKiBTZWFyY2ggdGhlIHF1ZXVlIGZvciBpdCwgdXBkYXRlIGl0cyBzdGF0 dXMgYW5kIHRob3NlIG9mIGFueSBiYXRjaGVzCkBAIC05MTIsNyArOTYyLDcgQEAgc3RhdGljIGlu dCBpOTE1X3NjaGVkdWxlcl9zdWJtaXQoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywgYm9v bCB3YXNfbG9ja2VkKQogCQlzY2hlZHVsZXItPmZsYWdzW3JpbmctPmlkXSAmPSB+aTkxNV9zZl9z dWJtaXR0aW5nOwogCiAJCWlmIChyZXQpIHsKLQkJCWJvb2wgcmVxdWV1ZSA9IHRydWU7CisJCQlp bnQgcmVxdWV1ZSA9IDE7CiAKIAkJCS8qIE9oIGRlYXIhIEVpdGhlciB0aGUgbm9kZSBpcyBicm9r ZW4gb3IgdGhlIHJpbmcgaXMKIAkJCSAqIGJ1c3kuIFNvIG5lZWQgdG8ga2lsbCB0aGUgbm9kZSBv ciByZXF1ZXVlIGl0IGFuZCB0cnkKQEAgLTkyMiw3ICs5NzIsNyBAQCBzdGF0aWMgaW50IGk5MTVf c2NoZWR1bGVyX3N1Ym1pdChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLCBib29sIHdhc19s b2NrZWQpCiAJCQljYXNlIEVOT0RFVjoKIAkJCWNhc2UgRU5PRU5UOgogCQkJCS8qIEZhdGFsIGVy cm9ycy4gS2lsbCB0aGUgbm9kZS4gKi8KLQkJCQlyZXF1ZXVlID0gZmFsc2U7CisJCQkJcmVxdWV1 ZSA9IC0xOwogCQkJYnJlYWs7CiAKIAkJCWNhc2UgRUFHQUlOOgpAQCAtOTQxLDEzICs5OTEsMTgg QEAgc3RhdGljIGludCBpOTE1X3NjaGVkdWxlcl9zdWJtaXQoc3RydWN0IGludGVsX2VuZ2luZV9j cyAqcmluZywgYm9vbCB3YXNfbG9ja2VkKQogCQkJYnJlYWs7CiAJCQl9CiAKLQkJCWlmIChyZXF1 ZXVlKSB7CisJCQkvKiBDaGVjayB0aGF0IHRoZSB3YXRjaGRvZy9yZXNldCBjb2RlIGhhcyBub3Qg bnVrZWQKKwkJCSAqIHRoZSBub2RlIHdoaWxlIHdlIHdlcmVuJ3QgbG9va2luZzogKi8KKwkJCWlm IChub2RlLT5zdGF0dXMgPT0gaTkxNV9zcXNfZGVhZCkKKwkJCQlyZXF1ZXVlID0gMDsKKworCQkJ aWYgKHJlcXVldWUgPT0gMSkgewogCQkJCWk5MTVfc2NoZWR1bGVyX25vZGVfcmVxdWV1ZShub2Rl KTsKIAkJCQkvKiBObyBwb2ludCBzcGlubmluZyBpZiB0aGUgcmluZyBpcyBjdXJyZW50bHkKIAkJ CQkgKiB1bmF2YWlsYWJsZSBzbyBqdXN0IGdpdmUgdXAgYW5kIGNvbWUgYmFjawogCQkJCSAqIGxh dGVyLiAqLwogCQkJCWJyZWFrOwotCQkJfSBlbHNlCisJCQl9IGVsc2UgaWYgKHJlcXVldWUgPT0g LTEpCiAJCQkJaTkxNV9zY2hlZHVsZXJfbm9kZV9raWxsKG5vZGUpOwogCQl9CiAKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfc2NoZWR1bGVyLmggYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X3NjaGVkdWxlci5oCmluZGV4IDVlMDk0ZDUuLmI0NDBlNjIgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfc2NoZWR1bGVyLmgKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9zY2hlZHVsZXIuaApAQCAtMzYsNyArMzYsNyBAQCBlbnVtIGk5MTVf c2NoZWR1bGVyX3F1ZXVlX3N0YXR1cyB7CiAJaTkxNV9zcXNfZmx5aW5nLAogCS8qIEZpbmlzaGVk IHByb2Nlc3Npbmcgb24gdGhlIGhhcmR3YXJlOiAqLwogCWk5MTVfc3FzX2NvbXBsZXRlLAotCS8q IEtpbGxlZCBieSBjYXRhc3Ryb3BoaWMgc3VibWlzc2lvbiBmYWlsdXJlOiAqLworCS8qIEtpbGxl ZCBieSB3YXRjaGRvZyBvciBjYXRhc3Ryb3BoaWMgc3VibWlzc2lvbiBmYWlsdXJlOiAqLwogCWk5 MTVfc3FzX2RlYWQsCiAJLyogTGltaXQgdmFsdWUgZm9yIHVzZSB3aXRoIGFycmF5cy9sb29wcyAq LwogCWk5MTVfc3FzX01BWApAQCAtNDcsNiArNDcsMTEgQEAgZW51bSBpOTE1X3NjaGVkdWxlcl9x dWV1ZV9zdGF0dXMgewogI2RlZmluZSBJOTE1X1NRU19JU19DT01QTEVURShub2RlKQkoKChub2Rl KS0+c3RhdHVzID09IGk5MTVfc3FzX2NvbXBsZXRlKSB8fCBcCiAJCQkJCSAoKG5vZGUpLT5zdGF0 dXMgPT0gaTkxNV9zcXNfZGVhZCkpCiAKKyNkZWZpbmUgSTkxNV9TUVNfQ0FTRV9RVUVVRUQJCWk5 MTVfc3FzX3F1ZXVlZAorI2RlZmluZSBJOTE1X1NRU19DQVNFX0ZMWUlORwkJaTkxNV9zcXNfZmx5 aW5nCisjZGVmaW5lIEk5MTVfU1FTX0NBU0VfQ09NUExFVEUJCWk5MTVfc3FzX2NvbXBsZXRlOgkJ XAorCQkJCQljYXNlIGk5MTVfc3FzX2RlYWQKKwogc3RydWN0IGk5MTVfc2NoZWR1bGVyX29ial9l bnRyeSB7CiAJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgICAgICAgICAgKm9iajsKIH07CkBA IC05MSw2ICs5Niw3IEBAIGludCAgICAgICAgIGk5MTVfc2NoZWR1bGVyX2Nsb3NlZmlsZShzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2LAogdm9pZCAgICAgICAgaTkxNV9nZW1fc2NoZWR1bGVyX2NsZWFu X25vZGUoc3RydWN0IGk5MTVfc2NoZWR1bGVyX3F1ZXVlX2VudHJ5ICpub2RlKTsKIGludCAgICAg ICAgIGk5MTVfc2NoZWR1bGVyX3F1ZXVlX2V4ZWNidWZmZXIoc3RydWN0IGk5MTVfc2NoZWR1bGVy X3F1ZXVlX2VudHJ5ICpxZSk7CiBpbnQgICAgICAgICBpOTE1X3NjaGVkdWxlcl9oYW5kbGVfaXJx KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpOwordm9pZCAgICAgICAgaTkxNV9zY2hlZHVs ZXJfa2lsbF9hbGwoc3RydWN0IGRybV9kZXZpY2UgKmRldik7CiB2b2lkICAgICAgICBpOTE1X2dl bV9zY2hlZHVsZXJfd29ya19oYW5kbGVyKHN0cnVjdCB3b3JrX3N0cnVjdCAqd29yayk7CiBpbnQg ICAgICAgICBpOTE1X3NjaGVkdWxlcl9mbHVzaChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5n LCBib29sIGlzX2xvY2tlZCk7CiBpbnQgICAgICAgICBpOTE1X3NjaGVkdWxlcl9mbHVzaF9yZXF1 ZXN0KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLAotLSAKMS45LjEKCl9fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5n IGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRl c2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==