From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5BA016EA65 for ; Fri, 25 Oct 2019 14:30:59 +0000 (UTC) From: Ville Syrjala Date: Fri, 25 Oct 2019 17:30:49 +0300 Message-Id: <20191025143050.18205-3-ville.syrjala@linux.intel.com> In-Reply-To: <20191025143050.18205-1-ville.syrjala@linux.intel.com> References: <20191025143050.18205-1-ville.syrjala@linux.intel.com> MIME-Version: 1.0 Subject: [igt-dev] [PATCH i-g-t 3/4] lib/igt_fb: Don't skip the entire subtest when cairo/pixman is too old 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: RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCkp1 c3Qgc2tpcCB0aGUgc3BlY2lmaWMgcGl4ZWwgZm9ybWF0IGluc3RlYWQgb2YgdGhlIHdob2xlIHN1 YnRlc3QKd2hlbiBjYWlyby9waXhtYW4gaXMgdG9vIG9sZCB0byBzdXBwb3J0IGl0LiBMZXQncyB1 cyBhdCBsZWFzdAp0ZXN0IGFsbCB0aGUgb3RoZXIgZm9ybWF0cy4KClNpZ25lZC1vZmYtYnk6IFZp bGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+Ci0tLQogbGliL2ln dF9mYi5jIHwgNDEgKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEg ZmlsZSBjaGFuZ2VkLCAxOSBpbnNlcnRpb25zKCspLCAyMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9saWIvaWd0X2ZiLmMgYi9saWIvaWd0X2ZiLmMKaW5kZXggOWVkNTNkMDU2NzM1Li5hYWVj YTc5NTU0MTggMTAwNjQ0Ci0tLSBhL2xpYi9pZ3RfZmIuYworKysgYi9saWIvaWd0X2ZiLmMKQEAg LTMyMjcsOCArMzIyNyw2IEBAIHN0YXRpYyBib29sIHVzZV9jb252ZXJ0KGNvbnN0IHN0cnVjdCBp Z3RfZmIgKmZiKQogICovCiBjYWlyb19zdXJmYWNlX3QgKmlndF9nZXRfY2Fpcm9fc3VyZmFjZShp bnQgZmQsIHN0cnVjdCBpZ3RfZmIgKmZiKQogewotCWNvbnN0IHN0cnVjdCBmb3JtYXRfZGVzY19z dHJ1Y3QgKmYgPSBsb29rdXBfZHJtX2Zvcm1hdChmYi0+ZHJtX2Zvcm1hdCk7Ci0KIAlpZiAoZmIt PmNhaXJvX3N1cmZhY2UgPT0gTlVMTCkgewogCQlpZiAodXNlX2NvbnZlcnQoZmIpKQogCQkJY3Jl YXRlX2NhaXJvX3N1cmZhY2VfX2NvbnZlcnQoZmQsIGZiKTsKQEAgLTMyMzYsMjEgKzMyMzQsNiBA QCBjYWlyb19zdXJmYWNlX3QgKmlndF9nZXRfY2Fpcm9fc3VyZmFjZShpbnQgZmQsIHN0cnVjdCBp Z3RfZmIgKmZiKQogCQkJY3JlYXRlX2NhaXJvX3N1cmZhY2VfX2dwdShmZCwgZmIpOwogCQllbHNl CiAJCQljcmVhdGVfY2Fpcm9fc3VyZmFjZV9fZ3R0KGZkLCBmYik7Ci0KLQkJaWYgKGYtPmNhaXJv X2lkID09IENBSVJPX0ZPUk1BVF9SR0I5NkYgfHwKLQkJICAgIGYtPmNhaXJvX2lkID09IENBSVJP X0ZPUk1BVF9SR0JBMTI4RikgewotCQkJY2Fpcm9fc3RhdHVzX3Qgc3RhdHVzID0gY2Fpcm9fc3Vy ZmFjZV9zdGF0dXMoZmItPmNhaXJvX3N1cmZhY2UpOwotCi0JCQlpZ3Rfc2tpcF9vbl9mKHN0YXR1 cyA9PSBDQUlST19TVEFUVVNfSU5WQUxJRF9GT1JNQVQgJiYKLQkJCQkgICAgICBjYWlyb192ZXJz aW9uKCkgPCBDQUlST19WRVJTSU9OX0VOQ09ERSgxLCAxNywgMiksCi0JCQkJICAgICAgIkNhaXJv IHZlcnNpb24gdG9vIG9sZCwgbmVlZCAxLjE3LjIsIGhhdmUgJXNcbiIsCi0JCQkJICAgICAgY2Fp cm9fdmVyc2lvbl9zdHJpbmcoKSk7Ci0KLQkJCWlndF9za2lwX29uX2Yoc3RhdHVzID09IENBSVJP X1NUQVRVU19OT19NRU1PUlkgJiYKLQkJCQkgICAgICBwaXhtYW5fdmVyc2lvbigpIDwgUElYTUFO X1ZFUlNJT05fRU5DT0RFKDAsIDM2LCAwKSwKLQkJCQkgICAgICAiUGl4bWFuIHZlcnNpb24gdG9v IG9sZCwgbmVlZCAwLjM2LjAsIGhhdmUgJXNcbiIsCi0JCQkJICAgICAgcGl4bWFuX3ZlcnNpb25f c3RyaW5nKCkpOwotCQl9CiAJfQogCiAJaWd0X2Fzc2VydChjYWlyb19zdXJmYWNlX3N0YXR1cyhm Yi0+Y2Fpcm9fc3VyZmFjZSkgPT0gQ0FJUk9fU1RBVFVTX1NVQ0NFU1MpOwpAQCAtMzQ3NCwxMiAr MzQ1NywyNiBAQCBib29sIGlndF9mYl9zdXBwb3J0ZWRfZm9ybWF0KHVpbnQzMl90IGRybV9mb3Jt YXQpCiAJaWYgKGRybV9mb3JtYXQgPT0gRFJNX0ZPUk1BVF9DOCkKIAkJcmV0dXJuIGZhbHNlOwog Ci0JZm9yX2VhY2hfZm9ybWF0KGYpCi0JCWlmIChmLT5kcm1faWQgPT0gZHJtX2Zvcm1hdCkKLQkJ CXJldHVybiAoZi0+Y2Fpcm9faWQgIT0gQ0FJUk9fRk9STUFUX0lOVkFMSUQpIHx8Ci0JCQkJKGYt PnBpeG1hbl9pZCAhPSBQSVhNQU5faW52YWxpZCk7CisJZiA9IGxvb2t1cF9kcm1fZm9ybWF0KGRy bV9mb3JtYXQpOworCWlmICghZikKKwkJcmV0dXJuIGZhbHNlOworCisJaWYgKChmLT5jYWlyb19p ZCA9PSBDQUlST19GT1JNQVRfUkdCOTZGIHx8CisJICAgICBmLT5jYWlyb19pZCA9PSBDQUlST19G T1JNQVRfUkdCQTEyOEYpICYmCisJICAgIGNhaXJvX3ZlcnNpb24oKSA8IENBSVJPX1ZFUlNJT05f RU5DT0RFKDEsIDE3LCAyKSkgeworCQlpZ3RfaW5mbygiQ2Fpcm8gdmVyc2lvbiB0b28gb2xkIGZv ciAiIElHVF9GT1JNQVRfRk1UICIsIG5lZWQgMS4xNy4yLCBoYXZlICVzXG4iLAorCQkJIElHVF9G T1JNQVRfQVJHUyhkcm1fZm9ybWF0KSwgY2Fpcm9fdmVyc2lvbl9zdHJpbmcoKSk7CisJCXJldHVy biBmYWxzZTsKKwl9CiAKLQlyZXR1cm4gZmFsc2U7CisJaWYgKGYtPnBpeG1hbl9pZCA9PSBQSVhN QU5fcmdiYV9mbG9hdCAmJgorCSAgICBwaXhtYW5fdmVyc2lvbigpIDwgUElYTUFOX1ZFUlNJT05f RU5DT0RFKDAsIDM2LCAwKSkgeworCQlpZ3RfaW5mbygiUGl4bWFuIHZlcnNpb24gdG9vIG9sZCBm b3IgIiBJR1RfRk9STUFUX0ZNVCAiLCBuZWVkIDAuMzYuMCwgaGF2ZSAlc1xuIiwKKwkJCSBJR1Rf Rk9STUFUX0FSR1MoZHJtX2Zvcm1hdCksIHBpeG1hbl92ZXJzaW9uX3N0cmluZygpKTsKKwkJcmV0 dXJuIGZhbHNlOworCX0KKworCXJldHVybiB0cnVlOwogfQogCiAvKioKLS0gCjIuMjEuMAoKX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KaWd0LWRldiBtYWls aW5nIGxpc3QKaWd0LWRldkBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVl ZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pZ3QtZGV2