Return-Path: Received: from mblankhorst.nl (mblankhorst.nl [141.105.120.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3354A6E3B9 for ; Tue, 6 Feb 2018 10:14:21 +0000 (UTC) From: Maarten Lankhorst Date: Tue, 6 Feb 2018 11:14:07 +0100 Message-Id: <20180206101417.59979-2-maarten.lankhorst@linux.intel.com> In-Reply-To: <20180206101417.59979-1-maarten.lankhorst@linux.intel.com> References: <20180206101417.59979-1-maarten.lankhorst@linux.intel.com> Subject: [igt-dev] [PATCH i-g-t 02/12] tests: Always call igt_remove_fb without checking. List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" To: igt-dev@lists.freedesktop.org List-ID: VGhpcyBjbGVhbnMgdXAgdGhlIHRlc3RzIHNsaWdodGx5LgoKU2lnbmVkLW9mZi1ieTogTWFhcnRl biBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4KLS0tCiB0ZXN0 cy9rbXNfZmxpcC5jICAgICAgICAgIHwgIDMgKy0tCiB0ZXN0cy9rbXNfcGFuZWxfZml0dGluZy5j IHwgMTUgKysrLS0tLS0tLS0tLS0tCiB0ZXN0cy9rbXNfcGxhbmVfc2NhbGluZy5jIHwgIDcgKy0t LS0tLQogdGVzdHMva21zX3JvdGF0aW9uX2NyYy5jICB8IDE2ICsrLS0tLS0tLS0tLS0tLS0KIHRl c3RzL2ttc19zZXRtb2RlLmMgICAgICAgfCAxMiArKystLS0tLS0tLS0KIDUgZmlsZXMgY2hhbmdl ZCwgMTAgaW5zZXJ0aW9ucygrKSwgNDMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvdGVzdHMv a21zX2ZsaXAuYyBiL3Rlc3RzL2ttc19mbGlwLmMKaW5kZXggYjQzZTc3MTIzZTdmLi4zZDZmZTk0 OGQzYmIgMTAwNjQ0Ci0tLSBhL3Rlc3RzL2ttc19mbGlwLmMKKysrIGIvdGVzdHMva21zX2ZsaXAu YwpAQCAtMTMzMiw4ICsxMzMyLDcgQEAgc3RhdGljIHZvaWQgcnVuX3Rlc3Rfb25fY3J0Y19zZXQo c3RydWN0IHRlc3Rfb3V0cHV0ICpvLCBpbnQgKmNydGNfaWR4cywKIAlpZ3RfaW5mbygiXG4lczog UEFTU0VEXG5cbiIsIHRlc3RfbmFtZSk7CiAKIG91dDoKLQlpZiAoby0+ZmJfaWRzWzJdKQotCQlp Z3RfcmVtb3ZlX2ZiKGRybV9mZCwgJm8tPmZiX2luZm9bMl0pOworCWlndF9yZW1vdmVfZmIoZHJt X2ZkLCAmby0+ZmJfaW5mb1syXSk7CiAJaWd0X3JlbW92ZV9mYihkcm1fZmQsICZvLT5mYl9pbmZv WzFdKTsKIAlpZ3RfcmVtb3ZlX2ZiKGRybV9mZCwgJm8tPmZiX2luZm9bMF0pOwogCmRpZmYgLS1n aXQgYS90ZXN0cy9rbXNfcGFuZWxfZml0dGluZy5jIGIvdGVzdHMva21zX3BhbmVsX2ZpdHRpbmcu YwppbmRleCBlMGNhNmNjYThlNmEuLmIzY2VlMjIzYThlNyAxMDA2NDQKLS0tIGEvdGVzdHMva21z X3BhbmVsX2ZpdHRpbmcuYworKysgYi90ZXN0cy9rbXNfcGFuZWxfZml0dGluZy5jCkBAIC01MSwx MCArNTEsNyBAQCBzdGF0aWMgdm9pZCBwcmVwYXJlX2NydGMoZGF0YV90ICpkYXRhLCBpZ3Rfb3V0 cHV0X3QgKm91dHB1dCwgZW51bSBwaXBlIHBpcGUsCiAJaWd0X291dHB1dF9zZXRfcGlwZShvdXRw dXQsIHBpcGUpOwogCiAJLyogYmVmb3JlIGFsbG9jYXRpbmcsIGZyZWUgaWYgYW55IG9sZGVyIGZi ICovCi0JaWYgKGRhdGEtPmZiMS5mYl9pZCkgewotCQlpZ3RfcmVtb3ZlX2ZiKGRhdGEtPmRybV9m ZCwgJmRhdGEtPmZiMSk7Ci0JCWRhdGEtPmZiMS5mYl9pZCA9IDA7Ci0JfQorCWlndF9yZW1vdmVf ZmIoZGF0YS0+ZHJtX2ZkLCAmZGF0YS0+ZmIxKTsKIAogCS8qIGFsbG9jYXRlIGZiIGZvciBwbGFu ZSAxICovCiAJaWd0X2NyZWF0ZV9wYXR0ZXJuX2ZiKGRhdGEtPmRybV9mZCwKQEAgLTgzLDE0ICs4 MCw4IEBAIHN0YXRpYyB2b2lkIGNsZWFudXBfY3J0YyhkYXRhX3QgKmRhdGEsIGlndF9vdXRwdXRf dCAqb3V0cHV0LCBpZ3RfcGxhbmVfdCAqcGxhbmUpCiB7CiAJaWd0X2Rpc3BsYXlfdCAqZGlzcGxh eSA9ICZkYXRhLT5kaXNwbGF5OwogCi0JaWYgKGRhdGEtPmZiMS5mYl9pZCkgewotCQlpZ3RfcmVt b3ZlX2ZiKGRhdGEtPmRybV9mZCwgJmRhdGEtPmZiMSk7Ci0JCWRhdGEtPmZiMS5mYl9pZCA9IDA7 Ci0JfQotCWlmIChkYXRhLT5mYjIuZmJfaWQpIHsKLQkJaWd0X3JlbW92ZV9mYihkYXRhLT5kcm1f ZmQsICZkYXRhLT5mYjIpOwotCQlkYXRhLT5mYjIuZmJfaWQgPSAwOwotCX0KKwlpZ3RfcmVtb3Zl X2ZiKGRhdGEtPmRybV9mZCwgJmRhdGEtPmZiMSk7CisJaWd0X3JlbW92ZV9mYihkYXRhLT5kcm1f ZmQsICZkYXRhLT5mYjIpOwogCiAJaWYgKHBsYW5lLT50eXBlICE9IERSTV9QTEFORV9UWVBFX1BS SU1BUlkpIHsKIAkJaWd0X3BsYW5lX3QgKnByaW1hcnk7CmRpZmYgLS1naXQgYS90ZXN0cy9rbXNf cGxhbmVfc2NhbGluZy5jIGIvdGVzdHMva21zX3BsYW5lX3NjYWxpbmcuYwppbmRleCAyMDhmOTI2 MmY4NGIuLjMxNzEzMzFjOTZiOCAxMDA2NDQKLS0tIGEvdGVzdHMva21zX3BsYW5lX3NjYWxpbmcu YworKysgYi90ZXN0cy9rbXNfcGxhbmVfc2NhbGluZy5jCkBAIC02MiwxMyArNjIsOCBAQCBzdGF0 aWMgdm9pZCBjbGVhbnVwX2ZicyhkYXRhX3QgKmRhdGEpCiB7CiAJaW50IGk7CiAKLQlmb3IgKGkg PSAwOyBpIDwgQVJSQVlfU0laRShkYXRhLT5mYik7IGkrKykgewotCQlpZiAoIWRhdGEtPmZiW2ld LmZiX2lkKQotCQkJY29udGludWU7Ci0KKwlmb3IgKGkgPSAwOyBpIDwgQVJSQVlfU0laRShkYXRh LT5mYik7IGkrKykKIAkJaWd0X3JlbW92ZV9mYihkYXRhLT5kcm1fZmQsICZkYXRhLT5mYltpXSk7 Ci0JCWRhdGEtPmZiW2ldLmZiX2lkID0gMDsKLQl9CiB9CiAKIHN0YXRpYyB2b2lkIGNsZWFudXBf Y3J0YyhkYXRhX3QgKmRhdGEpCmRpZmYgLS1naXQgYS90ZXN0cy9rbXNfcm90YXRpb25fY3JjLmMg Yi90ZXN0cy9rbXNfcm90YXRpb25fY3JjLmMKaW5kZXggZjY1NTYyYmFlOWViLi40ZjU2ZDNkNjVk YjQgMTAwNjQ0Ci0tLSBhL3Rlc3RzL2ttc19yb3RhdGlvbl9jcmMuYworKysgYi90ZXN0cy9rbXNf cm90YXRpb25fY3JjLmMKQEAgLTE3NCwxNyArMTc0LDEwIEBAIHN0YXRpYyB2b2lkIHByZXBhcmVf Y3J0YyhkYXRhX3QgKmRhdGEsIGlndF9vdXRwdXRfdCAqb3V0cHV0LCBlbnVtIHBpcGUgcGlwZSwK IAogc3RhdGljIHZvaWQgcmVtb3ZlX2ZicyhkYXRhX3QgKmRhdGEpCiB7Ci0JaWYgKCFkYXRhLT5m Yi5mYl9pZCkKLQkJcmV0dXJuOwotCiAJaWd0X3JlbW92ZV9mYihkYXRhLT5nZnhfZmQsICZkYXRh LT5mYik7CiAJaWd0X3JlbW92ZV9mYihkYXRhLT5nZnhfZmQsICZkYXRhLT5mYl9yZWZlcmVuY2Up OwogCWlndF9yZW1vdmVfZmIoZGF0YS0+Z2Z4X2ZkLCAmZGF0YS0+ZmJfdW5yb3RhdGVkKTsKLQot CWlmIChkYXRhLT5mYl9mbGlwLmZiX2lkKQotCQlpZ3RfcmVtb3ZlX2ZiKGRhdGEtPmdmeF9mZCwg JmRhdGEtPmZiX2ZsaXApOwotCi0JZGF0YS0+ZmJfZmxpcC5mYl9pZCA9IGRhdGEtPmZiLmZiX2lk ID0gMDsKKwlpZ3RfcmVtb3ZlX2ZiKGRhdGEtPmdmeF9mZCwgJmRhdGEtPmZiX2ZsaXApOwogfQog CiBlbnVtIHJlY3RhbmdsZV90eXBlIHsKQEAgLTIwNSwxMiArMTk4LDcgQEAgc3RhdGljIHZvaWQg cHJlcGFyZV9mYnMoZGF0YV90ICpkYXRhLCBpZ3Rfb3V0cHV0X3QgKm91dHB1dCwKIAl1aW50MzJf dCBwaXhlbF9mb3JtYXQgPSBkYXRhLT5vdmVycmlkZV9mbXQgPzogRFJNX0ZPUk1BVF9YUkdCODg4 ODsKIAljb25zdCBmbG9hdCBmbGlwX29wYWNpdHkgPSAwLjc1OwogCi0JaWYgKGRhdGEtPmZiLmZi X2lkKSB7Ci0JCWlndF9wbGFuZV9zZXRfZmIocGxhbmUsIE5VTEwpOwotCQlpZ3RfZGlzcGxheV9j b21taXQyKGRpc3BsYXksIGRpc3BsYXktPmlzX2F0b21pYyA/IENPTU1JVF9BVE9NSUMgOiBDT01N SVRfVU5JVkVSU0FMKTsKLQotCQlyZW1vdmVfZmJzKGRhdGEpOwotCX0KKwlyZW1vdmVfZmJzKGRh dGEpOwogCiAJaWd0X3BsYW5lX3NldF9yb3RhdGlvbihwbGFuZSwgSUdUX1JPVEFUSU9OXzApOwog CmRpZmYgLS1naXQgYS90ZXN0cy9rbXNfc2V0bW9kZS5jIGIvdGVzdHMva21zX3NldG1vZGUuYwpp bmRleCAwNjI0MWIxOTFhMGYuLjQ3ZDA0ZmI1ZjdiMSAxMDA2NDQKLS0tIGEvdGVzdHMva21zX3Nl dG1vZGUuYworKysgYi90ZXN0cy9rbXNfc2V0bW9kZS5jCkBAIC0zNjEsNiArMzYxLDkgQEAgc3Rh dGljIHZvaWQgY2xlYW51cF9jcnRjcyhzdHJ1Y3QgY3J0Y19jb25maWcgKmNydGNzLCBpbnQgY3J0 Y19jb3VudCkKIAlpbnQgaTsKIAogCWZvciAoaSA9IDA7IGkgPCBjcnRjX2NvdW50OyBpKyspIHsK KwkJaWd0X3JlbW92ZV9mYihkcm1fZmQsICZjcnRjc1tpXS5mYl9pbmZvKTsKKwkJZHJtTW9kZVNl dENydGMoZHJtX2ZkLCBjcnRjc1tpXS5jcnRjX2lkLCAwLCAwLCAwLCBOVUxMLCAwLCBOVUxMKTsK KwogCQlmcmVlKGNydGNzW2ldLmNjb25mcyk7CiAJfQogfQpAQCAtNTc3LDE1ICs1ODAsNiBAQCBz dGF0aWMgdm9pZCB0ZXN0X2NydGNfY29uZmlnKGNvbnN0IHN0cnVjdCB0ZXN0X2NvbmZpZyAqdGNv bmYsCiAJaWYgKHJldCA9PSAwICYmIHRjb25mLT5mbGFncyAmIFRFU1RfVElNSU5HUykKIAkJY2hl Y2tfdGltaW5ncyhjcnRjc1swXS5jcnRjX2lkeCwgJmNydGNzWzBdLm1vZGUpOwogCi0JZm9yIChp ID0gMDsgaSA8IGNydGNfY291bnQ7IGkrKykgewotCQlpZiAoY3J0Y3NbaV0uZmJfaW5mby5mYl9p ZCkgewotCQkJZHJtTW9kZVNldENydGMoZHJtX2ZkLCBjcnRjc1tpXS5jcnRjX2lkLCAwLCAwLCAw LCBOVUxMLAotCQkJCQkwLCBOVUxMKTsKLQkJCWRybU1vZGVSbUZCKGRybV9mZCwgY3J0Y3NbaV0u ZmJfaW5mby5mYl9pZCk7Ci0JCQljcnRjc1tpXS5mYl9pbmZvLmZiX2lkID0gMDsKLQkJfQotCX0K LQogCXJldHVybjsKIH0KIAotLSAKMi4xNi4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwppZ3QtZGV2IG1haWxpbmcgbGlzdAppZ3QtZGV2QGxpc3RzLmZy ZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3Rp bmZvL2lndC1kZXYK