From: Mika Kuoppala Subject: [PATCH 2/2] drm/i915: Record the object matching actual head to error state Date: Mon, 4 May 2015 17:44:12 +0300 Message-ID: <1430750652-7931-2-git-send-email-mika.kuoppala@intel.com> References: <1430750652-7931-1-git-send-email-mika.kuoppala@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 7F9B76E39E for ; Mon, 4 May 2015 07:44:34 -0700 (PDT) In-Reply-To: <1430750652-7931-1-git-send-email-mika.kuoppala@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 SWYgd2UgaGF2ZSBjaGFpbmVkIGJhdGNoLCB0aGUgcmVxdWVzdCBvbmx5IGNvbnRhaW5zCnRoZSBi YXRjaCBidWZmZXIgdGhhdCBicmFuY2hlZCB0aGUgZXhlY3V0aW9uIGludG8gY2hhaW5lZApiYXRj aC4gV2UgY2FuIHRyeSB0byBmaW5kIG9iamVjdCBmb3IgYWN0dWFsIGhlYWQgYW5kCmlmIGl0IGlz IGRpZmZlcmVudCB0aGFuIHRoZSBvYmplY3QgZnJvbSByZXF1ZXN0LCByZWNvcmQKYW5kIHByaW50 IGl0cyBzdGF0ZSBhbHNvLgoKU2lnbmVkLW9mZi1ieTogTWlrYSBLdW9wcGFsYSA8bWlrYS5rdW9w cGFsYUBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAg ICB8ICAzICsrLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3IuYyB8IDQ5ICsr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDQ3IGlu c2VydGlvbnMoKyksIDUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXgg MTM2ZDQyYS4uZDIzY2E4ZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k cnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBAIC00ODAsNyArNDgw LDggQEAgc3RydWN0IGRybV9pOTE1X2Vycm9yX3N0YXRlIHsKIAkJCWludCBwYWdlX2NvdW50Owog CQkJdTMyIGd0dF9vZmZzZXQ7CiAJCQl1MzIgKnBhZ2VzWzBdOwotCQl9ICpyaW5nYnVmZmVyLCAq YmF0Y2hidWZmZXIsICp3YV9iYXRjaGJ1ZmZlciwgKmN0eCwgKmh3c19wYWdlOworCQl9ICpyaW5n YnVmZmVyLCAqYmF0Y2hidWZmZXIsICp3YV9iYXRjaGJ1ZmZlciwKKwkJCSphY3RpdmVfYmF0Y2hi dWZmZXIsICpjdHgsICpod3NfcGFnZTsKIAogCQlzdHJ1Y3QgZHJtX2k5MTVfZXJyb3JfcmVxdWVz dCB7CiAJCQlsb25nIGppZmZpZXM7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dwdV9lcnJvci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3IuYwpp bmRleCBhM2UzMzBkLi44MTcwNWI5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dwdV9lcnJvci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3B1X2Vycm9y LmMKQEAgLTQzMyw2ICs0MzMsMTMgQEAgaW50IGk5MTVfZXJyb3Jfc3RhdGVfdG9fc3RyKHN0cnVj dCBkcm1faTkxNV9lcnJvcl9zdGF0ZV9idWYgKm0sCiAJCQlwcmludF9lcnJvcl9vYmoobSwgb2Jq KTsKIAkJfQogCisJCW9iaiA9IGVycm9yLT5yaW5nW2ldLmFjdGl2ZV9iYXRjaGJ1ZmZlcjsKKwkJ aWYgKG9iaikgeworCQkJZXJyX3ByaW50ZihtLCAiJXMgKGFjdGl2ZSkgLS0tIGd0dF9vZmZzZXQg PSAweCUwOHhcbiIsCisJCQkJICAgZGV2X3ByaXYtPnJpbmdbaV0ubmFtZSwgb2JqLT5ndHRfb2Zm c2V0KTsKKwkJCXByaW50X2Vycm9yX29iaihtLCBvYmopOworCQl9CisKIAkJaWYgKGVycm9yLT5y aW5nW2ldLm51bV9yZXF1ZXN0cykgewogCQkJZXJyX3ByaW50ZihtLCAiJXMgLS0tICVkIHJlcXVl c3RzXG4iLAogCQkJCSAgIGRldl9wcml2LT5yaW5nW2ldLm5hbWUsCkBAIC01NTUsNiArNTYyLDcg QEAgc3RhdGljIHZvaWQgaTkxNV9lcnJvcl9zdGF0ZV9mcmVlKHN0cnVjdCBrcmVmICplcnJvcl9y ZWYpCiAJZm9yIChpID0gMDsgaSA8IEFSUkFZX1NJWkUoZXJyb3ItPnJpbmcpOyBpKyspIHsKIAkJ aTkxNV9lcnJvcl9vYmplY3RfZnJlZShlcnJvci0+cmluZ1tpXS5iYXRjaGJ1ZmZlcik7CiAJCWk5 MTVfZXJyb3Jfb2JqZWN0X2ZyZWUoZXJyb3ItPnJpbmdbaV0ud2FfYmF0Y2hidWZmZXIpOworCQlp OTE1X2Vycm9yX29iamVjdF9mcmVlKGVycm9yLT5yaW5nW2ldLmFjdGl2ZV9iYXRjaGJ1ZmZlcik7 CiAJCWk5MTVfZXJyb3Jfb2JqZWN0X2ZyZWUoZXJyb3ItPnJpbmdbaV0ucmluZ2J1ZmZlcik7CiAJ CWk5MTVfZXJyb3Jfb2JqZWN0X2ZyZWUoZXJyb3ItPnJpbmdbaV0uaHdzX3BhZ2UpOwogCQlpOTE1 X2Vycm9yX29iamVjdF9mcmVlKGVycm9yLT5yaW5nW2ldLmN0eCk7CkBAIC01OTYsMTMgKzYwNCwx MyBAQCBpOTE1X2Vycm9yX29iamVjdF9jcmVhdGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2LAogCWlmIChkc3QgPT0gTlVMTCkKIAkJcmV0dXJuIE5VTEw7CiAKLQlpZiAoaTkxNV9n ZW1fb2JqX2JvdW5kKHNyYywgdm0pKQorCWlmICh2bSAmJiBpOTE1X2dlbV9vYmpfYm91bmQoc3Jj LCB2bSkpCiAJCWRzdC0+Z3R0X29mZnNldCA9IGk5MTVfZ2VtX29ial9vZmZzZXQoc3JjLCB2bSk7 CiAJZWxzZQogCQlkc3QtPmd0dF9vZmZzZXQgPSAtMTsKIAogCXJlbG9jX29mZnNldCA9IGRzdC0+ Z3R0X29mZnNldDsKLQlpZiAoaTkxNV9pc19nZ3R0KHZtKSkKKwlpZiAodm0gJiYgaTkxNV9pc19n Z3R0KHZtKSkKIAkJdm1hID0gaTkxNV9nZW1fb2JqX3RvX2dndHQoc3JjKTsKIAl1c2VfZ2d0dCA9 IChzcmMtPmNhY2hlX2xldmVsID09IEk5MTVfQ0FDSEVfTk9ORSAmJgogCQkgICB2bWEgJiYgKHZt YS0+Ym91bmQgJiBHTE9CQUxfQklORCkgJiYKQEAgLTk2Nyw2ICs5NzUsMjcgQEAgc3RhdGljIHZv aWQgaTkxNV9nZW1fcmVjb3JkX2FjdGl2ZV9jb250ZXh0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3Mg KnJpbmcsCiAJfQogfQogCitzdGF0aWMgc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKmZpbmRf b2JqX2Zvcl9hZGRyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCisJCQkJCQkgICAgIGNvbnN0IHU2 NCB2YV9hZGRyKQoreworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ ZGV2X3ByaXZhdGU7CisJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iajsKKwlzdHJ1Y3Qg aTkxNV92bWEgKnZtYTsKKworCS8qIFdlIGFyZSBzZWFyY2hpbmcgZm9yIGNoYWluZWQgYmF0Y2hl cywgc28gd2UgYXJlIGhhcHB5CisJICogZm9yIGZpcnN0IG1hdGNoLgorCSAqLworCWxpc3RfZm9y X2VhY2hfZW50cnkob2JqLCAmZGV2X3ByaXYtPm1tLmJvdW5kX2xpc3QsIGdsb2JhbF9saXN0KSB7 CisJCWxpc3RfZm9yX2VhY2hfZW50cnkodm1hLCAmb2JqLT52bWFfbGlzdCwgdm1hX2xpbmspIHsK KwkJCWlmICh2YV9hZGRyID49IHZtYS0+bm9kZS5zdGFydCAmJgorCQkJICAgIHZhX2FkZHIgPCB2 bWEtPm5vZGUuc3RhcnQgKyB2bWEtPm5vZGUuc2l6ZSkKKwkJCQlyZXR1cm4gb2JqOworCQl9CisJ fQorCisJcmV0dXJuIE5VTEw7Cit9CisKIHN0YXRpYyB2b2lkIGk5MTVfZ2VtX3JlY29yZF9yaW5n cyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQkJCSAgc3RydWN0IGRybV9pOTE1X2Vycm9yX3N0 YXRlICplcnJvcikKIHsKQEAgLTk3Nyw2ICsxMDA2LDggQEAgc3RhdGljIHZvaWQgaTkxNV9nZW1f cmVjb3JkX3JpbmdzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJZm9yIChpID0gMDsgaSA8IEk5 MTVfTlVNX1JJTkdTOyBpKyspIHsKIAkJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyA9ICZk ZXZfcHJpdi0+cmluZ1tpXTsKIAkJc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJidWY7CisJCXN0 cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtID0gTlVMTDsKKwkJc3RydWN0IGRybV9pOTE1X2dl bV9vYmplY3QgKm9iajsKIAogCQllcnJvci0+cmluZ1tpXS5waWQgPSAtMTsKIApAQCAtOTg5LDgg KzEwMjAsNiBAQCBzdGF0aWMgdm9pZCBpOTE1X2dlbV9yZWNvcmRfcmluZ3Moc3RydWN0IGRybV9k ZXZpY2UgKmRldiwKIAogCQlyZXF1ZXN0ID0gaTkxNV9nZW1fZmluZF9hY3RpdmVfcmVxdWVzdChy aW5nKTsKIAkJaWYgKHJlcXVlc3QpIHsKLQkJCXN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZt OwotCiAJCQl2bSA9IHJlcXVlc3QtPmN0eCAmJiByZXF1ZXN0LT5jdHgtPnBwZ3R0ID8KIAkJCQkm cmVxdWVzdC0+Y3R4LT5wcGd0dC0+YmFzZSA6CiAJCQkJJmRldl9wcml2LT5ndHQuYmFzZTsKQEAg LTEwMjIsNiArMTA1MSwxOCBAQCBzdGF0aWMgdm9pZCBpOTE1X2dlbV9yZWNvcmRfcmluZ3Moc3Ry dWN0IGRybV9kZXZpY2UgKmRldiwKIAkJCX0KIAkJfQogCisJCW9iaiA9IGZpbmRfb2JqX2Zvcl9h ZGRyKGRldiwgZXJyb3ItPnJpbmdbaV0uYWN0aGQpOworCQlpZiAocmVxdWVzdCAmJiByZXF1ZXN0 LT5iYXRjaF9vYmogPT0gb2JqKQorCQkJb2JqID0gTlVMTDsKKworCQlpZiAob2JqKSB7CisJCQlp ZiAodm0gJiYgIWk5MTVfZ2VtX29ial9ib3VuZChvYmosIHZtKSkKKwkJCQl2bSA9IE5VTEw7CisK KwkJCWVycm9yLT5yaW5nW2ldLmFjdGl2ZV9iYXRjaGJ1ZmZlciA9CisJCQkJaTkxNV9lcnJvcl9v YmplY3RfY3JlYXRlKGRldl9wcml2LCBvYmosIHZtKTsKKwkJfQorCiAJCWlmIChpOTE1LmVuYWJs ZV9leGVjbGlzdHMpIHsKIAkJCS8qIFRPRE86IFRoaXMgaXMgb25seSBhIHNtYWxsIGZpeCB0byBr ZWVwIGJhc2ljIGVycm9yCiAJCQkgKiBjYXB0dXJlIHdvcmtpbmcsIGJ1dCB3ZSBuZWVkIHRvIGFk ZCBtb3JlIGluZm9ybWF0aW9uCi0tIAoxLjkuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlz dHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9s aXN0aW5mby9pbnRlbC1nZngK