From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tomas Elf Subject: [PATCH 2/8] drm/i915: Migrate to safe iterators in error state capture Date: Thu, 8 Oct 2015 19:31:34 +0100 Message-ID: <1444329100-19189-3-git-send-email-tomas.elf@intel.com> References: <1444329100-19189-1-git-send-email-tomas.elf@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id 732CA6E1B8 for ; Thu, 8 Oct 2015 11:31:47 -0700 (PDT) In-Reply-To: <1444329100-19189-1-git-send-email-tomas.elf@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 VXNpbmcgc2FmZSBsaXN0IGl0ZXJhdG9ycyBhbGxldmlhdGVzIHRoZSBwcm9ibGVtIG9mIHVuc3lu Y2hyb25pemVkIGRyaXZlciBsaXN0Cm1hbmlwdWxhdGlvbnMgd2hpbGUgZXJyb3Igc3RhdGUgY2Fw dHVyZSBpcyBpbiB0aGUgcHJvY2VzcyBvZiB0cmF2ZXJzaW5nIGxpc3RzLgoKU2lnbmVkLW9mZi1i eTogVG9tYXMgRWxmIDx0b21hcy5lbGZAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ3B1X2Vycm9yLmMgfCAzOCArKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0t LS0tLQogMSBmaWxlIGNoYW5nZWQsIDE5IGluc2VydGlvbnMoKyksIDE5IGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmMgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9lcnJvci5jCmluZGV4IDJmMDRlNGYuLjMyYzE3OTkg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3IuYwpAQCAtNzE4LDEwICs3MTgsMTAg QEAgc3RhdGljIHZvaWQgY2FwdHVyZV9ibyhzdHJ1Y3QgZHJtX2k5MTVfZXJyb3JfYnVmZmVyICpl cnIsCiBzdGF0aWMgdTMyIGNhcHR1cmVfYWN0aXZlX2JvKHN0cnVjdCBkcm1faTkxNV9lcnJvcl9i dWZmZXIgKmVyciwKIAkJCSAgICAgaW50IGNvdW50LCBzdHJ1Y3QgbGlzdF9oZWFkICpoZWFkKQog ewotCXN0cnVjdCBpOTE1X3ZtYSAqdm1hOworCXN0cnVjdCBpOTE1X3ZtYSAqdm1hLCAqdG1wdm1h OwogCWludCBpID0gMDsKIAotCWxpc3RfZm9yX2VhY2hfZW50cnkodm1hLCBoZWFkLCBtbV9saXN0 KSB7CisJbGlzdF9mb3JfZWFjaF9lbnRyeV9zYWZlKHZtYSwgdG1wdm1hLCBoZWFkLCBtbV9saXN0 KSB7CiAJCWNhcHR1cmVfYm8oZXJyKyssIHZtYSk7CiAJCWlmICgrK2kgPT0gY291bnQpCiAJCQli cmVhazsKQEAgLTczNCwxNyArNzM0LDE3IEBAIHN0YXRpYyB1MzIgY2FwdHVyZV9waW5uZWRfYm8o c3RydWN0IGRybV9pOTE1X2Vycm9yX2J1ZmZlciAqZXJyLAogCQkJICAgICBpbnQgY291bnQsIHN0 cnVjdCBsaXN0X2hlYWQgKmhlYWQsCiAJCQkgICAgIHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2Ug KnZtKQogewotCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmo7CisJc3RydWN0IGRybV9p OTE1X2dlbV9vYmplY3QgKm9iaiwgKnRtcG9iajsKIAlzdHJ1Y3QgZHJtX2k5MTVfZXJyb3JfYnVm ZmVyICogY29uc3QgZmlyc3QgPSBlcnI7CiAJc3RydWN0IGRybV9pOTE1X2Vycm9yX2J1ZmZlciAq IGNvbnN0IGxhc3QgPSBlcnIgKyBjb3VudDsKIAotCWxpc3RfZm9yX2VhY2hfZW50cnkob2JqLCBo ZWFkLCBnbG9iYWxfbGlzdCkgewotCQlzdHJ1Y3QgaTkxNV92bWEgKnZtYTsKKwlsaXN0X2Zvcl9l YWNoX2VudHJ5X3NhZmUob2JqLCB0bXBvYmosIGhlYWQsIGdsb2JhbF9saXN0KSB7CisJCXN0cnVj dCBpOTE1X3ZtYSAqdm1hLCAqdG1wdm1hOwogCiAJCWlmIChlcnIgPT0gbGFzdCkKIAkJCWJyZWFr OwogCi0JCWxpc3RfZm9yX2VhY2hfZW50cnkodm1hLCAmb2JqLT52bWFfbGlzdCwgdm1hX2xpbmsp CisJCWxpc3RfZm9yX2VhY2hfZW50cnlfc2FmZSh2bWEsIHRtcHZtYSwgJm9iai0+dm1hX2xpc3Qs IHZtYV9saW5rKQogCQkJaWYgKHZtYS0+dm0gPT0gdm0gJiYgdm1hLT5waW5fY291bnQgPiAwKQog CQkJCWNhcHR1cmVfYm8oZXJyKyssIHZtYSk7CiAJfQpAQCAtOTU4LDEzICs5NTgsMTMgQEAgc3Rh dGljIHZvaWQgaTkxNV9nZW1fcmVjb3JkX2FjdGl2ZV9jb250ZXh0KHN0cnVjdCBpbnRlbF9lbmdp bmVfY3MgKnJpbmcsCiAJCQkJCSAgIHN0cnVjdCBkcm1faTkxNV9lcnJvcl9yaW5nICplcmluZykK IHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSByaW5nLT5kZXYtPmRldl9w cml2YXRlOwotCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmo7CisJc3RydWN0IGRybV9p OTE1X2dlbV9vYmplY3QgKm9iaiwgKnRtcG9iajsKIAogCS8qIEN1cnJlbnRseSByZW5kZXIgcmlu ZyBpcyB0aGUgb25seSBIVyBjb250ZXh0IHVzZXIgKi8KIAlpZiAocmluZy0+aWQgIT0gUkNTIHx8 ICFlcnJvci0+Y2NpZCkKIAkJcmV0dXJuOwogCi0JbGlzdF9mb3JfZWFjaF9lbnRyeShvYmosICZk ZXZfcHJpdi0+bW0uYm91bmRfbGlzdCwgZ2xvYmFsX2xpc3QpIHsKKwlsaXN0X2Zvcl9lYWNoX2Vu dHJ5X3NhZmUob2JqLCB0bXBvYmosICZkZXZfcHJpdi0+bW0uYm91bmRfbGlzdCwgZ2xvYmFsX2xp c3QpIHsKIAkJaWYgKCFpOTE1X2dlbV9vYmpfZ2d0dF9ib3VuZChvYmopKQogCQkJY29udGludWU7 CiAKQEAgLTk3OSw3ICs5NzksNyBAQCBzdGF0aWMgdm9pZCBpOTE1X2dlbV9yZWNvcmRfcmluZ3Mo c3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJCQkgIHN0cnVjdCBkcm1faTkxNV9lcnJvcl9zdGF0 ZSAqZXJyb3IpCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5k ZXZfcHJpdmF0ZTsKLQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3Q7CisJc3Ry dWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0LCAqdG1wcmVxOwogCWludCBpLCBjb3Vu dDsKIAogCWZvciAoaSA9IDA7IGkgPCBJOTE1X05VTV9SSU5HUzsgaSsrKSB7CkBAIC0xMDU1LDcg KzEwNTUsNyBAQCBzdGF0aWMgdm9pZCBpOTE1X2dlbV9yZWNvcmRfcmluZ3Moc3RydWN0IGRybV9k ZXZpY2UgKmRldiwKIAkJaTkxNV9nZW1fcmVjb3JkX2FjdGl2ZV9jb250ZXh0KHJpbmcsIGVycm9y LCAmZXJyb3ItPnJpbmdbaV0pOwogCiAJCWNvdW50ID0gMDsKLQkJbGlzdF9mb3JfZWFjaF9lbnRy eShyZXF1ZXN0LCAmcmluZy0+cmVxdWVzdF9saXN0LCBsaXN0KQorCQlsaXN0X2Zvcl9lYWNoX2Vu dHJ5X3NhZmUocmVxdWVzdCwgdG1wcmVxLCAmcmluZy0+cmVxdWVzdF9saXN0LCBsaXN0KQogCQkJ Y291bnQrKzsKIAogCQllcnJvci0+cmluZ1tpXS5udW1fcmVxdWVzdHMgPSBjb3VudDsKQEAgLTEw NjgsNyArMTA2OCw3IEBAIHN0YXRpYyB2b2lkIGk5MTVfZ2VtX3JlY29yZF9yaW5ncyhzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2LAogCQl9CiAKIAkJY291bnQgPSAwOwotCQlsaXN0X2Zvcl9lYWNoX2Vu dHJ5KHJlcXVlc3QsICZyaW5nLT5yZXF1ZXN0X2xpc3QsIGxpc3QpIHsKKwkJbGlzdF9mb3JfZWFj aF9lbnRyeV9zYWZlKHJlcXVlc3QsIHRtcHJlcSwgJnJpbmctPnJlcXVlc3RfbGlzdCwgbGlzdCkg ewogCQkJc3RydWN0IGRybV9pOTE1X2Vycm9yX3JlcXVlc3QgKmVycTsKIAogCQkJZXJxID0gJmVy cm9yLT5yaW5nW2ldLnJlcXVlc3RzW2NvdW50KytdOwpAQCAtMTA4OCwxNyArMTA4OCwxNyBAQCBz dGF0aWMgdm9pZCBpOTE1X2dlbV9jYXB0dXJlX3ZtKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdiwKIAkJCQljb25zdCBpbnQgbmR4KQogewogCXN0cnVjdCBkcm1faTkxNV9lcnJvcl9i dWZmZXIgKmFjdGl2ZV9ibyA9IE5VTEwsICpwaW5uZWRfYm8gPSBOVUxMOwotCXN0cnVjdCBkcm1f aTkxNV9nZW1fb2JqZWN0ICpvYmo7Ci0Jc3RydWN0IGk5MTVfdm1hICp2bWE7CisJc3RydWN0IGRy bV9pOTE1X2dlbV9vYmplY3QgKm9iaiwgKnRtcG9iajsKKwlzdHJ1Y3QgaTkxNV92bWEgKnZtYSwg KnRtcHZtYTsKIAlpbnQgaTsKIAogCWkgPSAwOwotCWxpc3RfZm9yX2VhY2hfZW50cnkodm1hLCAm dm0tPmFjdGl2ZV9saXN0LCBtbV9saXN0KQorCWxpc3RfZm9yX2VhY2hfZW50cnlfc2FmZSh2bWEs IHRtcHZtYSwgJnZtLT5hY3RpdmVfbGlzdCwgbW1fbGlzdCkKIAkJaSsrOwogCWVycm9yLT5hY3Rp dmVfYm9fY291bnRbbmR4XSA9IGk7CiAKLQlsaXN0X2Zvcl9lYWNoX2VudHJ5KG9iaiwgJmRldl9w cml2LT5tbS5ib3VuZF9saXN0LCBnbG9iYWxfbGlzdCkgewotCQlsaXN0X2Zvcl9lYWNoX2VudHJ5 KHZtYSwgJm9iai0+dm1hX2xpc3QsIHZtYV9saW5rKQorCWxpc3RfZm9yX2VhY2hfZW50cnlfc2Fm ZShvYmosIHRtcG9iaiwgJmRldl9wcml2LT5tbS5ib3VuZF9saXN0LCBnbG9iYWxfbGlzdCkgewor CQlsaXN0X2Zvcl9lYWNoX2VudHJ5X3NhZmUodm1hLCB0bXB2bWEsICZvYmotPnZtYV9saXN0LCB2 bWFfbGluaykKIAkJCWlmICh2bWEtPnZtID09IHZtICYmIHZtYS0+cGluX2NvdW50ID4gMCkKIAkJ CQlpKys7CiAJfQpAQCAtMTEyOCwxMCArMTEyOCwxMCBAQCBzdGF0aWMgdm9pZCBpOTE1X2dlbV9j YXB0dXJlX3ZtKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIHN0YXRpYyB2b2lk IGk5MTVfZ2VtX2NhcHR1cmVfYnVmZmVycyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYsCiAJCQkJICAgICBzdHJ1Y3QgZHJtX2k5MTVfZXJyb3Jfc3RhdGUgKmVycm9yKQogewotCXN0 cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtOworCXN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2Ug KnZtLCAqdG1wdm07CiAJaW50IGNudCA9IDAsIGkgPSAwOwogCi0JbGlzdF9mb3JfZWFjaF9lbnRy eSh2bSwgJmRldl9wcml2LT52bV9saXN0LCBnbG9iYWxfbGluaykKKwlsaXN0X2Zvcl9lYWNoX2Vu dHJ5X3NhZmUodm0sIHRtcHZtLCAmZGV2X3ByaXYtPnZtX2xpc3QsIGdsb2JhbF9saW5rKQogCQlj bnQrKzsKIAogCWVycm9yLT5hY3RpdmVfYm8gPSBrY2FsbG9jKGNudCwgc2l6ZW9mKCplcnJvci0+ YWN0aXZlX2JvKSwgR0ZQX0FUT01JQyk7CkBAIC0xMTU1LDcgKzExNTUsNyBAQCBzdGF0aWMgdm9p ZCBpOTE1X2dlbV9jYXB0dXJlX2J1ZmZlcnMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2LAogCQllcnJvci0+cGlubmVkX2JvID0gTlVMTDsKIAkJZXJyb3ItPnBpbm5lZF9ib19jb3Vu dCA9IE5VTEw7CiAJfSBlbHNlIHsKLQkJbGlzdF9mb3JfZWFjaF9lbnRyeSh2bSwgJmRldl9wcml2 LT52bV9saXN0LCBnbG9iYWxfbGluaykKKwkJbGlzdF9mb3JfZWFjaF9lbnRyeV9zYWZlKHZtLCB0 bXB2bSwgJmRldl9wcml2LT52bV9saXN0LCBnbG9iYWxfbGluaykKIAkJCWk5MTVfZ2VtX2NhcHR1 cmVfdm0oZGV2X3ByaXYsIGVycm9yLCB2bSwgaSsrKTsKIAogCQllcnJvci0+dm1fY291bnQgPSBj bnQ7Ci0tIAoxLjkuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Au b3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1n ZngK