From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH 2/3] drm/i915: Split GEM resetting into 3 phases Date: Tue, 7 Feb 2017 21:12:25 +0000 Message-ID: <20170207211226.14029-2-chris@chris-wilson.co.uk> References: <20170207211226.14029-1-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 808976E0A6 for ; Tue, 7 Feb 2017 21:12:31 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id v77so30534968wmv.0 for ; Tue, 07 Feb 2017 13:12:31 -0800 (PST) In-Reply-To: <20170207211226.14029-1-chris@chris-wilson.co.uk> 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: Mika Kuoppala List-Id: intel-gfx@lists.freedesktop.org Q3VycmVudGx5IHdlIGRvIGEgcmVzZXQgcHJlcGFyZS9maW5pc2ggYXJvdW5kIHRoZSBjYWxsIHRv IHJlc2V0IHRoZSBHUFUsCmJ1dCBpdCBsb29rcyBsaWtlIHdlIG5lZWQgYSBsYXRlciBzdGFnZSBh ZnRlciB0aGUgaHcgaGFzIGJlZW4KcmVpbml0aWFsaXNlZCB0byBhbGxvdyBHRU0gdG8gcmVzdGFy dCBpdHNlbGYuIFN0YXJ0IGJ5IHNwbGl0dGluZyB0aGUgMgpHRU0gcGhhc2VzIGludG8gMzoKCiAg cHJlcGFyZSAtIGJlZm9yZSB0aGUgcmVzZXQsIGNoZWNrIGlmIEdFTSByZWNvdmVyZWQsIHRoZW4g c3RvcCBHRU0KCiAgcmVzZXQgLSBhZnRlciB0aGUgcmVzZXQsIHVwZGF0ZSBHRU0gYm9va2tlZXBp bmcKCiAgZmluaXNoIC0gYWZ0ZXIgdGhlIHJlLWluaXRpYWxpc2F0aW9uIGZvbGxvd2luZyB0aGUg cmVzZXQsIHJlc3RhcnQgR0VNCgpTaWduZWQtb2ZmLWJ5OiBDaHJpcyBXaWxzb24gPGNocmlzQGNo cmlzLXdpbHNvbi5jby51az4KQ2M6IE1pa2EgS3VvcHBhbGEgPG1pa2Eua3VvcHBhbGFAaW50ZWwu Y29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMgfCAgMyArKy0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggfCAgMSArCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dlbS5jIHwgMTEgKysrKysrKystLS0KIDMgZmlsZXMgY2hhbmdlZCwgMTEgaW5zZXJ0aW9u cygrKSwgNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2Rydi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYwppbmRleCBhY2JkNzcy ODM3YjUuLjBhYTRhYzJiNDNjYSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9kcnYuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCkBAIC0xODM2LDcg KzE4MzYsNyBAQCB2b2lkIGk5MTVfcmVzZXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2KQogCQlnb3RvIGVycm9yOwogCX0KIAotCWk5MTVfZ2VtX3Jlc2V0X2ZpbmlzaChkZXZfcHJp dik7CisJaTkxNV9nZW1fcmVzZXQoZGV2X3ByaXYpOwogCWludGVsX292ZXJsYXlfcmVzZXQoZGV2 X3ByaXYpOwogCiAJLyogT2ssIG5vdyBnZXQgdGhpbmdzIGdvaW5nIGFnYWluLi4uICovCkBAIC0x ODU5LDYgKzE4NTksNyBAQCB2b2lkIGk5MTVfcmVzZXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2KQogCQlnb3RvIGVycm9yOwogCX0KIAorCWk5MTVfZ2VtX3Jlc2V0X2ZpbmlzaChk ZXZfcHJpdik7CiAJaTkxNV9xdWV1ZV9oYW5nY2hlY2soZGV2X3ByaXYpOwogCiB3YWtldXA6CmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCAwY2JkMjg5ZGE0YmEuLjk3MmQzNTI1OTg4MyAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBAIC0zMzUzLDYgKzMzNTMsNyBAQCBzdGF0aWMgaW5saW5l IHUzMiBpOTE1X3Jlc2V0X2NvdW50KHN0cnVjdCBpOTE1X2dwdV9lcnJvciAqZXJyb3IpCiB9CiAK IGludCBpOTE1X2dlbV9yZXNldF9wcmVwYXJlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdik7Cit2b2lkIGk5MTVfZ2VtX3Jlc2V0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdik7CiB2b2lkIGk5MTVfZ2VtX3Jlc2V0X2ZpbmlzaChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYpOwogdm9pZCBpOTE1X2dlbV9zZXRfd2VkZ2VkKHN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdik7CiB2b2lkIGk5MTVfZ2VtX2NsZmx1c2hfb2JqZWN0KHN0cnVjdCBk cm1faTkxNV9nZW1fb2JqZWN0ICpvYmosIGJvb2wgZm9yY2UpOwpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt LmMKaW5kZXggMTdiY2VjOWYxMzIxLi5lMTI1YzBkNjFjZTkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n ZW0uYwpAQCAtMjc2MCw3ICsyNzYwLDcgQEAgc3RhdGljIHZvaWQgaTkxNV9nZW1fcmVzZXRfZW5n aW5lKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIAkJZW5naW5lX3NraXBfY29udGV4 dChyZXF1ZXN0KTsKIH0KIAotdm9pZCBpOTE1X2dlbV9yZXNldF9maW5pc2goc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2KQordm9pZCBpOTE1X2dlbV9yZXNldChzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7CiAJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5l OwogCWVudW0gaW50ZWxfZW5naW5lX2lkIGlkOwpAQCAtMjc3Miw4ICsyNzcyLDYgQEAgdm9pZCBp OTE1X2dlbV9yZXNldF9maW5pc2goc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQog CWZvcl9lYWNoX2VuZ2luZShlbmdpbmUsIGRldl9wcml2LCBpZCkKIAkJaTkxNV9nZW1fcmVzZXRf ZW5naW5lKGVuZ2luZSk7CiAKLQlpOTE1X2dlbV9yZXN0b3JlX2ZlbmNlcyhkZXZfcHJpdik7Ci0K IAlpZiAoZGV2X3ByaXYtPmd0LmF3YWtlKSB7CiAJCWludGVsX3Nhbml0aXplX2d0X3Bvd2Vyc2F2 ZShkZXZfcHJpdik7CiAJCWludGVsX2VuYWJsZV9ndF9wb3dlcnNhdmUoZGV2X3ByaXYpOwpAQCAt Mjc4Miw2ICsyNzgwLDEzIEBAIHZvaWQgaTkxNV9nZW1fcmVzZXRfZmluaXNoKHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAl9CiB9CiAKK3ZvaWQgaTkxNV9nZW1fcmVzZXRfZmlu aXNoKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKK3sKKwlsb2NrZGVwX2Fzc2Vy dF9oZWxkKCZkZXZfcHJpdi0+ZHJtLnN0cnVjdF9tdXRleCk7CisKKwlpOTE1X2dlbV9yZXN0b3Jl X2ZlbmNlcyhkZXZfcHJpdik7Cit9CisKIHN0YXRpYyB2b2lkIG5vcF9zdWJtaXRfcmVxdWVzdChz dHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3QpCiB7CiAJZG1hX2ZlbmNlX3NldF9l cnJvcigmcmVxdWVzdC0+ZmVuY2UsIC1FSU8pOwotLSAKMi4xMS4wCgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0Cklu dGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK