From: Derek Morton Subject: [PATCH i-g-t v2] tests/core_prop_blob: Fix core_prop_blob for android Date: Wed, 14 Oct 2015 17:23:00 +0100 Message-ID: <1444839780-18694-1-git-send-email-derek.j.morton@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 0C3706E08B for ; Wed, 14 Oct 2015 09:23:26 -0700 (PDT) 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: thomas.wood@intel.com List-Id: intel-gfx@lists.freedesktop.org Y29yZV9wcm9wX2Jsb2Igd2FzIHVzaW5nIGlvY3RscyBub3QgaW4gdGhlIGFuZHJvaWQga2VybmVs LiBBZGRlZCBhCmlndF9yZXF1aXJlX3Byb3BibG9iKCkgZnVuY3Rpb24gYW5kIGxvY2FsIGRlZmlu ZXMvc3RydWN0dXJlcyBzbyB0aGUKdGVzdCB3aWxsIGNvbXBpbGUgYW5kIHNraXAgb24ga2VybmVs cyB3aGVyZSB0aGUgZmVhdHVyZSBpcyB1bnN1cHBvcnRlZC4KCnYyOiBtb3ZlZCBpZ3RfcmVxdWly ZV9wcm9wYmxvYigpIHRvIGNvcmVfcHJvcF9ibG9iLmMgKERhbmllbCBWZXR0ZXIpCk1vdmVkIGdl bV9ibHQuYyB0byBhIHNlcGVyYXRlIHBhdGNoIChUaG9tYXMgV29vZCkKClNpZ25lZC1vZmYtYnk6 IERlcmVrIE1vcnRvbiA8ZGVyZWsuai5tb3J0b25AaW50ZWwuY29tPgotLS0KIHRlc3RzL2NvcmVf cHJvcF9ibG9iLmMgfCA3MSArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKystLS0t LS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDUyIGluc2VydGlvbnMoKyksIDE5IGRlbGV0aW9u cygtKQoKZGlmZiAtLWdpdCBhL3Rlc3RzL2NvcmVfcHJvcF9ibG9iLmMgYi90ZXN0cy9jb3JlX3By b3BfYmxvYi5jCmluZGV4IGQ3MDQxNTguLjRkYzZkN2QgMTAwNjQ0Ci0tLSBhL3Rlc3RzL2NvcmVf cHJvcF9ibG9iLmMKKysrIGIvdGVzdHMvY29yZV9wcm9wX2Jsb2IuYwpAQCAtMjUsMTggKzI1LDM1 IEBACiAgKiAgIERhbmllbCBTdG9uZSA8ZGFuaWVsc0Bjb2xsYWJvcmEuY29tPgogICovCiAKKyNp bmNsdWRlICJpZ3QuaCIKICNpbmNsdWRlIDxlcnJuby5oPgogI2luY2x1ZGUgPHN0ZGJvb2wuaD4K ICNpbmNsdWRlIDxzdGRpby5oPgogI2luY2x1ZGUgPHN0cmluZy5oPgogCi0jaW5jbHVkZSAiZHJt dGVzdC5oIgotI2luY2x1ZGUgImlndF9kZWJ1Z2ZzLmgiCi0jaW5jbHVkZSAiaWd0X2ttcy5oIgot I2luY2x1ZGUgImlndF9hdXguaCIKLQogSUdUX1RFU1RfREVTQ1JJUFRJT04oIlRlc3RzIGJlaGF2 aW91ciBvZiBtYXNzLWRhdGEgJ2Jsb2InIHByb3BlcnRpZXMuIik7CiAKK3N0cnVjdCBsb2NhbF9k cm1fbW9kZV9nZXRfYmxvYiB7CisJdWludDMyX3QgYmxvYl9pZDsKKwl1aW50MzJfdCBsZW5ndGg7 CisJdWludDY0X3QgZGF0YTsKK307CitzdHJ1Y3QgbG9jYWxfZHJtX21vZGVfY3JlYXRlX2Jsb2Ig eworCXVpbnQ2NF90IGRhdGE7CisJdWludDMyX3QgbGVuZ3RoOworCXVpbnQzMl90IGJsb2JfaWQ7 Cit9Oworc3RydWN0IGxvY2FsX2RybV9tb2RlX2Rlc3Ryb3lfYmxvYiB7CisJdWludDMyX3QgYmxv Yl9pZDsKK307CisKKyNkZWZpbmUgTE9DQUxfRFJNX0lPQ1RMX01PREVfR0VUUFJPUEJMT0IJRFJN X0lPV1IoMHhBQywgXAorCQkJCQkJc3RydWN0IGxvY2FsX2RybV9tb2RlX2dldF9ibG9iKQorI2Rl ZmluZSBMT0NBTF9EUk1fSU9DVExfTU9ERV9DUkVBVEVQUk9QQkxPQglEUk1fSU9XUigweEJELCBc CisJCQkJCQlzdHJ1Y3QgbG9jYWxfZHJtX21vZGVfY3JlYXRlX2Jsb2IpCisjZGVmaW5lIExPQ0FM X0RSTV9JT0NUTF9NT0RFX0RFU1RST1lQUk9QQkxPQglEUk1fSU9XUigweEJFLCBcCisJCQkJCQlz dHJ1Y3QgbG9jYWxfZHJtX21vZGVfZGVzdHJveV9ibG9iKQorCiBzdGF0aWMgY29uc3Qgc3RydWN0 IGRybV9tb2RlX21vZGVpbmZvIHRlc3RfbW9kZV92YWxpZCA9IHsKIAkuY2xvY2sgPSAxMjM0LAog CS5oZGlzcGxheSA9IDY0MCwKQEAgLTYxLDIyICs3OCwzNSBAQCBzdGF0aWMgY29uc3Qgc3RydWN0 IGRybV9tb2RlX21vZGVpbmZvIHRlc3RfbW9kZV92YWxpZCA9IHsKIAkJcmV0dXJuIGVycm5vOyBc CiB9CiAKK3N0YXRpYyB2b2lkIGlndF9yZXF1aXJlX3Byb3BibG9iKGludCBmZCkKK3sKKwlzdHJ1 Y3QgbG9jYWxfZHJtX21vZGVfY3JlYXRlX2Jsb2IgYzsKKwlzdHJ1Y3QgbG9jYWxfZHJtX21vZGVf ZGVzdHJveV9ibG9iIGQ7CisJdWludDMyX3QgYmxvYl9kYXRhOworCWMuZGF0YSA9ICZibG9iX2Rh dGE7CisJYy5sZW5ndGggPSBzaXplb2YoYmxvYl9kYXRhKTsKKworCWlndF9yZXF1aXJlKGRybUlv Y3RsKGZkLCBMT0NBTF9EUk1fSU9DVExfTU9ERV9DUkVBVEVQUk9QQkxPQiwgJmMpID09IDApOwor CWQuYmxvYl9pZCA9IGMuYmxvYl9pZDsKKwlpZ3RfcmVxdWlyZShkcm1Jb2N0bChmZCwgTE9DQUxf RFJNX0lPQ1RMX01PREVfREVTVFJPWVBST1BCTE9CLCAmZCkgPT0gMCk7Cit9CisKIHN0YXRpYyBp bnQKIHZhbGlkYXRlX3Byb3AoaW50IGZkLCB1aW50MzJfdCBwcm9wX2lkKQogewotCXN0cnVjdCBk cm1fbW9kZV9nZXRfYmxvYiBnZXQ7CisJc3RydWN0IGxvY2FsX2RybV9tb2RlX2dldF9ibG9iIGdl dDsKIAlzdHJ1Y3QgZHJtX21vZGVfbW9kZWluZm8gcmV0X21vZGU7CiAKIAlnZXQuYmxvYl9pZCA9 IHByb3BfaWQ7CiAJZ2V0Lmxlbmd0aCA9IDA7CiAJZ2V0LmRhdGEgPSAodWludHB0cl90KSAwOwot CWlvY3RsX29yX3JldF9lcnJubyhmZCwgRFJNX0lPQ1RMX01PREVfR0VUUFJPUEJMT0IsICZnZXQp OworCWlvY3RsX29yX3JldF9lcnJubyhmZCwgTE9DQUxfRFJNX0lPQ1RMX01PREVfR0VUUFJPUEJM T0IsICZnZXQpOwogCiAJaWYgKGdldC5sZW5ndGggIT0gc2l6ZW9mKHRlc3RfbW9kZV92YWxpZCkp CiAJCXJldHVybiBFTk9NRU07CiAKIAlnZXQuZGF0YSA9ICh1aW50cHRyX3QpICZyZXRfbW9kZTsK LQlpb2N0bF9vcl9yZXRfZXJybm8oZmQsIERSTV9JT0NUTF9NT0RFX0dFVFBST1BCTE9CLCAmZ2V0 KTsKKwlpb2N0bF9vcl9yZXRfZXJybm8oZmQsIExPQ0FMX0RSTV9JT0NUTF9NT0RFX0dFVFBST1BC TE9CLCAmZ2V0KTsKIAogCWlmIChtZW1jbXAoJnJldF9tb2RlLCAmdGVzdF9tb2RlX3ZhbGlkLCBz aXplb2YodGVzdF9tb2RlX3ZhbGlkKSkgIT0gMCkKIAkJcmV0dXJuIEVJTlZBTDsKQEAgLTg3LDEy ICsxMTcsMTIgQEAgdmFsaWRhdGVfcHJvcChpbnQgZmQsIHVpbnQzMl90IHByb3BfaWQpCiBzdGF0 aWMgdWludDMyX3QKIGNyZWF0ZV9wcm9wKGludCBmZCkKIHsKLQlzdHJ1Y3QgZHJtX21vZGVfY3Jl YXRlX2Jsb2IgY3JlYXRlOworCXN0cnVjdCBsb2NhbF9kcm1fbW9kZV9jcmVhdGVfYmxvYiBjcmVh dGU7CiAKIAljcmVhdGUubGVuZ3RoID0gc2l6ZW9mKHRlc3RfbW9kZV92YWxpZCk7CiAJY3JlYXRl LmRhdGEgPSAodWludHB0cl90KSAmdGVzdF9tb2RlX3ZhbGlkOwogCi0JZG9faW9jdGwoZmQsIERS TV9JT0NUTF9NT0RFX0NSRUFURVBST1BCTE9CLCAmY3JlYXRlKTsKKwlkb19pb2N0bChmZCwgTE9D QUxfRFJNX0lPQ1RMX01PREVfQ1JFQVRFUFJPUEJMT0IsICZjcmVhdGUpOwogCWlndF9hc3NlcnRf bmVxX3UzMihjcmVhdGUuYmxvYl9pZCwgMCk7CiAKIAlyZXR1cm4gY3JlYXRlLmJsb2JfaWQ7CkBA IC0xMDEsMTAgKzEzMSwxMCBAQCBjcmVhdGVfcHJvcChpbnQgZmQpCiBzdGF0aWMgaW50CiBkZXN0 cm95X3Byb3AoaW50IGZkLCB1aW50MzJfdCBwcm9wX2lkKQogewotCXN0cnVjdCBkcm1fbW9kZV9k ZXN0cm95X2Jsb2IgZGVzdHJveTsKKwlzdHJ1Y3QgbG9jYWxfZHJtX21vZGVfZGVzdHJveV9ibG9i IGRlc3Ryb3k7CiAKIAlkZXN0cm95LmJsb2JfaWQgPSBwcm9wX2lkOwotCWlvY3RsX29yX3JldF9l cnJubyhmZCwgRFJNX0lPQ1RMX01PREVfREVTVFJPWVBST1BCTE9CLCAmZGVzdHJveSk7CisJaW9j dGxfb3JfcmV0X2Vycm5vKGZkLCBMT0NBTF9EUk1fSU9DVExfTU9ERV9ERVNUUk9ZUFJPUEJMT0Is ICZkZXN0cm95KTsKIAogCXJldHVybiAwOwogfQpAQCAtMTEyLDggKzE0Miw4IEBAIGRlc3Ryb3lf cHJvcChpbnQgZmQsIHVpbnQzMl90IHByb3BfaWQpCiBzdGF0aWMgdm9pZAogdGVzdF92YWxpZGF0 ZShpbnQgZmQpCiB7Ci0Jc3RydWN0IGRybV9tb2RlX2NyZWF0ZV9ibG9iIGNyZWF0ZTsKLQlzdHJ1 Y3QgZHJtX21vZGVfZ2V0X2Jsb2IgZ2V0OworCXN0cnVjdCBsb2NhbF9kcm1fbW9kZV9jcmVhdGVf YmxvYiBjcmVhdGU7CisJc3RydWN0IGxvY2FsX2RybV9tb2RlX2dldF9ibG9iIGdldDsKIAljaGFy IHRvb19zbWFsbFszMl07CiAJdWludDMyX3QgcHJvcF9pZDsKIApAQCAtMTIyLDI0ICsxNTIsMjQg QEAgdGVzdF92YWxpZGF0ZShpbnQgZmQpCiAJLyogT3V0bGFuZGlzaCBzaXplLiAqLwogCWNyZWF0 ZS5sZW5ndGggPSAweDEwMDAwOwogCWNyZWF0ZS5kYXRhID0gKHVpbnRwdHJfdCkgJnRvb19zbWFs bDsKLQlkb19pb2N0bF9lcnIoZmQsIERSTV9JT0NUTF9NT0RFX0NSRUFURVBST1BCTE9CLCAmY3Jl YXRlLCBFRkFVTFQpOworCWRvX2lvY3RsX2VycihmZCwgTE9DQUxfRFJNX0lPQ1RMX01PREVfQ1JF QVRFUFJPUEJMT0IsICZjcmVhdGUsIEVGQVVMVCk7CiAKIAkvKiBPdXRsYW5kaXNoIGFkZHJlc3Mu ICovCiAJY3JlYXRlLmxlbmd0aCA9IHNpemVvZih0ZXN0X21vZGVfdmFsaWQpOwogCWNyZWF0ZS5k YXRhID0gKHVpbnRwdHJfdCkgMHhkZWFkYmVlZTsKLQlkb19pb2N0bF9lcnIoZmQsIERSTV9JT0NU TF9NT0RFX0NSRUFURVBST1BCTE9CLCAmY3JlYXRlLCBFRkFVTFQpOworCWRvX2lvY3RsX2Vycihm ZCwgTE9DQUxfRFJNX0lPQ1RMX01PREVfQ1JFQVRFUFJPUEJMT0IsICZjcmVhdGUsIEVGQVVMVCk7 CiAKIAkvKiBXaGVuIHdlIHBhc3MgYW4gaW5jb3JyZWN0IHNpemUsIHRoZSBrZXJuZWwgc2hvdWxk IGNvcnJlY3QgdXMuICovCiAJcHJvcF9pZCA9IGNyZWF0ZV9wcm9wKGZkKTsKIAlnZXQuYmxvYl9p ZCA9IHByb3BfaWQ7CiAJZ2V0Lmxlbmd0aCA9IHNpemVvZih0b29fc21hbGwpOwogCWdldC5kYXRh ID0gKHVpbnRwdHJfdCkgdG9vX3NtYWxsOwotCWRvX2lvY3RsKGZkLCBEUk1fSU9DVExfTU9ERV9H RVRQUk9QQkxPQiwgJmdldCk7CisJZG9faW9jdGwoZmQsIExPQ0FMX0RSTV9JT0NUTF9NT0RFX0dF VFBST1BCTE9CLCAmZ2V0KTsKIAlpZ3RfYXNzZXJ0X2VxX3UzMihnZXQubGVuZ3RoLCBzaXplb2Yo dGVzdF9tb2RlX3ZhbGlkKSk7CiAKIAlnZXQuYmxvYl9pZCA9IHByb3BfaWQ7CiAJZ2V0LmRhdGEg PSAodWludHB0cl90KSAweGRlYWRiZWVlOwotCWRvX2lvY3RsX2VycihmZCwgRFJNX0lPQ1RMX01P REVfQ1JFQVRFUFJPUEJMT0IsICZjcmVhdGUsIEVGQVVMVCk7CisJZG9faW9jdGxfZXJyKGZkLCBM T0NBTF9EUk1fSU9DVExfTU9ERV9DUkVBVEVQUk9QQkxPQiwgJmNyZWF0ZSwgRUZBVUxUKTsKIH0K IAogc3RhdGljIHZvaWQKQEAgLTIxMSw5ICsyNDEsMTIgQEAgaWd0X21haW4KIAlpZ3RfZml4dHVy ZSB7CiAJCWZkID0gZHJtX29wZW5fZHJpdmVyKERSSVZFUl9BTlkpOwogCQlpZ3RfcmVxdWlyZShm ZCA+PSAwKTsKLQkJdGVzdF9iYXNpYyhmZCk7CisJCWlndF9yZXF1aXJlX3Byb3BibG9iKGZkKTsK IAl9CiAKKwlpZ3Rfc3VidGVzdCgiYmFzaWMiKQorCQl0ZXN0X2Jhc2ljKGZkKTsKKwogCWlndF9z dWJ0ZXN0KCJibG9iLXByb3AtY29yZSIpCiAJCXRlc3RfY29yZShmZCk7CiAKLS0gCjEuOS4xCgpf X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZngg bWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3Rz LmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=