From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id 79AB56E4D4 for ; Wed, 23 May 2018 18:31:19 +0000 (UTC) From: Ville Syrjala Date: Wed, 23 May 2018 21:31:05 +0300 Message-Id: <20180523183110.1975-3-ville.syrjala@linux.intel.com> In-Reply-To: <20180523183110.1975-1-ville.syrjala@linux.intel.com> References: <20180523183110.1975-1-ville.syrjala@linux.intel.com> MIME-Version: 1.0 Subject: [igt-dev] [PATCH i-g-t 3/8] lib: Clean up format_desc List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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: RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCkFs d2F5cyBwb3B1bGF0ZSB0aGUgcGxhbmVfYnBwW10gc3R1ZmYsIGFuZCB1c2UgbmFtZWQgaW5pdGlh bGl6ZXJzIHNvCnRoYXQgd2UgY2FuIGFjdHVhbGx5IHNlZSB3aGF0J3MgYmVpbmcgc2V0IHRvIHdo YXQuCgp2MjogRml4IGRlcHRoIGZvciB4cmdiODg4OAoKU2lnbmVkLW9mZi1ieTogVmlsbGUgU3ly asOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KLS0tCiBsaWIvaWd0X2ZiLmMg fCA2NiArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAzNiBpbnNlcnRpb25zKCspLCAzMCBkZWxldGlvbnMo LSkKCmRpZmYgLS1naXQgYS9saWIvaWd0X2ZiLmMgYi9saWIvaWd0X2ZiLmMKaW5kZXggYzg5Zjc4 NTBlZDcwLi45ZWRlZTc0YjU3YzMgMTAwNjQ0Ci0tLSBhL2xpYi9pZ3RfZmIuYworKysgYi9saWIv aWd0X2ZiLmMKQEAgLTU3LDI2ICs1NywzNSBAQAogICovCiAKIC8qIGRybSBmb3VyY2MvY2Fpcm8g Zm9ybWF0IG1hcHMgKi8KLSNkZWZpbmUgREYoZGlkLCBjaWQsIC4uLikJXAotCXsgRFJNX0ZPUk1B VF8jI2RpZCwgQ0FJUk9fRk9STUFUXyMjY2lkLCAjIGRpZCwgX19WQV9BUkdTX18gfQogc3RhdGlj IHN0cnVjdCBmb3JtYXRfZGVzY19zdHJ1Y3QgeworCWNvbnN0IGNoYXIgKm5hbWU7CiAJdWludDMy X3QgZHJtX2lkOwogCWNhaXJvX2Zvcm1hdF90IGNhaXJvX2lkOwotCWNvbnN0IGNoYXIgKm5hbWU7 Ci0JaW50IGJwcDsKIAlpbnQgZGVwdGg7Ci0JaW50IHBsYW5lczsKKwlpbnQgbnVtX3BsYW5lczsK IAlpbnQgcGxhbmVfYnBwWzRdOwogfSBmb3JtYXRfZGVzY1tdID0gewotCURGKFJHQjU2NSwJUkdC MTZfNTY1LAkxNiwgMTYpLAotCS8vREYoUkdCODg4LAlJTlZBTElELAkyNCwgMjQpLAotCURGKFhS R0I4ODg4LAlSR0IyNCwJCTMyLCAyNCksCi0JREYoWFJHQjIxMDEwMTAsCVJHQjMwLAkJMzIsIDMw KSwKLQlERihBUkdCODg4OCwJQVJHQjMyLAkJMzIsIDMyKSwKLQlERihOVjEyLAlSR0IyNCwJCTMy LCAtMSwgMiwgezgsIDE2fSksCisJeyAubmFtZSA9ICJSR0I1NjUiLCAuZGVwdGggPSAxNiwgLmRy bV9pZCA9IERSTV9GT1JNQVRfUkdCNTY1LAorCSAgLmNhaXJvX2lkID0gQ0FJUk9fRk9STUFUX1JH QjE2XzU2NSwKKwkgIC5udW1fcGxhbmVzID0gMSwgLnBsYW5lX2JwcCA9IHsgMTYsIH0sCisJfSwK Kwl7IC5uYW1lID0gIlhSR0I4ODg4IiwgLmRlcHRoID0gMjQsIC5kcm1faWQgPSBEUk1fRk9STUFU X1hSR0I4ODg4LAorCSAgLmNhaXJvX2lkID0gQ0FJUk9fRk9STUFUX1JHQjI0LAorCSAgLm51bV9w bGFuZXMgPSAxLCAucGxhbmVfYnBwID0geyAzMiwgfSwKKwl9LAorCXsgLm5hbWUgPSAiWFJHQjIx MDEwMTAiLCAuZGVwdGggPSAzMCwgLmRybV9pZCA9IERSTV9GT1JNQVRfWFJHQjIxMDEwMTAsCisJ ICAuY2Fpcm9faWQgPSBDQUlST19GT1JNQVRfUkdCMzAsCisJICAubnVtX3BsYW5lcyA9IDEsIC5w bGFuZV9icHAgPSB7IDMyLCB9LAorCX0sCisJeyAubmFtZSA9ICJBUkdCODg4OCIsIC5kZXB0aCA9 IDMyLCAuZHJtX2lkID0gRFJNX0ZPUk1BVF9BUkdCODg4OCwKKwkgIC5jYWlyb19pZCA9IENBSVJP X0ZPUk1BVF9BUkdCMzIsCisJICAubnVtX3BsYW5lcyA9IDEsIC5wbGFuZV9icHAgPSB7IDMyLCB9 LAorCX0sCisJeyAubmFtZSA9ICJOVjEyIiwgLmRlcHRoID0gLTEsIC5kcm1faWQgPSBEUk1fRk9S TUFUX05WMTIsCisJICAuY2Fpcm9faWQgPSBDQUlST19GT1JNQVRfUkdCMjQsCisJICAubnVtX3Bs YW5lcyA9IDIsIC5wbGFuZV9icHAgPSB7IDgsIDE2LCB9LAorCX0sCiB9OwotI3VuZGVmIERGCi0K ICNkZWZpbmUgZm9yX2VhY2hfZm9ybWF0KGYpCVwKIAlmb3IgKGYgPSBmb3JtYXRfZGVzYzsgZiAt IGZvcm1hdF9kZXNjIDwgQVJSQVlfU0laRShmb3JtYXRfZGVzYyk7IGYrKykKIApAQCAtMTk1LDcg KzIwNCw3IEBAIHN0YXRpYyB2b2lkIGNhbGNfZmJfc2l6ZV9wbGFuYXIoaW50IGZkLCBpbnQgd2lk dGgsIGludCBoZWlnaHQsCiAKIAkqc2l6ZV9yZXQgPSAwOwogCi0JZm9yIChwbGFuZSA9IDA7IHBs YW5lIDwgZm9ybWF0LT5wbGFuZXM7IHBsYW5lKyspIHsKKwlmb3IgKHBsYW5lID0gMDsgcGxhbmUg PCBmb3JtYXQtPm51bV9wbGFuZXM7IHBsYW5lKyspIHsKIAkJdW5zaWduZWQgcGxhbmVfc3RyaWRl OwogCiAJCWlndF9nZXRfZmJfdGlsZV9zaXplKGZkLCB0aWxpbmcsIGZvcm1hdC0+cGxhbmVfYnBw W3BsYW5lXSwgJnRpbGVfd2lkdGgsICZ0aWxlX2hlaWdodCk7CkBAIC0yMDUsNyArMjE0LDcgQEAg c3RhdGljIHZvaWQgY2FsY19mYl9zaXplX3BsYW5hcihpbnQgZmQsIGludCB3aWR0aCwgaW50IGhl aWdodCwKIAkJCXN0cmlkZSA9IHBsYW5lX3N0cmlkZTsKIAl9CiAKLQlmb3IgKHBsYW5lID0gMDsg cGxhbmUgPCBmb3JtYXQtPnBsYW5lczsgcGxhbmUrKykgeworCWZvciAocGxhbmUgPSAwOyBwbGFu ZSA8IGZvcm1hdC0+bnVtX3BsYW5lczsgcGxhbmUrKykgewogCQlpZiAob2Zmc2V0cykKIAkJCW9m ZnNldHNbcGxhbmVdID0gKnNpemVfcmV0OwogCkBAIC0yMjYsOSArMjM1LDkgQEAgc3RhdGljIHZv aWQgY2FsY19mYl9zaXplX3BhY2tlZChpbnQgZmQsIGludCB3aWR0aCwgaW50IGhlaWdodCwKIAkJ CQl1bnNpZ25lZCAqc2l6ZV9yZXQsIHVuc2lnbmVkICpzdHJpZGVfcmV0KQogewogCXVuc2lnbmVk IGludCB0aWxlX3dpZHRoLCB0aWxlX2hlaWdodCwgc3RyaWRlLCBzaXplOwotCWludCBieXRlX3dp ZHRoID0gd2lkdGggKiAoZm9ybWF0LT5icHAgLyA4KTsKKwlpbnQgYnl0ZV93aWR0aCA9IHdpZHRo ICogKGZvcm1hdC0+cGxhbmVfYnBwWzBdIC8gOCk7CiAKLQlpZ3RfZ2V0X2ZiX3RpbGVfc2l6ZShm ZCwgdGlsaW5nLCBmb3JtYXQtPmJwcCwgJnRpbGVfd2lkdGgsICZ0aWxlX2hlaWdodCk7CisJaWd0 X2dldF9mYl90aWxlX3NpemUoZmQsIHRpbGluZywgZm9ybWF0LT5wbGFuZV9icHBbMF0sICZ0aWxl X3dpZHRoLCAmdGlsZV9oZWlnaHQpOwogCiAJaWYgKHRpbGluZyAhPSBMT0NBTF9EUk1fRk9STUFU X01PRF9OT05FICYmCiAJICAgIGludGVsX2dlbihpbnRlbF9nZXRfZHJtX2RldmlkKGZkKSkgPD0g MykgewpAQCAtMjc3LDcgKzI4Niw3IEBAIHZvaWQgaWd0X2NhbGNfZmJfc2l6ZShpbnQgZmQsIGlu dCB3aWR0aCwgaW50IGhlaWdodCwgdWludDMyX3QgZHJtX2Zvcm1hdCwgdWludDY0CiAJc3RydWN0 IGZvcm1hdF9kZXNjX3N0cnVjdCAqZm9ybWF0ID0gbG9va3VwX2RybV9mb3JtYXQoZHJtX2Zvcm1h dCk7CiAJaWd0X2Fzc2VydChmb3JtYXQpOwogCi0JaWYgKGZvcm1hdC0+cGxhbmVzID4gMSkKKwlp ZiAoZm9ybWF0LT5udW1fcGxhbmVzID4gMSkKIAkJY2FsY19mYl9zaXplX3BsYW5hcihmZCwgd2lk dGgsIGhlaWdodCwgZm9ybWF0LCB0aWxpbmcsIHNpemVfcmV0LCBzdHJpZGVfcmV0LCBOVUxMKTsK IAllbHNlCiAJCWNhbGNfZmJfc2l6ZV9wYWNrZWQoZmQsIHdpZHRoLCBoZWlnaHQsIGZvcm1hdCwg dGlsaW5nLCBzaXplX3JldCwgc3RyaWRlX3JldCk7CkBAIC0zNjIsNyArMzcxLDcgQEAgc3RhdGlj IGludCBjcmVhdGVfYm9fZm9yX2ZiKGludCBmZCwgaW50IHdpZHRoLCBpbnQgaGVpZ2h0LAogCWlm ICh0aWxpbmcgfHwgc2l6ZSB8fCBzdHJpZGUgfHwgaWd0X2Zvcm1hdF9pc195dXYoZm9ybWF0LT5k cm1faWQpKSB7CiAJCXVuc2lnbmVkIGNhbGN1bGF0ZWRfc2l6ZSwgY2FsY3VsYXRlZF9zdHJpZGU7 CiAKLQkJaWYgKGZvcm1hdC0+cGxhbmVzID4gMSkKKwkJaWYgKGZvcm1hdC0+bnVtX3BsYW5lcyA+ IDEpCiAJCQljYWxjX2ZiX3NpemVfcGxhbmFyKGZkLCB3aWR0aCwgaGVpZ2h0LCBmb3JtYXQsIHRp bGluZywKIAkJCQkJICAgICZjYWxjdWxhdGVkX3NpemUsICZjYWxjdWxhdGVkX3N0cmlkZSwgb2Zm c2V0cyk7CiAJCWVsc2UKQEAgLTQyNSw4ICs0MzQsOSBAQCBzdGF0aWMgaW50IGNyZWF0ZV9ib19m b3JfZmIoaW50IGZkLCBpbnQgd2lkdGgsIGludCBoZWlnaHQsCiAJCWlmIChpc19kdW1iKQogCQkJ KmlzX2R1bWIgPSB0cnVlOwogCi0JCXJldHVybiBrbXN0ZXN0X2R1bWJfY3JlYXRlKGZkLCB3aWR0 aCwgaGVpZ2h0LCBmb3JtYXQtPmJwcCwgc3RyaWRlX3JldCwKLQkJCQkJICAgc2l6ZV9yZXQpOwor CQlyZXR1cm4ga21zdGVzdF9kdW1iX2NyZWF0ZShmZCwgd2lkdGgsIGhlaWdodCwKKwkJCQkJICAg Zm9ybWF0LT5wbGFuZV9icHBbMF0sCisJCQkJCSAgIHN0cmlkZV9yZXQsIHNpemVfcmV0KTsKIAl9 CiB9CiAKQEAgLTgyOCw3ICs4MzgsNyBAQCBpZ3RfY3JlYXRlX2ZiX3dpdGhfYm9fc2l6ZShpbnQg ZmQsIGludCB3aWR0aCwgaW50IGhlaWdodCwKIAogCQloYW5kbGVzWzBdID0gZmItPmdlbV9oYW5k bGU7CiAJCXBpdGNoZXNbMF0gPSBmYi0+c3RyaWRlOwotCQlmb3IgKGkgPSAwOyBpIDwgZi0+cGxh bmVzOyBpKyspIHsKKwkJZm9yIChpID0gMDsgaSA8IGYtPm51bV9wbGFuZXM7IGkrKykgewogCQkJ aGFuZGxlc1tpXSA9IGZiLT5nZW1faGFuZGxlOwogCQkJcGl0Y2hlc1tpXSA9IGZiLT5zdHJpZGU7 CiAJCX0KQEAgLTg0NCwxMyArODU0LDkgQEAgaWd0X2NyZWF0ZV9mYl93aXRoX2JvX3NpemUoaW50 IGZkLCBpbnQgd2lkdGgsIGludCBoZWlnaHQsCiAJZmItPmRybV9mb3JtYXQgPSBmb3JtYXQ7CiAJ ZmItPmZiX2lkID0gZmJfaWQ7CiAJZmItPmZkID0gZmQ7Ci0JZmItPm51bV9wbGFuZXMgPSBmLT5w bGFuZXMgPzogMTsKLQlmYi0+cGxhbmVfYnBwWzBdID0gZi0+YnBwOwotCWZiLT5wbGFuZV9oZWln aHRbMF0gPSBoZWlnaHQ7Ci0JZmItPnBsYW5lX3dpZHRoWzBdID0gd2lkdGg7CisJZmItPm51bV9w bGFuZXMgPSBmLT5udW1fcGxhbmVzOwogCi0JLyogaWYgZi0+cGxhbmVzIGlzIHNldCwgdGhlbiBw bGFuZV9icHAgaXMgdmFsaWQgdG9vIHNvIHVzZSB0aGF0LiAqLwotCWZvciAoaSA9IDA7IGkgPCBm LT5wbGFuZXM7IGkrKykgeworCWZvciAoaSA9IDA7IGkgPCBmLT5udW1fcGxhbmVzOyBpKyspIHsK IAkJZmItPnBsYW5lX2JwcFtpXSA9IGYtPnBsYW5lX2JwcFtpXTsKIAkJZmItPnBsYW5lX2hlaWdo dFtpXSA9IHBsYW5hcl9oZWlnaHQoZiwgaGVpZ2h0LCBpKTsKIAkJZmItPnBsYW5lX3dpZHRoW2ld ID0gcGxhbmFyX3dpZHRoKGYsIHdpZHRoLCBpKTsKQEAgLTE2NjksNyArMTY3NSw3IEBAIHVpbnQz Ml90IGlndF9icHBfZGVwdGhfdG9fZHJtX2Zvcm1hdChpbnQgYnBwLCBpbnQgZGVwdGgpCiAJc3Ry dWN0IGZvcm1hdF9kZXNjX3N0cnVjdCAqZjsKIAogCWZvcl9lYWNoX2Zvcm1hdChmKQotCQlpZiAo Zi0+YnBwID09IGJwcCAmJiBmLT5kZXB0aCA9PSBkZXB0aCkKKwkJaWYgKGYtPnBsYW5lX2JwcFsw XSA9PSBicHAgJiYgZi0+ZGVwdGggPT0gZGVwdGgpCiAJCQlyZXR1cm4gZi0+ZHJtX2lkOwogCiAK QEAgLTE2OTIsNyArMTY5OCw3IEBAIHVpbnQzMl90IGlndF9kcm1fZm9ybWF0X3RvX2JwcCh1aW50 MzJfdCBkcm1fZm9ybWF0KQogCWlndF9hc3NlcnRfZihmLCAiY2FuJ3QgZmluZCBhIGJwcCBmb3Jt YXQgZm9yICUwOHggKCVzKVxuIiwKIAkJICAgICBkcm1fZm9ybWF0LCBpZ3RfZm9ybWF0X3N0cihk cm1fZm9ybWF0KSk7CiAKLQlyZXR1cm4gZi0+YnBwOworCXJldHVybiBmLT5wbGFuZV9icHBbMF07 CiB9CiAKIC8qKgotLSAKMi4xNi4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fXwppZ3QtZGV2IG1haWxpbmcgbGlzdAppZ3QtZGV2QGxpc3RzLmZyZWVkZXNr dG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ln dC1kZXYK