From: Daniel Stone Subject: [PATCH i-g-t 2/8] tests/kms_ccs: Split FB generation into helper Date: Tue, 8 Aug 2017 17:16:39 +0100 Message-ID: <20170808161645.25329-2-daniels@collabora.com> References: <20170808161645.25329-1-daniels@collabora.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [46.235.227.227]) by gabe.freedesktop.org (Postfix) with ESMTPS id 561716E1A9 for ; Tue, 8 Aug 2017 16:16:52 +0000 (UTC) In-Reply-To: <20170808161645.25329-1-daniels@collabora.com> 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 Cc: daniel.vetter@ffwll.ch List-Id: intel-gfx@lists.freedesktop.org Q3JlYXRlIGEgbmV3IGhlbHBlciBmb3IgZ2VuZXJhdGluZyBhbmQgcmVuZGVyaW5nIHRoZSBmcmFt ZWJ1ZmZlciwgcmF0aGVyCnRoYW4gZG9pbmcgaXQgaW5saW5lIHdpdGggYXBwbHlpbmcgdGhlIGNv bmZpZ3VyYXRpb24uIFRoaXMgd2lsbCBiZSB1c2VkCmxhdGVyIHRvIGdlbmVyYXRlIGEgZGlmZmVy ZW50IHBsYW5lIGNvbmZpZ3VyYXRpb24uCgpTaWduZWQtb2ZmLWJ5OiBEYW5pZWwgU3RvbmUgPGRh bmllbHNAY29sbGFib3JhLmNvbT4KLS0tCiB0ZXN0cy9rbXNfY2NzLmMgfCA3MyArKysrKysrKysr KysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBj aGFuZ2VkLCAzOSBpbnNlcnRpb25zKCspLCAzNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS90 ZXN0cy9rbXNfY2NzLmMgYi90ZXN0cy9rbXNfY2NzLmMKaW5kZXggMTRkMjNhYzEuLmNkYzU2Zjc5 IDEwMDY0NAotLS0gYS90ZXN0cy9rbXNfY2NzLmMKKysrIGIvdGVzdHMva21zX2Njcy5jCkBAIC01 NywxOCArNTcsMTUgQEAgdHlwZWRlZiBzdHJ1Y3QgewogCiAjZGVmaW5lIFJFRAkJCTB4MDBmZjAw MDAKIAotc3RhdGljIHZvaWQgcmVuZGVyX2ZiKGRhdGFfdCAqZGF0YSwgZW51bSB0ZXN0X2ZiX2Zs YWdzIGZiX2ZsYWdzLAorc3RhdGljIHZvaWQgcmVuZGVyX2ZiKGRhdGFfdCAqZGF0YSwgdWludDMy X3QgZ2VtX2hhbmRsZSwgdW5zaWduZWQgaW50IHNpemUsCisJCSAgICAgIGVudW0gdGVzdF9mYl9m bGFncyBmYl9mbGFncywKIAkJICAgICAgaW50IGhlaWdodCwgdW5zaWduZWQgaW50IHN0cmlkZSkK IHsKLQlzdHJ1Y3QgaWd0X2ZiICpmYiA9ICZkYXRhLT5mYjsKIAl1aW50MzJfdCAqcHRyOwogCXVu c2lnbmVkIGludCBoYWxmX2hlaWdodCwgaGFsZl9zaXplOwogCWludCBpOwogCi0JaWd0X2Fzc2Vy dChmYi0+ZmJfaWQpOwotCi0JcHRyID0gZ2VtX21tYXBfX2NwdShkYXRhLT5kcm1fZmQsIGZiLT5n ZW1faGFuZGxlLAotCQkJICAgIDAsIGZiLT5zaXplLAorCXB0ciA9IGdlbV9tbWFwX19jcHUoZGF0 YS0+ZHJtX2ZkLCBnZW1faGFuZGxlLCAwLCBzaXplLAogCQkJICAgIFBST1RfUkVBRCB8IFBST1Rf V1JJVEUpOwogCiAJaWYgKGZiX2ZsYWdzICYgRkJfQ09NUFJFU1NFRCkgewpAQCAtODQsMTggKzgx LDE4IEBAIHN0YXRpYyB2b2lkIHJlbmRlcl9mYihkYXRhX3QgKmRhdGEsIGVudW0gdGVzdF9mYl9m bGFncyBmYl9mbGFncywKIAkJICovCiAJCWhhbGZfaGVpZ2h0ID0gQUxJR04oaGVpZ2h0LCAxMjgp IC8gMjsKIAkJaGFsZl9zaXplID0gaGFsZl9oZWlnaHQgKiBzdHJpZGU7Ci0JCWZvciAoaSA9IDA7 IGkgPCBmYi0+c2l6ZSAvIDQ7IGkrKykgeworCQlmb3IgKGkgPSAwOyBpIDwgc2l6ZSAvIDQ7IGkr KykgewogCQkJaWYgKGkgPCBoYWxmX3NpemUgLyA0KQogCQkJCXB0cltpXSA9IFJFRDsKIAkJCWVs c2UKIAkJCQlwdHJbaV0gPSBDT01QUkVTU0VEX1JFRDsKIAkJfQogCX0gZWxzZSB7Ci0JCWZvciAo aSA9IDA7IGkgPCBmYi0+c2l6ZSAvIDQ7IGkrKykKKwkJZm9yIChpID0gMDsgaSA8IHNpemUgLyA0 OyBpKyspCiAJCQlwdHJbaV0gPSBSRUQ7CiAJfQogCi0JbXVubWFwKHB0ciwgZmItPnNpemUpOwor CW11bm1hcChwdHIsIHNpemUpOwogfQogCiBzdGF0aWMgdW5zaWduZWQgaW50CkBAIC0xMTgsOCAr MTE1LDcgQEAgc3RhdGljIHZvaWQgcmVuZGVyX2NjcyhkYXRhX3QgKmRhdGEsIHVpbnQzMl90IGdl bV9oYW5kbGUsCiAJaGFsZl9oZWlnaHQgPSBBTElHTihoZWlnaHQsIDEyOCkgLyAyOwogCWNjc19o YWxmX2hlaWdodCA9IGhhbGZfaGVpZ2h0IC8gMTY7CiAKLQlwdHIgPSBnZW1fbW1hcF9fY3B1KGRh dGEtPmRybV9mZCwgZ2VtX2hhbmRsZSwKLQkJCSAgICBvZmZzZXQsIHNpemUsCisJcHRyID0gZ2Vt X21tYXBfX2NwdShkYXRhLT5kcm1fZmQsIGdlbV9oYW5kbGUsIG9mZnNldCwgc2l6ZSwKIAkJCSAg ICBQUk9UX1JFQUQgfCBQUk9UX1dSSVRFKTsKIAogCWZvciAoaSA9IDA7IGkgPCBzaXplOyBpKysp IHsKQEAgLTEzMiwzMiArMTI4LDIzIEBAIHN0YXRpYyB2b2lkIHJlbmRlcl9jY3MoZGF0YV90ICpk YXRhLCB1aW50MzJfdCBnZW1faGFuZGxlLAogCW11bm1hcChwdHIsIHNpemUpOwogfQogCi1zdGF0 aWMgdm9pZCBkaXNwbGF5X2ZiKGRhdGFfdCAqZGF0YSwgZW51bSB0ZXN0X2ZiX2ZsYWdzIGZiX2Zs YWdzKQorc3RhdGljIHZvaWQgZ2VuZXJhdGVfZmIoZGF0YV90ICpkYXRhLCBzdHJ1Y3QgaWd0X2Zi ICpmYiwKKwkJCWludCB3aWR0aCwgaW50IGhlaWdodCwKKwkJCWVudW0gdGVzdF9mYl9mbGFncyBm Yl9mbGFncykKIHsKIAlzdHJ1Y3QgbG9jYWxfZHJtX21vZGVfZmJfY21kMiBmID0ge307Ci0Jc3Ry dWN0IGlndF9mYiAqZmIgPSAmZGF0YS0+ZmI7Ci0JaWd0X2Rpc3BsYXlfdCAqZGlzcGxheSA9ICZk YXRhLT5kaXNwbGF5OwotCWlndF9wbGFuZV90ICpwcmltYXJ5OwotCWRybU1vZGVNb2RlSW5mbyAq bW9kZTsKLQl1bnNpZ25lZCBpbnQgd2lkdGgsIGhlaWdodDsKIAl1bnNpZ25lZCBpbnQgc2l6ZVsy XTsKIAl1aW50NjRfdCBtb2RpZmllcjsKLQllbnVtIGlndF9jb21taXRfc3R5bGUgY29tbWl0ID0g Q09NTUlUX1VOSVZFUlNBTDsKIAlpbnQgcmV0OwogCi0JaWYgKGRhdGEtPmRpc3BsYXkuaXNfYXRv bWljKQotCQljb21taXQgPSBDT01NSVRfQVRPTUlDOwotCi0JbW9kZSA9IGlndF9vdXRwdXRfZ2V0 X21vZGUoZGF0YS0+b3V0cHV0KTsKLQogCWlmIChmYl9mbGFncyAmIEZCX0NPTVBSRVNTRUQpCiAJ CW1vZGlmaWVyID0gTE9DQUxfSTkxNV9GT1JNQVRfTU9EX1lfVElMRURfQ0NTOwogCWVsc2UKIAkJ bW9kaWZpZXIgPSBMT0NBTF9JOTE1X0ZPUk1BVF9NT0RfWV9USUxFRDsKIAogCWYuZmxhZ3MgPSBM T0NBTF9EUk1fTU9ERV9GQl9NT0RJRklFUlM7Ci0JZi53aWR0aCA9IEFMSUdOKG1vZGUtPmhkaXNw bGF5LCAxNik7Ci0JZi5oZWlnaHQgPSBBTElHTihtb2RlLT52ZGlzcGxheSwgOCk7CisJZi53aWR0 aCA9IEFMSUdOKHdpZHRoLCAxNik7CisJZi5oZWlnaHQgPSBBTElHTihoZWlnaHQsIDgpOwogCiAJ aWYgKGRhdGEtPmZsYWdzICYgVEVTVF9CQURfUElYRUxfRk9STUFUKQogCQlmLnBpeGVsX2Zvcm1h dCA9IERSTV9GT1JNQVRfUkdCNTY1OwpAQCAtMTk1LDkgKzE4MiwxMyBAQCBzdGF0aWMgdm9pZCBk aXNwbGF5X2ZiKGRhdGFfdCAqZGF0YSwgZW51bSB0ZXN0X2ZiX2ZsYWdzIGZiX2ZsYWdzKQogCiAJ CWYuaGFuZGxlc1swXSA9IGdlbV9jcmVhdGUoZGF0YS0+ZHJtX2ZkLCBzaXplWzBdICsgc2l6ZVsx XSk7CiAJCWYuaGFuZGxlc1sxXSA9IGYuaGFuZGxlc1swXTsKKwkJcmVuZGVyX2NjcyhkYXRhLCBm LmhhbmRsZXNbMV0sIGYub2Zmc2V0c1sxXSwgc2l6ZVsxXSwKKwkJCSAgIGhlaWdodCwgZi5waXRj aGVzWzFdKTsKIAl9IGVsc2UKIAkJZi5oYW5kbGVzWzBdID0gZ2VtX2NyZWF0ZShkYXRhLT5kcm1f ZmQsIHNpemVbMF0pOwogCisJcmVuZGVyX2ZiKGRhdGEsIGYuaGFuZGxlc1swXSwgc2l6ZVswXSwg ZmJfZmxhZ3MsIGhlaWdodCwgZi5waXRjaGVzWzBdKTsKKwogCXJldCA9IGRybUlvY3RsKGRhdGEt PmRybV9mZCwgTE9DQUxfRFJNX0lPQ1RMX01PREVfQURERkIyLCAmZik7CiAJaWYgKGRhdGEtPmZs YWdzICYgVEVTVF9CQURfUElYRUxfRk9STUFUKSB7CiAJCWlndF9hc3NlcnRfZXEocmV0LCAtMSk7 CkBAIC0yMTgsMTUgKzIwOSwzMCBAQCBzdGF0aWMgdm9pZCBkaXNwbGF5X2ZiKGRhdGFfdCAqZGF0 YSwgZW51bSB0ZXN0X2ZiX2ZsYWdzIGZiX2ZsYWdzKQogCWZiLT5zaXplID0gc2l6ZVswXTsKIAlm Yi0+Y2Fpcm9fc3VyZmFjZSA9IE5VTEw7CiAJZmItPmRvbWFpbiA9IDA7Cit9CisKK3N0YXRpYyB2 b2lkIHRyeV9jb25maWcoZGF0YV90ICpkYXRhLCBlbnVtIHRlc3RfZmJfZmxhZ3MgZmJfZmxhZ3Mp Cit7CisJaWd0X2Rpc3BsYXlfdCAqZGlzcGxheSA9ICZkYXRhLT5kaXNwbGF5OworCWlndF9wbGFu ZV90ICpwcmltYXJ5OworCWRybU1vZGVNb2RlSW5mbyAqZHJtX21vZGUgPSBpZ3Rfb3V0cHV0X2dl dF9tb2RlKGRhdGEtPm91dHB1dCk7CisJZW51bSBpZ3RfY29tbWl0X3N0eWxlIGNvbW1pdDsKKwlp bnQgcmV0OwogCi0JcmVuZGVyX2ZiKGRhdGEsIGZiX2ZsYWdzLCBmLmhlaWdodCwgZi5waXRjaGVz WzBdKTsKKwlpZiAoZGF0YS0+ZGlzcGxheS5pc19hdG9taWMpCisJCWNvbW1pdCA9IENPTU1JVF9B VE9NSUM7CisJZWxzZQorCQljb21taXQgPSBDT01NSVRfVU5JVkVSU0FMOwogCi0JaWYgKGZiX2Zs YWdzICYgRkJfQ09NUFJFU1NFRCkKLQkJcmVuZGVyX2NjcyhkYXRhLCBmLmhhbmRsZXNbMF0sIGYu b2Zmc2V0c1sxXSwgc2l6ZVsxXSwKLQkJCSAgIGYuaGVpZ2h0LCBmLnBpdGNoZXNbMV0pOworCWdl bmVyYXRlX2ZiKGRhdGEsICZkYXRhLT5mYiwgZHJtX21vZGUtPmhkaXNwbGF5LCBkcm1fbW9kZS0+ dmRpc3BsYXksCisJCSAgICBmYl9mbGFncyk7CisJaWYgKGRhdGEtPmZsYWdzICYgVEVTVF9CQURf UElYRUxfRk9STUFUKQorCQlyZXR1cm47CiAKIAlwcmltYXJ5ID0gaWd0X291dHB1dF9nZXRfcGxh bmVfdHlwZShkYXRhLT5vdXRwdXQsIERSTV9QTEFORV9UWVBFX1BSSU1BUlkpOwotCWlndF9wbGFu ZV9zZXRfZmIocHJpbWFyeSwgZmIpOworCWlndF9wbGFuZV9zZXRfcG9zaXRpb24ocHJpbWFyeSwg MCwgMCk7CisJaWd0X3BsYW5lX3NldF9zaXplKHByaW1hcnksIGRybV9tb2RlLT5oZGlzcGxheSwg ZHJtX21vZGUtPnZkaXNwbGF5KTsKKwlpZ3RfcGxhbmVfc2V0X2ZiKHByaW1hcnksICZkYXRhLT5m Yik7CiAKIAlpZiAoZGF0YS0+ZmxhZ3MgJiBURVNUX1JPVEFURV8xODApCiAJCWlndF9wbGFuZV9z ZXRfcm90YXRpb24ocHJpbWFyeSwgSUdUX1JPVEFUSU9OXzE4MCk7CkBAIC0yNTMsMTMgKzI1OSwx MiBAQCBzdGF0aWMgdm9pZCB0ZXN0X291dHB1dChkYXRhX3QgKmRhdGEpCiAJaWd0X291dHB1dF9z ZXRfcGlwZShkYXRhLT5vdXRwdXQsIGRhdGEtPnBpcGUpOwogCiAJaWYgKGRhdGEtPmZsYWdzICYg VEVTVF9DUkMpIHsKLQogCQlwaXBlX2NyYyA9IGlndF9waXBlX2NyY19uZXcoZGF0YS0+ZHJtX2Zk LCBkYXRhLT5waXBlLCBJTlRFTF9QSVBFX0NSQ19TT1VSQ0VfQVVUTyk7CiAKLQkJZGlzcGxheV9m YihkYXRhLCBmYl9mbGFncyB8IEZCX0NPTVBSRVNTRUQpOworCQl0cnlfY29uZmlnKGRhdGEsIGZi X2ZsYWdzIHwgRkJfQ09NUFJFU1NFRCk7CiAJCWlndF9waXBlX2NyY19jb2xsZWN0X2NyYyhwaXBl X2NyYywgJnJlZl9jcmMpOwogCi0JCWRpc3BsYXlfZmIoZGF0YSwgZmJfZmxhZ3MpOworCQl0cnlf Y29uZmlnKGRhdGEsIGZiX2ZsYWdzKTsKIAkJaWd0X3BpcGVfY3JjX2NvbGxlY3RfY3JjKHBpcGVf Y3JjLCAmY3JjKTsKIAogCQlpZ3RfYXNzZXJ0X2NyY19lcXVhbCgmY3JjLCAmcmVmX2NyYyk7CkBA IC0yNzAsNyArMjc1LDcgQEAgc3RhdGljIHZvaWQgdGVzdF9vdXRwdXQoZGF0YV90ICpkYXRhKQog CiAJaWYgKGRhdGEtPmZsYWdzICYgVEVTVF9CQURfUElYRUxfRk9STUFUIHx8CiAJICAgIGRhdGEt PmZsYWdzICYgVEVTVF9CQURfUk9UQVRJT05fOTApIHsKLQkJZGlzcGxheV9mYihkYXRhLCBmYl9m bGFncyB8IEZCX0NPTVBSRVNTRUQpOworCQl0cnlfY29uZmlnKGRhdGEsIGZiX2ZsYWdzIHwgRkJf Q09NUFJFU1NFRCk7CiAJfQogCiAJcHJpbWFyeSA9IGlndF9vdXRwdXRfZ2V0X3BsYW5lX3R5cGUo ZGF0YS0+b3V0cHV0LCBEUk1fUExBTkVfVFlQRV9QUklNQVJZKTsKLS0gCjIuMTMuNAoKX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxp bmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJl ZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==