From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 97A466E666 for ; Fri, 26 Jan 2018 19:51:20 +0000 (UTC) From: Ville Syrjala Date: Fri, 26 Jan 2018 21:51:14 +0200 Message-Id: <20180126195114.13237-2-ville.syrjala@linux.intel.com> In-Reply-To: <20180126195114.13237-1-ville.syrjala@linux.intel.com> References: <20180126195114.13237-1-ville.syrjala@linux.intel.com> MIME-Version: 1.0 Subject: [igt-dev] [PATCH i-g-t 2/2] tests/kms_ccs: Don't skip the entire subtest if one plane can't do CCS 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 Cc: Gabriel Krisman Bertazi List-ID: RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCk1h a2Ugc3VyZSB3ZSB0ZXN0IGV2ZXJ5IHBsYW5lIG9uIHRoZSBwaXBlLCBhbmQgb25seSByZXBvcnQg YSBTS0lQCmlmIG5vbmUgb2YgdGhlIHBsYW5lcyBzdXBwb3J0IENDUyAob3IgdGhlIHBpeGVsIGZv cm1hdCkuCgpDYzogR2FicmllbCBLcmlzbWFuIEJlcnRhemkgPGtyaXNtYW5AY29sbGFib3JhLmNv LnVrPgpCdWd6aWxsYTogaHR0cHM6Ly9idWdzLmZyZWVkZXNrdG9wLm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTA0NzI0ClNpZ25lZC1vZmYtYnk6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBs aW51eC5pbnRlbC5jb20+Ci0tLQogdGVzdHMva21zX2Njcy5jIHwgNjcgKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdl ZCwgMzcgaW5zZXJ0aW9ucygrKSwgMzAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvdGVzdHMv a21zX2Njcy5jIGIvdGVzdHMva21zX2Njcy5jCmluZGV4IGIxNDJkM2U1YTdjYi4uNjMyOThmMTM3 YWJiIDEwMDY0NAotLS0gYS90ZXN0cy9rbXNfY2NzLmMKKysrIGIvdGVzdHMva21zX2Njcy5jCkBA IC0xMzAsNyArMTMwLDcgQEAgbW9kaWZpZXJzX3B0cihzdHJ1Y3QgbG9jYWxfZHJtX2Zvcm1hdF9t b2RpZmllcl9ibG9iICpibG9iKQogCXJldHVybiAoc3RydWN0IGxvY2FsX2RybV9mb3JtYXRfbW9k aWZpZXIgKikoKChjaGFyICopYmxvYikgKyBibG9iLT5tb2RpZmllcnNfb2Zmc2V0KTsKIH0KIAot c3RhdGljIHZvaWQgcGxhbmVfcmVxdWlyZV9jY3MoZGF0YV90ICpkYXRhLCBpZ3RfcGxhbmVfdCAq cGxhbmUsIHVpbnQzMl90IGZvcm1hdCkKK3N0YXRpYyBib29sIHBsYW5lX2hhc19mb3JtYXRfd2l0 aF9jY3MoZGF0YV90ICpkYXRhLCBpZ3RfcGxhbmVfdCAqcGxhbmUsIHVpbnQzMl90IGZvcm1hdCkK IHsKIAlkcm1Nb2RlUHJvcGVydHlCbG9iUHRyIGJsb2I7CiAJc3RydWN0IGxvY2FsX2RybV9mb3Jt YXRfbW9kaWZpZXJfYmxvYiAqYmxvYl9kYXRhOwpAQCAtMTYxLDggKzE2MSw4IEBAIHN0YXRpYyB2 b2lkIHBsYW5lX3JlcXVpcmVfY2NzKGRhdGFfdCAqZGF0YSwgaWd0X3BsYW5lX3QgKnBsYW5lLCB1 aW50MzJfdCBmb3JtYXQpCiAJCX0KIAl9CiAKLQlpZ3Rfc2tpcF9vbl9mKGZtdF9pZHggPT0gLTEs Ci0JCSAgICAgICJGb3JtYXQgMHgleCBub3Qgc3VwcG9ydGVkIGJ5IHBsYW5lXG4iLCBmb3JtYXQp OworCWlmIChmbXRfaWR4ID09IC0xKQorCQlyZXR1cm4gZmFsc2U7CiAKIAltb2RpZmllcnMgPSBt b2RpZmllcnNfcHRyKGJsb2JfZGF0YSk7CiAJbGFzdF9tb2QgPSAmbW9kaWZpZXJzW2Jsb2JfZGF0 YS0+Y291bnRfbW9kaWZpZXJzXTsKQEAgLTE3NywxMiArMTc3LDEwIEBAIHN0YXRpYyB2b2lkIHBs YW5lX3JlcXVpcmVfY2NzKGRhdGFfdCAqZGF0YSwgaWd0X3BsYW5lX3QgKnBsYW5lLCB1aW50MzJf dCBmb3JtYXQpCiAKIAkJaWYgKG1vZGlmaWVyc1tpXS5mb3JtYXRzICYKIAkJICAgICgxVUwgPDwg KGZtdF9pZHggLSBtb2RpZmllcnNbaV0ub2Zmc2V0KSkpCi0JCQlyZXR1cm47Ci0KLQkJaWd0X3Nr aXAoImk5MTUgQ0NTIG1vZGlmaWVyIG5vdCBzdXBwb3J0ZWQgZm9yIGZvcm1hdFxuIik7CisJCQly ZXR1cm4gdHJ1ZTsKIAl9CiAKLQlpZ3Rfc2tpcCgiaTkxNSBDQ1MgbW9kaWZpZXIgbm90IHN1cHBv cnRlZCBieSBrZXJuZWwgZm9yIHBsYW5lXG4iKTsKKwlyZXR1cm4gZmFsc2U7CiB9CiAKIHN0YXRp YyB2b2lkIHJlbmRlcl9mYihkYXRhX3QgKmRhdGEsIHVpbnQzMl90IGdlbV9oYW5kbGUsIHVuc2ln bmVkIGludCBzaXplLApAQCAtMzg1LDcgKzM4Myw3IEBAIHN0YXRpYyB2b2lkIGdlbmVyYXRlX2Zi KGRhdGFfdCAqZGF0YSwgc3RydWN0IGlndF9mYiAqZmIsCiAJZmItPmRvbWFpbiA9IDA7CiB9CiAK LXN0YXRpYyB2b2lkIHRyeV9jb25maWcoZGF0YV90ICpkYXRhLCBlbnVtIHRlc3RfZmJfZmxhZ3Mg ZmJfZmxhZ3MsCitzdGF0aWMgYm9vbCB0cnlfY29uZmlnKGRhdGFfdCAqZGF0YSwgZW51bSB0ZXN0 X2ZiX2ZsYWdzIGZiX2ZsYWdzLAogCQkgICAgICAgaWd0X2NyY190ICpjcmMpCiB7CiAJaWd0X2Rp c3BsYXlfdCAqZGlzcGxheSA9ICZkYXRhLT5kaXNwbGF5OwpAQCAtNDAyLDEwICs0MDAsMTIgQEAg c3RhdGljIHZvaWQgdHJ5X2NvbmZpZyhkYXRhX3QgKmRhdGEsIGVudW0gdGVzdF9mYl9mbGFncyBm Yl9mbGFncywKIAogCXByaW1hcnkgPSBpZ3Rfb3V0cHV0X2dldF9wbGFuZV90eXBlKGRhdGEtPm91 dHB1dCwKIAkJCQkJICAgIERSTV9QTEFORV9UWVBFX1BSSU1BUlkpOwotCXBsYW5lX3JlcXVpcmVf Y2NzKGRhdGEsIHByaW1hcnksIERSTV9GT1JNQVRfWFJHQjg4ODgpOworCWlmICghcGxhbmVfaGFz X2Zvcm1hdF93aXRoX2NjcyhkYXRhLCBwcmltYXJ5LCBEUk1fRk9STUFUX1hSR0I4ODg4KSkKKwkJ cmV0dXJuIGZhbHNlOwogCiAJaWYgKGRhdGEtPnBsYW5lICYmIGZiX2ZsYWdzICYgRkJfQ09NUFJF U1NFRCkgewotCQlwbGFuZV9yZXF1aXJlX2NjcyhkYXRhLCBkYXRhLT5wbGFuZSwgRFJNX0ZPUk1B VF9YUkdCODg4OCk7CisJCWlmICghcGxhbmVfaGFzX2Zvcm1hdF93aXRoX2NjcyhkYXRhLCBkYXRh LT5wbGFuZSwgRFJNX0ZPUk1BVF9YUkdCODg4OCkpCisJCQlyZXR1cm4gZmFsc2U7CiAJCWdlbmVy YXRlX2ZiKGRhdGEsICZmYiwgZHJtX21vZGUtPmhkaXNwbGF5LAogCQkJICAgIGRybV9tb2RlLT52 ZGlzcGxheSwKIAkJCSAgICAoZmJfZmxhZ3MgJiB+RkJfQ09NUFJFU1NFRCkgfCBGQl9IQVNfUExB TkUpOwpAQCAtNDE2LDcgKzQxNiw3IEBAIHN0YXRpYyB2b2lkIHRyeV9jb25maWcoZGF0YV90ICpk YXRhLCBlbnVtIHRlc3RfZmJfZmxhZ3MgZmJfZmxhZ3MsCiAJfQogCiAJaWYgKGRhdGEtPmZsYWdz ICYgVEVTVF9GQUlMX09OX0FEREZCMikKLQkJcmV0dXJuOworCQlyZXR1cm4gdHJ1ZTsKIAogCWln dF9wbGFuZV9zZXRfcG9zaXRpb24ocHJpbWFyeSwgMCwgMCk7CiAJaWd0X3BsYW5lX3NldF9zaXpl KHByaW1hcnksIGRybV9tb2RlLT5oZGlzcGxheSwgZHJtX21vZGUtPnZkaXNwbGF5KTsKQEAgLTQ1 OCwxMyArNDU4LDE2IEBAIHN0YXRpYyB2b2lkIHRyeV9jb25maWcoZGF0YV90ICpkYXRhLCBlbnVt IHRlc3RfZmJfZmxhZ3MgZmJfZmxhZ3MsCiAKIAlpZiAoZGF0YS0+ZmxhZ3MgJiBURVNUX0NSQykK IAkJaWd0X3JlbW92ZV9mYihkYXRhLT5kcm1fZmQsICZmYik7CisKKwlyZXR1cm4gdHJ1ZTsKIH0K IAotc3RhdGljIHZvaWQgdGVzdF9vdXRwdXQoZGF0YV90ICpkYXRhKQorc3RhdGljIGludCB0ZXN0 X291dHB1dChkYXRhX3QgKmRhdGEpCiB7CiAJaWd0X2Rpc3BsYXlfdCAqZGlzcGxheSA9ICZkYXRh LT5kaXNwbGF5OwogCWlndF9jcmNfdCBjcmMsIHJlZl9jcmM7CiAJZW51bSB0ZXN0X2ZiX2ZsYWdz IGZiX2ZsYWdzID0gMDsKKwlpbnQgdmFsaWRfdGVzdHMgPSAwOwogCiAJaWd0X2Rpc3BsYXlfcmVx dWlyZV9vdXRwdXRfb25fcGlwZShkaXNwbGF5LCBkYXRhLT5waXBlKTsKIApAQCAtNDc4LDEwICs0 ODEsMTEgQEAgc3RhdGljIHZvaWQgdGVzdF9vdXRwdXQoZGF0YV90ICpkYXRhKQogCWlmIChkYXRh LT5mbGFncyAmIFRFU1RfQ1JDKSB7CiAJCWRhdGEtPnBpcGVfY3JjID0gaWd0X3BpcGVfY3JjX25l dyhkYXRhLT5kcm1fZmQsIGRhdGEtPnBpcGUsIElOVEVMX1BJUEVfQ1JDX1NPVVJDRV9BVVRPKTsK IAotCQl0cnlfY29uZmlnKGRhdGEsIGZiX2ZsYWdzIHwgRkJfQ09NUFJFU1NFRCwgJnJlZl9jcmMp OwotCQl0cnlfY29uZmlnKGRhdGEsIGZiX2ZsYWdzLCAmY3JjKTsKLQotCQlpZ3RfYXNzZXJ0X2Ny Y19lcXVhbCgmY3JjLCAmcmVmX2NyYyk7CisJCWlmICh0cnlfY29uZmlnKGRhdGEsIGZiX2ZsYWdz IHwgRkJfQ09NUFJFU1NFRCwgJnJlZl9jcmMpICYmCisJCSAgICB0cnlfY29uZmlnKGRhdGEsIGZi X2ZsYWdzLCAmY3JjKSkgeworCQkJaWd0X2Fzc2VydF9jcmNfZXF1YWwoJmNyYywgJnJlZl9jcmMp OworCQkJdmFsaWRfdGVzdHMrKzsKKwkJfQogCiAJCWlndF9waXBlX2NyY19mcmVlKGRhdGEtPnBp cGVfY3JjKTsKIAkJZGF0YS0+cGlwZV9jcmMgPSBOVUxMOwpAQCAtNDkxLDE3ICs0OTUsMTkgQEAg c3RhdGljIHZvaWQgdGVzdF9vdXRwdXQoZGF0YV90ICpkYXRhKQogCSAgICBkYXRhLT5mbGFncyAm IFRFU1RfQkFEX1JPVEFUSU9OXzkwIHx8CiAJICAgIGRhdGEtPmZsYWdzICYgVEVTVF9OT19BVVhf QlVGRkVSIHx8CiAJICAgIGRhdGEtPmZsYWdzICYgVEVTVF9CQURfQ0NTX0hBTkRMRSkgewotCQl0 cnlfY29uZmlnKGRhdGEsIGZiX2ZsYWdzIHwgRkJfQ09NUFJFU1NFRCwgTlVMTCk7CisJCXZhbGlk X3Rlc3RzICs9IHRyeV9jb25maWcoZGF0YSwgZmJfZmxhZ3MgfCBGQl9DT01QUkVTU0VELCBOVUxM KTsKIAl9CiAKIAlpZiAoZGF0YS0+ZmxhZ3MgJiBURVNUX0JBRF9BVVhfU1RSSURFKSB7Ci0JCXRy eV9jb25maWcoZGF0YSwgZmJfZmxhZ3MgfCBGQl9DT01QUkVTU0VEIHwgRkJfTUlTQUxJR05fQVVY X1NUUklERSAsIE5VTEwpOwotCQl0cnlfY29uZmlnKGRhdGEsIGZiX2ZsYWdzIHwgRkJfQ09NUFJF U1NFRCB8IEZCX1NNQUxMX0FVWF9TVFJJREUgLCBOVUxMKTsKLQkJdHJ5X2NvbmZpZyhkYXRhLCBm Yl9mbGFncyB8IEZCX0NPTVBSRVNTRUQgfCBGQl9aRVJPX0FVWF9TVFJJREUgLCBOVUxMKTsKKwkJ dmFsaWRfdGVzdHMgKz0gdHJ5X2NvbmZpZyhkYXRhLCBmYl9mbGFncyB8IEZCX0NPTVBSRVNTRUQg fCBGQl9NSVNBTElHTl9BVVhfU1RSSURFICwgTlVMTCk7CisJCXZhbGlkX3Rlc3RzICs9IHRyeV9j b25maWcoZGF0YSwgZmJfZmxhZ3MgfCBGQl9DT01QUkVTU0VEIHwgRkJfU01BTExfQVVYX1NUUklE RSAsIE5VTEwpOworCQl2YWxpZF90ZXN0cyArPSB0cnlfY29uZmlnKGRhdGEsIGZiX2ZsYWdzIHwg RkJfQ09NUFJFU1NFRCB8IEZCX1pFUk9fQVVYX1NUUklERSAsIE5VTEwpOwogCX0KIAogCWlndF9v dXRwdXRfc2V0X3BpcGUoZGF0YS0+b3V0cHV0LCBQSVBFX0FOWSk7CiAJaWd0X2Rpc3BsYXlfY29t bWl0MihkaXNwbGF5LCBkaXNwbGF5LT5pc19hdG9taWMgPyBDT01NSVRfQVRPTUlDIDogQ09NTUlU X0xFR0FDWSk7CisKKwlyZXR1cm4gdmFsaWRfdGVzdHM7CiB9CiAKIHN0YXRpYyBkYXRhX3QgZGF0 YTsKQEAgLTUyMiw1MiArNTI4LDUzIEBAIGlndF9tYWluCiAKIAlmb3JfZWFjaF9waXBlX3N0YXRp YyhwaXBlKSB7CiAJCWNvbnN0IGNoYXIgKnBpcGVfbmFtZSA9IGttc3Rlc3RfcGlwZV9uYW1lKHBp cGUpOwotCQlpbnQgc3ByaXRlX2lkeCA9IDA7CiAKIAkJZGF0YS5waXBlID0gcGlwZTsKIAogCQlk YXRhLmZsYWdzID0gVEVTVF9CQURfUElYRUxfRk9STUFUOwogCQlpZ3Rfc3VidGVzdF9mKCJwaXBl LSVzLWJhZC1waXhlbC1mb3JtYXQiLCBwaXBlX25hbWUpCi0JCQl0ZXN0X291dHB1dCgmZGF0YSk7 CisJCQlpZ3RfcmVxdWlyZSh0ZXN0X291dHB1dCgmZGF0YSkpOwogCiAJCWRhdGEuZmxhZ3MgPSBU RVNUX0JBRF9ST1RBVElPTl85MDsKIAkJaWd0X3N1YnRlc3RfZigicGlwZS0lcy1iYWQtcm90YXRp b24tOTAiLCBwaXBlX25hbWUpCi0JCQl0ZXN0X291dHB1dCgmZGF0YSk7CisJCQlpZ3RfcmVxdWly ZSh0ZXN0X291dHB1dCgmZGF0YSkpOwogCiAJCWRhdGEuZmxhZ3MgPSBURVNUX0NSQzsKIAkJaWd0 X3N1YnRlc3RfZigicGlwZS0lcy1jcmMtcHJpbWFyeS1iYXNpYyIsIHBpcGVfbmFtZSkKLQkJCXRl c3Rfb3V0cHV0KCZkYXRhKTsKKwkJCWlndF9yZXF1aXJlKHRlc3Rfb3V0cHV0KCZkYXRhKSk7CiAK IAkJZGF0YS5mbGFncyA9IFRFU1RfQ1JDIHwgVEVTVF9ST1RBVEVfMTgwOwogCQlpZ3Rfc3VidGVz dF9mKCJwaXBlLSVzLWNyYy1wcmltYXJ5LXJvdGF0aW9uLTE4MCIsIHBpcGVfbmFtZSkKLQkJCXRl c3Rfb3V0cHV0KCZkYXRhKTsKKwkJCWlndF9yZXF1aXJlKHRlc3Rfb3V0cHV0KCZkYXRhKSk7CiAK IAkJZGF0YS5mbGFncyA9IFRFU1RfQ1JDOwogCQlpZ3Rfc3VidGVzdF9mKCJwaXBlLSVzLWNyYy1z cHJpdGUtcGxhbmVzLWJhc2ljIiwgcGlwZV9uYW1lKSB7CisJCQlpbnQgdmFsaWRfdGVzdHMgPSAw OwogCiAJCQlpZ3RfZGlzcGxheV9yZXF1aXJlX291dHB1dF9vbl9waXBlKCZkYXRhLmRpc3BsYXks IGRhdGEucGlwZSk7CiAKIAkJCWZvcl9lYWNoX3BsYW5lX29uX3BpcGUoJmRhdGEuZGlzcGxheSwg ZGF0YS5waXBlLCBkYXRhLnBsYW5lKSB7CiAJCQkJaWYgKGRhdGEucGxhbmUtPnR5cGUgPT0gRFJN X1BMQU5FX1RZUEVfUFJJTUFSWSkKIAkJCQkJY29udGludWU7Ci0JCQkJc3ByaXRlX2lkeCsrOwot CQkJCQl0ZXN0X291dHB1dCgmZGF0YSk7CisJCQkJdmFsaWRfdGVzdHMgKz0gdGVzdF9vdXRwdXQo JmRhdGEpOwogCQkJfQorCisJCQlpZ3RfcmVxdWlyZSh2YWxpZF90ZXN0cyk7CiAJCX0KIAogCQlk YXRhLnBsYW5lID0gTlVMTDsKIAogCQlkYXRhLmZsYWdzID0gVEVTVF9OT19BVVhfQlVGRkVSOwog CQlpZ3Rfc3VidGVzdF9mKCJwaXBlLSVzLW1pc3NpbmctY2NzLWJ1ZmZlciIsIHBpcGVfbmFtZSkK LQkJCXRlc3Rfb3V0cHV0KCZkYXRhKTsKKwkJCWlndF9yZXF1aXJlKHRlc3Rfb3V0cHV0KCZkYXRh KSk7CiAKIAkJZGF0YS5mbGFncyA9IFRFU1RfQkFEX0NDU19IQU5ETEU7CiAJCWlndF9zdWJ0ZXN0 X2YoInBpcGUtJXMtY2NzLW9uLWFub3RoZXItYm8iLCBwaXBlX25hbWUpCi0JCQl0ZXN0X291dHB1 dCgmZGF0YSk7CisJCQlpZ3RfcmVxdWlyZSh0ZXN0X291dHB1dCgmZGF0YSkpOwogCiAJCWRhdGEu ZmxhZ3MgPSBURVNUX0JBRF9BVVhfU1RSSURFOwogCQlpZ3Rfc3VidGVzdF9mKCJwaXBlLSVzLWJh ZC1hdXgtc3RyaWRlIiwgcGlwZV9uYW1lKQotCQkJdGVzdF9vdXRwdXQoJmRhdGEpOworCQkJaWd0 X3JlcXVpcmUodGVzdF9vdXRwdXQoJmRhdGEpKTsKIAl9CiAKIAlpZ3RfZml4dHVyZQotLSAKMi4x My42CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwppZ3Qt ZGV2IG1haWxpbmcgbGlzdAppZ3QtZGV2QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xp c3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2lndC1kZXYK