From: Maarten Lankhorst Subject: [PATCH i-g-t] tests/kms_cursor_legacy: Rework the 2x tests. Date: Thu, 16 Nov 2017 13:45:14 +0100 Message-ID: <20171116124514.4617-1-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mblankhorst.nl (mblankhorst.nl [IPv6:2a02:2308::216:3eff:fe92:dfa3]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4C2686E1D1 for ; Thu, 16 Nov 2017 12:45:20 +0000 (UTC) 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 SW5zdGVhZCBvZiBzdHJpY3RseSBtZWFzdXJpbmcgdmJsYW5rcywgd2UgdHJ5IHRvIHNlZSBpZiBh IHBhZ2UgZmxpcAppcyBxdWV1ZWQgb24gdGhlIG5leHQgdmJsYW5rIGlmIHdlIHJ1biBsZWdhY3kg Y3Vyc29yIHVwZGF0ZXMgdG8gdGhlCnBpcGUgYW5kIGFub3RoZXIgcGlwZSBpbiB0aGUgYmFja2dy b3VuZC4KClNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3Jz dEBsaW51eC5pbnRlbC5jb20+CkJ1Z3ppbGxhOiBodHRwczovL2J1Z3MuZnJlZWRlc2t0b3Aub3Jn L3Nob3dfYnVnLmNnaT9pZD0xMDE2MzQKLS0tCiB0ZXN0cy9rbXNfY3Vyc29yX2xlZ2FjeS5jIHwg OTAgKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmls ZSBjaGFuZ2VkLCA1NCBpbnNlcnRpb25zKCspLCAzNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQg YS90ZXN0cy9rbXNfY3Vyc29yX2xlZ2FjeS5jIGIvdGVzdHMva21zX2N1cnNvcl9sZWdhY3kuYwpp bmRleCA1NzIwZGJlZjkwZDMuLmI4YjE1YjYwOWQ3ZiAxMDA2NDQKLS0tIGEvdGVzdHMva21zX2N1 cnNvcl9sZWdhY3kuYworKysgYi90ZXN0cy9rbXNfY3Vyc29yX2xlZ2FjeS5jCkBAIC04ODQsMTQg Kzg4NCwyMyBAQCBjbGVhbnVwOgogCiBzdGF0aWMgdm9pZCB0d29fc2NyZWVuc19mbGlwX3ZzX2N1 cnNvcihpZ3RfZGlzcGxheV90ICpkaXNwbGF5LCBpbnQgbmxvb3BzLCBib29sIG1vZGVzZXQsIGJv b2wgYXRvbWljKQogewotCXN0cnVjdCBkcm1fbW9kZV9jdXJzb3IgYXJnWzJdLCBhcmcyWzJdOwot CXN0cnVjdCBkcm1fZXZlbnRfdmJsYW5rIHZibDsKKwlzdHJ1Y3QgZHJtX21vZGVfY3Vyc29yIGFy ZzFbMl0sIGFyZzJbMl07CiAJc3RydWN0IGlndF9mYiBmYl9pbmZvLCBmYjJfaW5mbywgY3Vyc29y X2ZiOwotCXVuc2lnbmVkIHZibGFua19zdGFydDsKIAllbnVtIHBpcGUgcGlwZSA9IGZpbmRfY29u bmVjdGVkX3BpcGUoZGlzcGxheSwgZmFsc2UpOwogCWVudW0gcGlwZSBwaXBlMiA9IGZpbmRfY29u bmVjdGVkX3BpcGUoZGlzcGxheSwgdHJ1ZSk7CiAJaWd0X291dHB1dF90ICpvdXRwdXQsICpvdXRw dXQyOwogCWJvb2wgc2tpcF90ZXN0ID0gZmFsc2U7CisJdm9sYXRpbGUgdW5zaWduZWQgbG9uZyAq c2hhcmVkOworCisJaWYgKG1vZGVzZXQpIHsKKwkJdWludDY0X3QgdmFsOworCisJCWlndF9mYWls X29uKCFhdG9taWMpOworCQlpZ3RfYXNzZXJ0KGRybUdldENhcChkaXNwbGF5LT5kcm1fZmQsIERS TV9DQVBfQ1JUQ19JTl9WQkxBTktfRVZFTlQsICZ2YWwpID09IDApOworCX0KKworCXNoYXJlZCA9 IG1tYXAoTlVMTCwgNDA5NiwgUFJPVF9XUklURSwgTUFQX1NIQVJFRCB8IE1BUF9BTk9OLCAtMSwg MCk7CisJaWd0X2Fzc2VydChzaGFyZWQgIT0gTUFQX0ZBSUxFRCk7CiAKIAlpZ3RfZmFpbF9vbiht b2Rlc2V0ICYmICFhdG9taWMpOwogCkBAIC05MDMsOSArOTEyLDkgQEAgc3RhdGljIHZvaWQgdHdv X3NjcmVlbnNfZmxpcF92c19jdXJzb3IoaWd0X2Rpc3BsYXlfdCAqZGlzcGxheSwgaW50IG5sb29w cywgYm9vbAogCiAJaWd0X2NyZWF0ZV9jb2xvcl9mYihkaXNwbGF5LT5kcm1fZmQsIDY0LCA2NCwg RFJNX0ZPUk1BVF9BUkdCODg4OCwgMCwgMS4sIDEuLCAxLiwgJmN1cnNvcl9mYik7CiAJc2V0X2N1 cnNvcl9vbl9waXBlKGRpc3BsYXksIHBpcGUsICZjdXJzb3JfZmIpOwotCXBvcHVsYXRlX2N1cnNv cl9hcmdzKGRpc3BsYXksIHBpcGUsIGFyZywgJmN1cnNvcl9mYik7CisJcG9wdWxhdGVfY3Vyc29y X2FyZ3MoZGlzcGxheSwgcGlwZSwgYXJnMSwgJmN1cnNvcl9mYik7CiAKLQlhcmdbMV0ueCA9IGFy Z1sxXS55ID0gMTkyOworCWFyZzFbMV0ueCA9IGFyZzFbMV0ueSA9IDE5MjsKIAogCXNldF9jdXJz b3Jfb25fcGlwZShkaXNwbGF5LCBwaXBlMiwgJmN1cnNvcl9mYik7CiAJcG9wdWxhdGVfY3Vyc29y X2FyZ3MoZGlzcGxheSwgcGlwZTIsIGFyZzIsICZjdXJzb3JfZmIpOwpAQCAtOTE3LDI5ICs5MjYs MjkgQEAgc3RhdGljIHZvaWQgdHdvX3NjcmVlbnNfZmxpcF92c19jdXJzb3IoaWd0X2Rpc3BsYXlf dCAqZGlzcGxheSwgaW50IG5sb29wcywgYm9vbAogCiAJaWd0X2Rpc3BsYXlfY29tbWl0MihkaXNw bGF5LCBkaXNwbGF5LT5pc19hdG9taWMgPyBDT01NSVRfQVRPTUlDIDogQ09NTUlUX0xFR0FDWSk7 CiAKLQl2Ymxhbmtfc3RhcnQgPSBnZXRfdmJsYW5rKGRpc3BsYXktPmRybV9mZCwgcGlwZSwgRFJN X1ZCTEFOS19ORVhUT05NSVNTKTsKLQlpZ3RfYXNzZXJ0X2VxKGdldF92YmxhbmsoZGlzcGxheS0+ ZHJtX2ZkLCBwaXBlLCAwKSwgdmJsYW5rX3N0YXJ0KTsKLQlkb19pb2N0bChkaXNwbGF5LT5kcm1f ZmQsIERSTV9JT0NUTF9NT0RFX0NVUlNPUiwgJmFyZ1swXSk7Ci0JZG9faW9jdGwoZGlzcGxheS0+ ZHJtX2ZkLCBEUk1fSU9DVExfTU9ERV9DVVJTT1IsICZhcmcyWzBdKTsKLQlpZ3RfYXNzZXJ0X2Vx KGdldF92YmxhbmsoZGlzcGxheS0+ZHJtX2ZkLCBwaXBlLCAwKSwgdmJsYW5rX3N0YXJ0KTsKKwlp Z3RfZm9yayhjaGlsZCwgMikgeworCQlzdHJ1Y3QgZHJtX21vZGVfY3Vyc29yICphcmcgPSBjaGls ZCA/IGFyZzIgOiBhcmcxOworCisJCXdoaWxlICghc2hhcmVkWzBdKQorCQkJZG9faW9jdGwoZGlz cGxheS0+ZHJtX2ZkLCBEUk1fSU9DVExfTU9ERV9DVVJTT1IsCisJCQkJICZhcmdbIXNoYXJlZFsx XV0pOworCX0KIAogCXdoaWxlIChubG9vcHMtLSkgewotCQkvKiBTdGFydCB3aXRoIGEgc3luY2hy b25vdXMgcXVlcnkgdG8gYWxpZ24gd2l0aCB0aGUgdmJsYW5rICovCi0JCXZibGFua19zdGFydCA9 IGdldF92YmxhbmsoZGlzcGxheS0+ZHJtX2ZkLCBwaXBlLCBEUk1fVkJMQU5LX05FWFRPTk1JU1Mp OwotCQlkb19pb2N0bChkaXNwbGF5LT5kcm1fZmQsIERSTV9JT0NUTF9NT0RFX0NVUlNPUiwgJmFy Z1tubG9vcHMgJiAxXSk7CisJCXVuc2lnbmVkIHZibGFua19zdGFydCA9CisJCQlnZXRfdmJsYW5r KGRpc3BsYXktPmRybV9mZCwgcGlwZSwgRFJNX1ZCTEFOS19ORVhUT05NSVNTKTsKKworCQlzaGFy ZWRbMV0gPSBubG9vcHMgJiAxOworCisJCWlmICghbW9kZXNldCkgeworCQkJZmxpcF9ub25ibG9j a2luZyhkaXNwbGF5LCBwaXBlLCBhdG9taWMsICZmYl9pbmZvKTsKKwkJfSBlbHNlIHsKKwkJCXVu c2lnbmVkIGZsYWdzID0gRFJNX01PREVfQVRPTUlDX0FMTE9XX01PREVTRVQ7CisJCQlmbGFncyB8 PSBEUk1fTU9ERV9BVE9NSUNfTk9OQkxPQ0sgfCBEUk1fTU9ERV9QQUdFX0ZMSVBfRVZFTlQ7CiAK LQkJaWYgKCFtb2Rlc2V0KQotCQkJZmxpcF9ub25ibG9ja2luZyhkaXNwbGF5LCBwaXBlLCBmYWxz ZSwgJmZiX2luZm8pOwotCQllbHNlIHsKIAkJCS8qCi0JCQkgKiBUaGVyZSBhcmUgMiBkZXNpZ24g aXNzdWVzIHRoYXQgcHJldmVudCB1cyBmcm9tIGRvaW5nCi0JCQkgKiB0aGUgdGVzdCB3ZSB3b3Vs ZCBsaWtlIGhlcmU6Ci0JCQkgKgotCQkJICogLSBkcm1fZXZlbnRfdmJsYW5rIGRvZXNuJ3Qgc2V0 IGNydGNfaWQsIHNvIGlmIHdlCi0JCQkgKiAgIHVzZSBldmVudHMgd2UgZG9uJ3Qga25vdyB3aGlj aCBwaXBlIGZpcmVkIHRoZSBldmVudCwKLQkJCSAqICAgbm8gd2F5IHRvIGRpc3Rpbmd1aXNoLgot CQkJICogLSBEb2luZyBhIG1vZGVzZXQgbWF5IGFkZCB1bnJlbGF0ZWQgcGlwZXMsIGFuZCBmYWls IHdpdGgKLQkJCSAqICAgLUVCVVNZIGlmIGEgcGFnZSBmbGlwIGlzIHF1ZXVlZCBvbiBvbmUgb2Yg dGhvc2UuCisJCQkgKiBEb2luZyBhIG1vZGVzZXQgbWF5IGFkZCB1bnJlbGF0ZWQgcGlwZXMsIGFu ZCBmYWlsIHdpdGgKKwkJCSAqIC1FQlVTWSBpZiBhIHBhZ2UgZmxpcCBpcyBxdWV1ZWQgb24gb25l IG9mIHRob3NlLgogCQkJICoKIAkJCSAqIFdvcmsgYXJvdW5kIGl0IGJ5IG5vdCBzZXR0aW5nIGFu IGV2ZW50LCBidXQgZG9pbmcgYSBzeW5jaHJvbm91cwogCQkJICogY29tbWl0IHRvIHdhaXQgZm9y IGNvbXBsZXRpb24sIGFuZCBxdWV1ZSB0aGUgcGFnZSBmbGlwIGFuZCBtb2Rlc2V0CkBAIC05NDgs MjYgKzk1NywzMiBAQCBzdGF0aWMgdm9pZCB0d29fc2NyZWVuc19mbGlwX3ZzX2N1cnNvcihpZ3Rf ZGlzcGxheV90ICpkaXNwbGF5LCBpbnQgbmxvb3BzLCBib29sCiAKIAkJCWlndF9wbGFuZV9zZXRf ZmIoaWd0X291dHB1dF9nZXRfcGxhbmVfdHlwZShvdXRwdXQsIERSTV9QTEFORV9UWVBFX1BSSU1B UlkpLCAmZmJfaW5mbyk7CiAJCQlpZ3Rfb3V0cHV0X3NldF9waXBlKG91dHB1dDIsIChubG9vcHMg JiAxKSA/IFBJUEVfTk9ORSA6IHBpcGUyKTsKLQkJCWlndF9kaXNwbGF5X2NvbW1pdF9hdG9taWMo ZGlzcGxheSwgRFJNX01PREVfQVRPTUlDX0FMTE9XX01PREVTRVQgfCBEUk1fTU9ERV9BVE9NSUNf Tk9OQkxPQ0ssIE5VTEwpOworCQkJaWd0X2Rpc3BsYXlfY29tbWl0X2F0b21pYyhkaXNwbGF5LCBm bGFncywgTlVMTCk7CiAJCX0KIAotCQlpZ3RfYXNzZXJ0X2VxKGdldF92YmxhbmsoZGlzcGxheS0+ ZHJtX2ZkLCBwaXBlLCAwKSwgdmJsYW5rX3N0YXJ0KTsKLQotCQlkb19pb2N0bChkaXNwbGF5LT5k cm1fZmQsIERSTV9JT0NUTF9NT0RFX0NVUlNPUiwgJmFyZ1tubG9vcHMgJiAxXSk7CiAJCWlmICgh bW9kZXNldCkgewotCQkJZG9faW9jdGwoZGlzcGxheS0+ZHJtX2ZkLCBEUk1fSU9DVExfTU9ERV9D VVJTT1IsICZhcmcyW25sb29wcyAmIDFdKTsKLQkJCWRvX2lvY3RsKGRpc3BsYXktPmRybV9mZCwg RFJNX0lPQ1RMX01PREVfQ1VSU09SLCAmYXJnW25sb29wcyAmIDFdKTsKLQkJCWRvX2lvY3RsKGRp c3BsYXktPmRybV9mZCwgRFJNX0lPQ1RMX01PREVfQ1VSU09SLCAmYXJnMltubG9vcHMgJiAxXSk7 Ci0KLQkJCWlndF9hc3NlcnRfZXEoZ2V0X3ZibGFuayhkaXNwbGF5LT5kcm1fZmQsIHBpcGUsIDAp LCB2Ymxhbmtfc3RhcnQpOworCQkJc3RydWN0IGRybV9ldmVudF92YmxhbmsgdmJsOwogCiAJCQlp Z3Rfc2V0X3RpbWVvdXQoMSwgIlN0dWNrIHBhZ2UgZmxpcCIpOworCiAJCQlpZ3RfaWdub3JlX3dh cm4ocmVhZChkaXNwbGF5LT5kcm1fZmQsICZ2YmwsIHNpemVvZih2YmwpKSk7Ci0JCQlpZ3RfYXNz ZXJ0X2VxKGdldF92YmxhbmsoZGlzcGxheS0+ZHJtX2ZkLCBwaXBlLCAwKSwgdmJsYW5rX3N0YXJ0 ICsgMSk7Ci0JCQlpZ3RfcmVzZXRfdGltZW91dCgpOworCQkJaWd0X2Fzc2VydCh2YmwuY3J0Y19p ZCA9PSBkaXNwbGF5LT5waXBlc1twaXBlXS5jcnRjX2lkKTsKKwkJCWlndF9hc3NlcnQodmJsLnNl cXVlbmNlID09IHZibGFua19zdGFydCArIDEpOwogCQl9IGVsc2UgewotCQkJZG9faW9jdGwoZGlz cGxheS0+ZHJtX2ZkLCBEUk1fSU9DVExfTU9ERV9DVVJTT1IsICZhcmcyW25sb29wcyAmIDFdKTsK KwkJCXN0cnVjdCBkcm1fZXZlbnRfdmJsYW5rIHZibCwgdmJsMjsKKworCQkJaWd0X3NldF90aW1l b3V0KDM1LCAiU3R1Y2sgbm9uYmxvY2tpbmcgbW9kZXNldCIpOworCisJCQlpZ3RfaWdub3JlX3dh cm4ocmVhZChkaXNwbGF5LT5kcm1fZmQsICZ2YmwsIHNpemVvZih2YmwpKSk7CisJCQlpZ3RfaWdu b3JlX3dhcm4ocmVhZChkaXNwbGF5LT5kcm1fZmQsICZ2YmwyLCBzaXplb2YodmJsMikpKTsKKwor CQkJaWd0X2Fzc2VydCh2YmwuY3J0Y19pZCAhPSB2YmwyLmNydGNfaWQpOworCQkJaWd0X2Fzc2Vy dCh2YmwuY3J0Y19pZCA9PSBkaXNwbGF5LT5waXBlc1twaXBlXS5jcnRjX2lkIHx8CisJCQkJICAg dmJsLmNydGNfaWQgPT0gZGlzcGxheS0+cGlwZXNbcGlwZTJdLmNydGNfaWQpOworCQkJaWd0X2Fz c2VydCh2YmwyLmNydGNfaWQgPT0gZGlzcGxheS0+cGlwZXNbcGlwZV0uY3J0Y19pZCB8fAorCQkJ CSAgIHZibDIuY3J0Y19pZCA9PSBkaXNwbGF5LT5waXBlc1twaXBlMl0uY3J0Y19pZCk7CiAJCX0K KwkJaWd0X3Jlc2V0X3RpbWVvdXQoKTsKIAogCQlpZiAobW9kZXNldCkgewogCQkJLyogd2FpdCBm b3IgcGVuZGluZyBtb2Rlc2V0IGFuZCBwYWdlIGZsaXAgdG8gY29tcGxldGUsIHRvIHByZXZlbnQg LUVCVVNZICovCkBAIC05NzcsNiArOTkyLDkgQEAgc3RhdGljIHZvaWQgdHdvX3NjcmVlbnNfZmxp cF92c19jdXJzb3IoaWd0X2Rpc3BsYXlfdCAqZGlzcGxheSwgaW50IG5sb29wcywgYm9vbAogCQl9 CiAJfQogCisJc2hhcmVkWzBdID0gMTsKKwlpZ3Rfd2FpdGNoaWxkcmVuKCk7CisKIGNsZWFudXA6 CiAJZG9fY2xlYW51cF9kaXNwbGF5KGRpc3BsYXkpOwogCWlndF9yZW1vdmVfZmIoZGlzcGxheS0+ ZHJtX2ZkLCAmZmJfaW5mbyk7Ci0tIAoyLjE1LjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxp c3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFu L2xpc3RpbmZvL2ludGVsLWdmeAo=