From: Mika Kuoppala Subject: [PATCH 6/7] drm/i915: find guilty batch buffer on ring resets Date: Wed, 12 Jun 2013 15:05:26 +0300 Message-ID: <1371038726-29358-1-git-send-email-mika.kuoppala@intel.com> References: Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 9517EE5BFA for ; Wed, 12 Jun 2013 05:05:30 -0700 (PDT) In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org QWZ0ZXIgaGFuZyBjaGVjayB0aW1lciBoYXMgZGVjbGFyZWQgZ3B1IHRvIGJlIGhhbmcsCnJpbmdz IGFyZSByZXNldC4gSW4gcmluZyByZXNldCwgd2hlbiBjbGVhcmluZwpyZXF1ZXN0IGxpc3QsIGRv IHBvc3QgbW9ydGVtIGFuYWx5c2lzIHRvIGZpbmQgb3V0CnRoZSBndWlsdHkgYmF0Y2ggYnVmZmVy LgoKU2VsZWN0IHJlcXVlc3RzIGZvciBmdXJ0aGVyIGFuYWx5c2lzIGJ5IGluc3BlY3RpbmcKdGhl IGNvbXBsZXRlZCBzZXF1ZW5jZSBudW1iZXIgd2hpY2ggaGFzIGJlZW4gdXBkYXRlZAppbnRvIHRo ZSBIV1MgcGFnZS4gSWYgcmVxdWVzdCB3YXMgY29tcGxldGVkLCBpdCBjYW4ndApiZSByZWxhdGVk IHRvIHRoZSBoYW5nLgoKRm9yIG5vbmNvbXBsZXRlZCByZXF1ZXN0cyBtYXJrIHRoZSBiYXRjaCBh cyBndWlsdHkKaWYgdGhlIHJpbmcgd2FzIG5vdCB3YWl0aW5nIGFuZCB0aGUgcmluZyBoZWFkIHdh cwpzdHVjayBpbnNpZGUgdGhlIGJ1ZmZlciBvYmplY3Qgb3IgaW4gdGhlIGZsdXNoIHJlZ2lvbgpy aWdodCBhZnRlciB0aGUgYmF0Y2guIEZvciBldmVyeXRoaW5nIGVsc2UsIG1hcmsKdGhlbSBhcyBp bm5vY2VudHMuCgp2MjogRml4ZWQgYSB0eXBvIGluIGNvbW1pdCBtZXNzYWdlIChWaWxsZSBTeXJq w6Rsw6QpCgp2MzogLSBtb3JlIGRlc2NyaXB0aXZlIGZ1bmN0aW9uIHBhcmFtZXRlcnMgKENocmlz IFdpbHNvbikKICAgIC0gdXNlIG1hc2tlZCBoZWFkIGFkZHJlc3Mgd2hlbiBpbnNwZWN0aW5nIGlm IHJlcXVlc3QgaXMgaW4gcmluZwogICAgLSBzL2hhbmdjaGVjay5sYXN0X2FjdGlvbi9oYW5nY2hl Y2suYWN0aW9uCiAgICAtIGFkZGVkIGNvbW1lbnQgYWJvdXQgdW5tYXNrZWQgaGVhZCBoaXR0aW5n IGJhdGNoX29iaiByYW5nZQoKUmV2aWV3ZWQtYnk6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMt d2lsc29uLmNvLnVrPgpTaWduZWQtb2ZmLWJ5OiBNaWthIEt1b3BwYWxhIDxtaWthLmt1b3BwYWxh QGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIHwgICA5NyAr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysKIDEgZmlsZSBjaGFuZ2VkLCA5 NyBpbnNlcnRpb25zKCspCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n ZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKaW5kZXggZGMzMmZhZS4uOWIy MGZiYiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYworKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCkBAIC0yMTEwLDYgKzIxMTAsOTQgQEAgaTkx NV9nZW1fcmVxdWVzdF9yZW1vdmVfZnJvbV9jbGllbnQoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1 ZXN0ICpyZXF1ZXN0KQogCXNwaW5fdW5sb2NrKCZmaWxlX3ByaXYtPm1tLmxvY2spOwogfQogCitz dGF0aWMgYm9vbCBpOTE1X2hlYWRfaW5zaWRlX29iamVjdCh1MzIgYWN0aGQsIHN0cnVjdCBkcm1f aTkxNV9nZW1fb2JqZWN0ICpvYmopCit7CisJaWYgKGFjdGhkID49IG9iai0+Z3R0X29mZnNldCAm JgorCSAgICBhY3RoZCA8IG9iai0+Z3R0X29mZnNldCArIG9iai0+YmFzZS5zaXplKQorCQlyZXR1 cm4gdHJ1ZTsKKworCXJldHVybiBmYWxzZTsKK30KKworc3RhdGljIGJvb2wgaTkxNV9oZWFkX2lu c2lkZV9yZXF1ZXN0KGNvbnN0IHUzMiBhY3RoZF91bm1hc2tlZCwKKwkJCQkgICAgIGNvbnN0IHUz MiByZXF1ZXN0X3N0YXJ0LAorCQkJCSAgICAgY29uc3QgdTMyIHJlcXVlc3RfZW5kKQoreworCWNv bnN0IHUzMiBhY3RoZCA9IGFjdGhkX3VubWFza2VkICYgSEVBRF9BRERSOworCisJaWYgKHJlcXVl c3Rfc3RhcnQgPCByZXF1ZXN0X2VuZCkgeworCQlpZiAoYWN0aGQgPj0gcmVxdWVzdF9zdGFydCAm JiBhY3RoZCA8IHJlcXVlc3RfZW5kKQorCQkJcmV0dXJuIHRydWU7CisJfSBlbHNlIGlmIChyZXF1 ZXN0X3N0YXJ0ID4gcmVxdWVzdF9lbmQpIHsKKwkJaWYgKGFjdGhkID49IHJlcXVlc3Rfc3RhcnQg fHwgYWN0aGQgPCByZXF1ZXN0X2VuZCkKKwkJCXJldHVybiB0cnVlOworCX0KKworCXJldHVybiBm YWxzZTsKK30KKworc3RhdGljIGJvb2wgaTkxNV9yZXF1ZXN0X2d1aWx0eShzdHJ1Y3QgZHJtX2k5 MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3QsCisJCQkJY29uc3QgdTMyIGFjdGhkLCBib29sICppbnNp ZGUpCit7CisJLyogVGhlcmUgaXMgYSBwb3NzaWJpbGl0eSB0aGF0IHVubWFza2VkIGhlYWQgYWRk cmVzcworCSAqIHBvaW50aW5nIGluc2lkZSB0aGUgcmluZywgbWF0Y2hlcyB0aGUgYmF0Y2hfb2Jq IGFkZHJlc3MgcmFuZ2UuCisJICogSG93ZXZlciB0aGlzIGlzIGV4dHJlbWVseSB1bmxpa2VseS4K KwkgKi8KKworCWlmIChyZXF1ZXN0LT5iYXRjaF9vYmopIHsKKwkJaWYgKGk5MTVfaGVhZF9pbnNp ZGVfb2JqZWN0KGFjdGhkLCByZXF1ZXN0LT5iYXRjaF9vYmopKSB7CisJCQkqaW5zaWRlID0gdHJ1 ZTsKKwkJCXJldHVybiB0cnVlOworCQl9CisJfQorCisJaWYgKGk5MTVfaGVhZF9pbnNpZGVfcmVx dWVzdChhY3RoZCwgcmVxdWVzdC0+aGVhZCwgcmVxdWVzdC0+dGFpbCkpIHsKKwkJKmluc2lkZSA9 IGZhbHNlOworCQlyZXR1cm4gdHJ1ZTsKKwl9CisKKwlyZXR1cm4gZmFsc2U7Cit9CisKK3N0YXRp YyB2b2lkIGk5MTVfc2V0X3Jlc2V0X3N0YXR1cyhzdHJ1Y3QgaW50ZWxfcmluZ19idWZmZXIgKnJp bmcsCisJCQkJICBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3QsCisJCQkJICB1 MzIgYWN0aGQpCit7CisJc3RydWN0IGk5MTVfY3R4X2hhbmdfc3RhdHMgKmhzID0gTlVMTDsKKwli b29sIGluc2lkZSwgZ3VpbHR5OworCisJLyogSW5ub2NlbnQgdW50aWwgcHJvdmVuIGd1aWx0eSAq LworCWd1aWx0eSA9IGZhbHNlOworCisJaWYgKHJpbmctPmhhbmdjaGVjay5hY3Rpb24gIT0gd2Fp dCAmJgorCSAgICBpOTE1X3JlcXVlc3RfZ3VpbHR5KHJlcXVlc3QsIGFjdGhkLCAmaW5zaWRlKSkg eworCQlEUk1fRVJST1IoIiVzIGh1bmcgJXMgYm8gKDB4JXggY3R4ICVkKSBhdCAweCV4XG4iLAor CQkJICByaW5nLT5uYW1lLAorCQkJICBpbnNpZGUgPyAiaW5zaWRlIiA6ICJmbHVzaGluZyIsCisJ CQkgIHJlcXVlc3QtPmJhdGNoX29iaiA/CisJCQkgIHJlcXVlc3QtPmJhdGNoX29iai0+Z3R0X29m ZnNldCA6IDAsCisJCQkgIHJlcXVlc3QtPmN0eCA/IHJlcXVlc3QtPmN0eC0+aWQgOiAwLAorCQkJ ICBhY3RoZCk7CisKKwkJZ3VpbHR5ID0gdHJ1ZTsKKwl9CisKKwkvKiBJZiBjb250ZXh0cyBhcmUg ZGlzYWJsZWQgb3IgdGhpcyBpcyB0aGUgZGVmYXVsdCBjb250ZXh0LCB1c2UKKwkgKiBmaWxlX3By aXYtPnJlc2V0X3N0YXRlCisJICovCisJaWYgKHJlcXVlc3QtPmN0eCAmJiByZXF1ZXN0LT5jdHgt PmlkICE9IERFRkFVTFRfQ09OVEVYVF9JRCkKKwkJaHMgPSAmcmVxdWVzdC0+Y3R4LT5oYW5nX3N0 YXRzOworCWVsc2UgaWYgKHJlcXVlc3QtPmZpbGVfcHJpdikKKwkJaHMgPSAmcmVxdWVzdC0+Zmls ZV9wcml2LT5oYW5nX3N0YXRzOworCisJaWYgKGhzKSB7CisJCWlmIChndWlsdHkpCisJCQlocy0+ YmF0Y2hfYWN0aXZlKys7CisJCWVsc2UKKwkJCWhzLT5iYXRjaF9wZW5kaW5nKys7CisJfQorfQor CiBzdGF0aWMgdm9pZCBpOTE1X2dlbV9mcmVlX3JlcXVlc3Qoc3RydWN0IGRybV9pOTE1X2dlbV9y ZXF1ZXN0ICpyZXF1ZXN0KQogewogCWxpc3RfZGVsKCZyZXF1ZXN0LT5saXN0KTsKQEAgLTIxMjQs NiArMjIxMiwxMiBAQCBzdGF0aWMgdm9pZCBpOTE1X2dlbV9mcmVlX3JlcXVlc3Qoc3RydWN0IGRy bV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0KQogc3RhdGljIHZvaWQgaTkxNV9nZW1fcmVzZXRf cmluZ19saXN0cyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCQkJICAgICAg c3RydWN0IGludGVsX3JpbmdfYnVmZmVyICpyaW5nKQogeworCXUzMiBjb21wbGV0ZWRfc2Vxbm87 CisJdTMyIGFjdGhkOworCisJYWN0aGQgPSBpbnRlbF9yaW5nX2dldF9hY3RpdmVfaGVhZChyaW5n KTsKKwljb21wbGV0ZWRfc2Vxbm8gPSByaW5nLT5nZXRfc2Vxbm8ocmluZywgZmFsc2UpOworCiAJ d2hpbGUgKCFsaXN0X2VtcHR5KCZyaW5nLT5yZXF1ZXN0X2xpc3QpKSB7CiAJCXN0cnVjdCBkcm1f aTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVzdDsKIApAQCAtMjEzMSw2ICsyMjI1LDkgQEAgc3RhdGlj IHZvaWQgaTkxNV9nZW1fcmVzZXRfcmluZ19saXN0cyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYsCiAJCQkJCSAgIHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCwKIAkJCQkJICAg bGlzdCk7CiAKKwkJaWYgKHJlcXVlc3QtPnNlcW5vID4gY29tcGxldGVkX3NlcW5vKQorCQkJaTkx NV9zZXRfcmVzZXRfc3RhdHVzKHJpbmcsIHJlcXVlc3QsIGFjdGhkKTsKKwogCQlpOTE1X2dlbV9m cmVlX3JlcXVlc3QocmVxdWVzdCk7CiAJfQogCi0tIAoxLjcuOS41CgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0Cklu dGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9y Zy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=