From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dave Gordon Subject: [PATCH 2/4] drm/i915: Fix context/engine cleanup order Date: Thu, 21 Jan 2016 19:37:45 +0000 Message-ID: <1453405067-32890-3-git-send-email-david.s.gordon@intel.com> References: <1453405067-32890-1-git-send-email-david.s.gordon@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id B90296EB3B for ; Thu, 21 Jan 2016 11:37:54 -0800 (PST) In-Reply-To: <1453405067-32890-1-git-send-email-david.s.gordon@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 RnJvbTogTmljayBIb2F0aCA8bmljaG9sYXMuaG9hdGhAaW50ZWwuY29tPgoKU3dhcCB0aGUgb3Jk ZXIgb2YgY29udGV4dCAmIGVuZ2luZSBjbGVhbnVwLCBzbyB0aGF0IGNvbnRleHRzIGFyZSBjbGVh bmVkCnVwIGZpcnN0LCBhbmQgKnRoZW4qIGVuZ2luZXMuIFRoaXMgaXMgYSBtb3JlIHNlbnNpYmxl IG9yZGVyIGFueXdheSwgYnV0CmluIHBhcnRpY3VsYXIgaGFzIGJlY29tZSBuZWNlc3Nhcnkgc2lu Y2UgdGhlICdpbnRlbF9yaW5nX2luaXRpYWxpemVkKCkKbXVzdCBiZSBzaW1wbGUgYW5kIGlubGlu ZScgcGF0Y2gsIHdoaWNoIG5vdyB1c2VzIHJpbmctPmRldiBhcyBhbgonaW5pdGlhbGlzZWQnIGZs YWcsIHNvIGl0IGNhbiBub3cgYmUgTlVMTCBhZnRlciBlbmdpbmUgdGVhcmRvd24uIFRoaXMKaW4g dHVybiBjYW4gY2F1c2UgYSBwcm9ibGVtIGluIHRoZSBjb250ZXh0IGNvZGUsIHdoaWNoICh1c2Vk IHRvKSBjaGVjawp0aGUgcmluZy0+ZGV2LT5zdHJ1Y3RfbXV0ZXggLS0gY2F1c2luZyBhIGZhdWx0 IGlmIHJpbmctPmRldiB3YXMgTlVMTC4KCkFsc28gcmVuYW1lIHRoZSBjbGVhbnVwIGZ1bmN0aW9u IHRvIHJlZmxlY3Qgd2hhdCBpdCBhY3R1YWxseSBkb2VzCihjbGVhbnVwIGVuZ2luZXMsIG5vdCBh IHJpbmdidWZmZXIpLCBhbmQgZml4IGFuIGFubm95aW5nIHdoaXRlc3BhY2UgaXNzdWUuCgp2Mjog QWxzbyBtYWtlIHRoZSBmaXggaW4gaTkxNV9sb2FkX21vZGVzZXRfaW5pdCwgbm90IGp1c3QgaW4K ICAgIGk5MTVfZHJpdmVyX3VubG9hZCAoQ2hyaXMgV2lsc29uKQp2MzogSGFkIGV4dHJhIHN0dWZm IGluIGl0Lgp2NDogUmV2ZXJ0ZWQgZXh0cmEgc3R1ZmYgKHNvIHdlJ3JlIGJhY2sgdG8gdjIpLgog ICAgUmViYXNlZCBhbmQgdXBkYXRlZCBjb21tZW50YXJ5IGFib3ZlIChEYXZlIEdvcmRvbikuCgpT aWduZWQtb2ZmLWJ5OiBOaWNrIEhvYXRoIDxuaWNob2xhcy5ob2F0aEBpbnRlbC5jb20+ClNpZ25l ZC1vZmYtYnk6IERhdmUgR29yZG9uIDxkYXZpZC5zLmdvcmRvbkBpbnRlbC5jb20+ClJldmlld2Vk LWJ5OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4gKHYyKQoKQ2M6IE1p a2EgS3VvcHBhbGEgPG1pa2Eua3VvcHBhbGFAbGludXguaW50ZWwuY29tPgpDYzogRGFuaWVsIFZl dHRlciA8ZGFuaWVsLnZldHRlckBmZndsbC5jaD4KQ2M6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hy aXMtd2lsc29uLmNvLnVrPgoKLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RtYS5jIHwg IDQgKystLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCB8ICAyICstCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIHwgMjMgKysrKysrKysrKysrLS0tLS0tLS0tLS0KIDMg ZmlsZXMgY2hhbmdlZCwgMTUgaW5zZXJ0aW9ucygrKSwgMTQgZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kbWEuYyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZG1hLmMKaW5kZXggZDcwZDk2Zi4uNDcyNWU4ZCAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9kbWEuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2RtYS5jCkBAIC00NTEsOCArNDUxLDggQEAgc3RhdGljIGludCBpOTE1X2xvYWRfbW9kZXNldF9p bml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAKIGNsZWFudXBfZ2VtOgogCW11dGV4X2xvY2so JmRldi0+c3RydWN0X211dGV4KTsKLQlpOTE1X2dlbV9jbGVhbnVwX3JpbmdidWZmZXIoZGV2KTsK IAlpOTE1X2dlbV9jb250ZXh0X2ZpbmkoZGV2KTsKKwlpOTE1X2dlbV9jbGVhbnVwX2VuZ2luZXMo ZGV2KTsKIAltdXRleF91bmxvY2soJmRldi0+c3RydWN0X211dGV4KTsKIGNsZWFudXBfaXJxOgog CWludGVsX2d1Y191Y29kZV9maW5pKGRldik7CkBAIC0xMTk2LDggKzExOTYsOCBAQCBpbnQgaTkx NV9kcml2ZXJfdW5sb2FkKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAKIAlpbnRlbF9ndWNfdWNv ZGVfZmluaShkZXYpOwogCW11dGV4X2xvY2soJmRldi0+c3RydWN0X211dGV4KTsKLQlpOTE1X2dl bV9jbGVhbnVwX3JpbmdidWZmZXIoZGV2KTsKIAlpOTE1X2dlbV9jb250ZXh0X2ZpbmkoZGV2KTsK KwlpOTE1X2dlbV9jbGVhbnVwX2VuZ2luZXMoZGV2KTsKIAltdXRleF91bmxvY2soJmRldi0+c3Ry dWN0X211dGV4KTsKIAlpbnRlbF9mYmNfY2xlYW51cF9jZmIoZGV2X3ByaXYpOwogCWk5MTVfZ2Vt X2NsZWFudXBfc3RvbGVuKGRldik7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCAyMDQ2NjFm Li4wMjFlODhhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTMwMTIsNyArMzAxMiw3IEBA IGludCBpOTE1X2dlbV9pbml0X3JpbmdzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogaW50IF9f bXVzdF9jaGVjayBpOTE1X2dlbV9pbml0X2h3KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogaW50 IGk5MTVfZ2VtX2wzX3JlbWFwKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLCBpbnQg c2xpY2UpOwogdm9pZCBpOTE1X2dlbV9pbml0X3N3aXp6bGluZyhzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2KTsKLXZvaWQgaTkxNV9nZW1fY2xlYW51cF9yaW5nYnVmZmVyKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYpOwordm9pZCBpOTE1X2dlbV9jbGVhbnVwX2VuZ2luZXMoc3RydWN0IGRybV9kZXZpY2Ug KmRldik7CiBpbnQgX19tdXN0X2NoZWNrIGk5MTVfZ3B1X2lkbGUoc3RydWN0IGRybV9kZXZpY2Ug KmRldik7CiBpbnQgX19tdXN0X2NoZWNrIGk5MTVfZ2VtX3N1c3BlbmQoc3RydWN0IGRybV9kZXZp Y2UgKmRldik7CiB2b2lkIF9faTkxNV9hZGRfcmVxdWVzdChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3Jl cXVlc3QgKnJlcSwKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCmluZGV4IDM3MWJiYjIuLjc5OWE1M2Eg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpAQCAtNDkxMiw3ICs0OTEyLDcgQEAgaW50IGk5MTVf Z2VtX2luaXRfcmluZ3Moc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJcmVxID0gaTkxNV9nZW1f cmVxdWVzdF9hbGxvYyhyaW5nLCBOVUxMKTsKIAkJaWYgKElTX0VSUihyZXEpKSB7CiAJCQlyZXQg PSBQVFJfRVJSKHJlcSk7Ci0JCQlpOTE1X2dlbV9jbGVhbnVwX3JpbmdidWZmZXIoZGV2KTsKKwkJ CWk5MTVfZ2VtX2NsZWFudXBfZW5naW5lcyhkZXYpOwogCQkJZ290byBvdXQ7CiAJCX0KIApAQCAt NDkyNSw3ICs0OTI1LDcgQEAgaW50IGk5MTVfZ2VtX2luaXRfcmluZ3Moc3RydWN0IGRybV9kZXZp Y2UgKmRldikKIAkJaWYgKHJldCAmJiByZXQgIT0gLUVJTykgewogCQkJRFJNX0VSUk9SKCJQUEdU VCBlbmFibGUgcmluZyAjJWQgZmFpbGVkICVkXG4iLCBpLCByZXQpOwogCQkJaTkxNV9nZW1fcmVx dWVzdF9jYW5jZWwocmVxKTsKLQkJCWk5MTVfZ2VtX2NsZWFudXBfcmluZ2J1ZmZlcihkZXYpOwor CQkJaTkxNV9nZW1fY2xlYW51cF9lbmdpbmVzKGRldik7CiAJCQlnb3RvIG91dDsKIAkJfQogCkBA IC00OTMzLDcgKzQ5MzMsNyBAQCBpbnQgaTkxNV9nZW1faW5pdF9yaW5ncyhzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2KQogCQlpZiAocmV0ICYmIHJldCAhPSAtRUlPKSB7CiAJCQlEUk1fRVJST1IoIkNv bnRleHQgZW5hYmxlIHJpbmcgIyVkIGZhaWxlZCAlZFxuIiwgaSwgcmV0KTsKIAkJCWk5MTVfZ2Vt X3JlcXVlc3RfY2FuY2VsKHJlcSk7Ci0JCQlpOTE1X2dlbV9jbGVhbnVwX3JpbmdidWZmZXIoZGV2 KTsKKwkJCWk5MTVfZ2VtX2NsZWFudXBfZW5naW5lcyhkZXYpOwogCQkJZ290byBvdXQ7CiAJCX0K IApAQCAtNTAwOCw3ICs1MDA4LDcgQEAgaW50IGk5MTVfZ2VtX2luaXQoc3RydWN0IGRybV9kZXZp Y2UgKmRldikKIH0KIAogdm9pZAotaTkxNV9nZW1fY2xlYW51cF9yaW5nYnVmZmVyKHN0cnVjdCBk cm1fZGV2aWNlICpkZXYpCitpOTE1X2dlbV9jbGVhbnVwX2VuZ2luZXMoc3RydWN0IGRybV9kZXZp Y2UgKmRldikKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRl dl9wcml2YXRlOwogCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmc7CkBAIC01MDE3LDEzICs1 MDE3LDE0IEBAIGludCBpOTE1X2dlbV9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJZm9y X2VhY2hfcmluZyhyaW5nLCBkZXZfcHJpdiwgaSkKIAkJZGV2X3ByaXYtPmd0LmNsZWFudXBfcmlu ZyhyaW5nKTsKIAotICAgIGlmIChpOTE1LmVuYWJsZV9leGVjbGlzdHMpCi0gICAgICAgICAgICAv KgotICAgICAgICAgICAgICogTmVpdGhlciB0aGUgQklPUywgb3Vyc2VsdmVzIG9yIGFueSBvdGhl ciBrZXJuZWwKLSAgICAgICAgICAgICAqIGV4cGVjdHMgdGhlIHN5c3RlbSB0byBiZSBpbiBleGVj bGlzdHMgbW9kZSBvbiBzdGFydHVwLAotICAgICAgICAgICAgICogc28gd2UgbmVlZCB0byByZXNl dCB0aGUgR1BVIGJhY2sgdG8gbGVnYWN5IG1vZGUuCi0gICAgICAgICAgICAgKi8KLSAgICAgICAg ICAgIGludGVsX2dwdV9yZXNldChkZXYpOworCWlmIChpOTE1LmVuYWJsZV9leGVjbGlzdHMpIHsK KwkJLyoKKwkJICogTmVpdGhlciB0aGUgQklPUywgb3Vyc2VsdmVzIG9yIGFueSBvdGhlciBrZXJu ZWwKKwkJICogZXhwZWN0cyB0aGUgc3lzdGVtIHRvIGJlIGluIGV4ZWNsaXN0cyBtb2RlIG9uIHN0 YXJ0dXAsCisJCSAqIHNvIHdlIG5lZWQgdG8gcmVzZXQgdGhlIEdQVSBiYWNrIHRvIGxlZ2FjeSBt b2RlLgorCQkgKi8KKwkJaW50ZWxfZ3B1X3Jlc2V0KGRldik7CisJfQogfQogCiBzdGF0aWMgdm9p ZAotLSAKMS45LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9y ZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4 Cg==