From: Derek Morton Subject: [PATCH i-g-t] core_prop_blob ioctl_wrappers: Fix new tests/benchmarks for android Date: Tue, 13 Oct 2015 16:16:18 +0100 Message-ID: <1444749378-27655-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 mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 94F916E3DB for ; Tue, 13 Oct 2015 08:17:05 -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 Q2hhbmdlcyBzaW5jZSAjMWI0OTJlMzExIGhhdmUgYnJva2VuIHRoZSBBbmRyb2lkIGJ1aWxkLiBU aGlzIHBhdGNoCmZpeGVzIHRoZSBidWlsZCBmb3IgQW5kcm9pZC4KCmNvcmVfcHJvcF9ibG9iIHdh cyB1c2luZyBpb2N0bHMgbm90IGluIHRoZSBhbmRyb2lkIGtlcm5lbC4gQWRkZWQgYQppZ3RfcmVx dWlyZV9wcm9wYmxvYigpIGZ1bmN0aW9uIGFuZCBsb2NhbCBkZWZpbmVzL3N0cnVjdHVyZXMgc28g dGhlCnRlc3Qgd2lsbCBjb21waWxlIGFuZCBza2lwIG9uIGtlcm5lbHMgd2hlcmUgdGhlIGZlYXR1 cmUgaXMgdW5zdXBwb3J0ZWQuCgpnZW1fYmx0IC0gaW5jbHVkZWQgaWd0LmgKClNpZ25lZC1vZmYt Ynk6IERlcmVrIE1vcnRvbiA8ZGVyZWsuai5tb3J0b25AaW50ZWwuY29tPgotLS0KIGJlbmNobWFy a3MvZ2VtX2JsdC5jICAgfCAgNCArLS0tCiBsaWIvaW9jdGxfd3JhcHBlcnMuYyAgIHwgMTMgKysr KysrKysrKysrKwogbGliL2lvY3RsX3dyYXBwZXJzLmggICB8IDIyICsrKysrKysrKysrKysrKysr KysrKysKIHRlc3RzL2NvcmVfcHJvcF9ibG9iLmMgfCAzNyArKysrKysrKysrKysrKysrKystLS0t LS0tLS0tLS0tLS0tLS0tCiA0IGZpbGVzIGNoYW5nZWQsIDU0IGluc2VydGlvbnMoKyksIDIyIGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2JlbmNobWFya3MvZ2VtX2JsdC5jIGIvYmVuY2htYXJr cy9nZW1fYmx0LmMKaW5kZXggMTgxYTVmMS4uOGFiNTMwMiAxMDA2NDQKLS0tIGEvYmVuY2htYXJr cy9nZW1fYmx0LmMKKysrIGIvYmVuY2htYXJrcy9nZW1fYmx0LmMKQEAgLTI1LDYgKzI1LDcgQEAK ICAqCiAgKi8KIAorI2luY2x1ZGUgImlndC5oIgogI2luY2x1ZGUgPHVuaXN0ZC5oPgogI2luY2x1 ZGUgPHN0ZGxpYi5oPgogI2luY2x1ZGUgPHN0ZGludC5oPgpAQCAtMzksOSArNDAsNiBAQAogI2lu Y2x1ZGUgPHRpbWUuaD4KIAogI2luY2x1ZGUgImRybS5oIgotI2luY2x1ZGUgImlvY3RsX3dyYXBw ZXJzLmgiCi0jaW5jbHVkZSAiZHJtdGVzdC5oIgotI2luY2x1ZGUgImludGVsX2NoaXBzZXQuaCIK IAogI2RlZmluZSBMT0NBTF9JOTE1X0VYRUNfTk9fUkVMT0MgKDE8PDExKQogI2RlZmluZSBMT0NB TF9JOTE1X0VYRUNfSEFORExFX0xVVCAoMTw8MTIpCmRpZmYgLS1naXQgYS9saWIvaW9jdGxfd3Jh cHBlcnMuYyBiL2xpYi9pb2N0bF93cmFwcGVycy5jCmluZGV4IDgwZTFlYzYuLmNmMzRmMjUgMTAw NjQ0Ci0tLSBhL2xpYi9pb2N0bF93cmFwcGVycy5jCisrKyBiL2xpYi9pb2N0bF93cmFwcGVycy5j CkBAIC0xMjE5LDYgKzEyMTksMTkgQEAgdm9pZCBpZ3RfcmVxdWlyZV9mYl9tb2RpZmllcnMoaW50 IGZkKQogCWlndF9yZXF1aXJlKGhhc19tb2RpZmllcnMpOwogfQogCit2b2lkIGlndF9yZXF1aXJl X3Byb3BibG9iKGludCBmZCkKK3sKKwlzdHJ1Y3QgbG9jYWxfZHJtX21vZGVfY3JlYXRlX2Jsb2Ig YzsKKwlzdHJ1Y3QgbG9jYWxfZHJtX21vZGVfZGVzdHJveV9ibG9iIGQ7CisJdWludDMyX3QgYmxv Yl9kYXRhOworCWMuZGF0YSA9ICZibG9iX2RhdGE7CisJYy5sZW5ndGggPSBzaXplb2YoYmxvYl9k YXRhKTsKKworCWlndF9yZXF1aXJlKGRybUlvY3RsKGZkLCBMT0NBTF9EUk1fSU9DVExfTU9ERV9D UkVBVEVQUk9QQkxPQiwgJmMpID09IDApOworCWQuYmxvYl9pZCA9IGMuYmxvYl9pZDsKKwlpZ3Rf cmVxdWlyZShkcm1Jb2N0bChmZCwgTE9DQUxfRFJNX0lPQ1RMX01PREVfREVTVFJPWVBST1BCTE9C LCAmZCkgPT0gMCk7Cit9CisKIGludCBfX2ttc19hZGRmYihpbnQgZmQsIHVpbnQzMl90IGhhbmRs ZSwgdWludDMyX3Qgd2lkdGgsIHVpbnQzMl90IGhlaWdodCwKIAkJdWludDMyX3Qgc3RyaWRlLCB1 aW50MzJfdCBwaXhlbF9mb3JtYXQsIHVpbnQ2NF90IG1vZGlmaWVyLAogCQl1aW50MzJfdCBmbGFn cywgdWludDMyX3QgKmJ1Zl9pZCkKZGlmZiAtLWdpdCBhL2xpYi9pb2N0bF93cmFwcGVycy5oIGIv bGliL2lvY3RsX3dyYXBwZXJzLmgKaW5kZXggZjRkZWNhNi4uYWViMjI0YyAxMDA2NDQKLS0tIGEv bGliL2lvY3RsX3dyYXBwZXJzLmgKKysrIGIvbGliL2lvY3RsX3dyYXBwZXJzLmgKQEAgLTE0OSw2 ICsxNDksMjAgQEAgc3RydWN0IGxvY2FsX2RybV9tb2RlX2ZiX2NtZDIgewogCXVpbnQ2NF90IG1v ZGlmaWVyWzRdOwogfTsKIAorc3RydWN0IGxvY2FsX2RybV9tb2RlX2dldF9ibG9iIHsKKwl1aW50 MzJfdCBibG9iX2lkOworCXVpbnQzMl90IGxlbmd0aDsKKwl1aW50NjRfdCBkYXRhOworfTsKK3N0 cnVjdCBsb2NhbF9kcm1fbW9kZV9jcmVhdGVfYmxvYiB7CisJdWludDY0X3QgZGF0YTsKKwl1aW50 MzJfdCBsZW5ndGg7CisJdWludDMyX3QgYmxvYl9pZDsKK307CitzdHJ1Y3QgbG9jYWxfZHJtX21v ZGVfZGVzdHJveV9ibG9iIHsKKwl1aW50MzJfdCBibG9iX2lkOworfTsKKwogI2RlZmluZSBMT0NB TF9EUk1fTU9ERV9GQl9NT0RJRklFUlMJKDE8PDEpCiAKICNkZWZpbmUgTE9DQUxfRFJNX0ZPUk1B VF9NT0RfVkVORE9SX0lOVEVMCTB4MDEKQEAgLTE2NSw5ICsxNzksMTcgQEAgc3RydWN0IGxvY2Fs X2RybV9tb2RlX2ZiX2NtZDIgewogI2RlZmluZSBMT0NBTF9EUk1fSU9DVExfTU9ERV9BRERGQjIJ RFJNX0lPV1IoMHhCOCwgXAogCQkJCQkJIHN0cnVjdCBsb2NhbF9kcm1fbW9kZV9mYl9jbWQyKQog CisjZGVmaW5lIExPQ0FMX0RSTV9JT0NUTF9NT0RFX0dFVFBST1BCTE9CCURSTV9JT1dSKDB4QUMs IFwKKwkJCQkJCXN0cnVjdCBsb2NhbF9kcm1fbW9kZV9nZXRfYmxvYikKKyNkZWZpbmUgTE9DQUxf RFJNX0lPQ1RMX01PREVfQ1JFQVRFUFJPUEJMT0IJRFJNX0lPV1IoMHhCRCwgXAorCQkJCQkJc3Ry dWN0IGxvY2FsX2RybV9tb2RlX2NyZWF0ZV9ibG9iKQorI2RlZmluZSBMT0NBTF9EUk1fSU9DVExf TU9ERV9ERVNUUk9ZUFJPUEJMT0IJRFJNX0lPV1IoMHhCRSwgXAorCQkJCQkJc3RydWN0IGxvY2Fs X2RybV9tb2RlX2Rlc3Ryb3lfYmxvYikKKwogI2RlZmluZSBMT0NBTF9EUk1fQ0FQX0FEREZCMl9N T0RJRklFUlMJMHgxMAogCiB2b2lkIGlndF9yZXF1aXJlX2ZiX21vZGlmaWVycyhpbnQgZmQpOwor dm9pZCBpZ3RfcmVxdWlyZV9wcm9wYmxvYihpbnQgZmQpOwogCiAvKioKICAqIF9fa21zX2FkZGZi OgpkaWZmIC0tZ2l0IGEvdGVzdHMvY29yZV9wcm9wX2Jsb2IuYyBiL3Rlc3RzL2NvcmVfcHJvcF9i bG9iLmMKaW5kZXggZDcwNDE1OC4uZmY1NjQ4MiAxMDA2NDQKLS0tIGEvdGVzdHMvY29yZV9wcm9w X2Jsb2IuYworKysgYi90ZXN0cy9jb3JlX3Byb3BfYmxvYi5jCkBAIC0yNSwxNiArMjUsMTIgQEAK ICAqICAgRGFuaWVsIFN0b25lIDxkYW5pZWxzQGNvbGxhYm9yYS5jb20+CiAgKi8KIAorI2luY2x1 ZGUgImlndC5oIgogI2luY2x1ZGUgPGVycm5vLmg+CiAjaW5jbHVkZSA8c3RkYm9vbC5oPgogI2lu Y2x1ZGUgPHN0ZGlvLmg+CiAjaW5jbHVkZSA8c3RyaW5nLmg+CiAKLSNpbmNsdWRlICJkcm10ZXN0 LmgiCi0jaW5jbHVkZSAiaWd0X2RlYnVnZnMuaCIKLSNpbmNsdWRlICJpZ3Rfa21zLmgiCi0jaW5j bHVkZSAiaWd0X2F1eC5oIgotCiBJR1RfVEVTVF9ERVNDUklQVElPTigiVGVzdHMgYmVoYXZpb3Vy IG9mIG1hc3MtZGF0YSAnYmxvYicgcHJvcGVydGllcy4iKTsKIAogc3RhdGljIGNvbnN0IHN0cnVj dCBkcm1fbW9kZV9tb2RlaW5mbyB0ZXN0X21vZGVfdmFsaWQgPSB7CkBAIC02NCwxOSArNjAsMTkg QEAgc3RhdGljIGNvbnN0IHN0cnVjdCBkcm1fbW9kZV9tb2RlaW5mbyB0ZXN0X21vZGVfdmFsaWQg PSB7CiBzdGF0aWMgaW50CiB2YWxpZGF0ZV9wcm9wKGludCBmZCwgdWludDMyX3QgcHJvcF9pZCkK IHsKLQlzdHJ1Y3QgZHJtX21vZGVfZ2V0X2Jsb2IgZ2V0OworCXN0cnVjdCBsb2NhbF9kcm1fbW9k ZV9nZXRfYmxvYiBnZXQ7CiAJc3RydWN0IGRybV9tb2RlX21vZGVpbmZvIHJldF9tb2RlOwogCiAJ Z2V0LmJsb2JfaWQgPSBwcm9wX2lkOwogCWdldC5sZW5ndGggPSAwOwogCWdldC5kYXRhID0gKHVp bnRwdHJfdCkgMDsKLQlpb2N0bF9vcl9yZXRfZXJybm8oZmQsIERSTV9JT0NUTF9NT0RFX0dFVFBS T1BCTE9CLCAmZ2V0KTsKKwlpb2N0bF9vcl9yZXRfZXJybm8oZmQsIExPQ0FMX0RSTV9JT0NUTF9N T0RFX0dFVFBST1BCTE9CLCAmZ2V0KTsKIAogCWlmIChnZXQubGVuZ3RoICE9IHNpemVvZih0ZXN0 X21vZGVfdmFsaWQpKQogCQlyZXR1cm4gRU5PTUVNOwogCiAJZ2V0LmRhdGEgPSAodWludHB0cl90 KSAmcmV0X21vZGU7Ci0JaW9jdGxfb3JfcmV0X2Vycm5vKGZkLCBEUk1fSU9DVExfTU9ERV9HRVRQ Uk9QQkxPQiwgJmdldCk7CisJaW9jdGxfb3JfcmV0X2Vycm5vKGZkLCBMT0NBTF9EUk1fSU9DVExf TU9ERV9HRVRQUk9QQkxPQiwgJmdldCk7CiAKIAlpZiAobWVtY21wKCZyZXRfbW9kZSwgJnRlc3Rf bW9kZV92YWxpZCwgc2l6ZW9mKHRlc3RfbW9kZV92YWxpZCkpICE9IDApCiAJCXJldHVybiBFSU5W QUw7CkBAIC04NywxMiArODMsMTIgQEAgdmFsaWRhdGVfcHJvcChpbnQgZmQsIHVpbnQzMl90IHBy b3BfaWQpCiBzdGF0aWMgdWludDMyX3QKIGNyZWF0ZV9wcm9wKGludCBmZCkKIHsKLQlzdHJ1Y3Qg ZHJtX21vZGVfY3JlYXRlX2Jsb2IgY3JlYXRlOworCXN0cnVjdCBsb2NhbF9kcm1fbW9kZV9jcmVh dGVfYmxvYiBjcmVhdGU7CiAKIAljcmVhdGUubGVuZ3RoID0gc2l6ZW9mKHRlc3RfbW9kZV92YWxp ZCk7CiAJY3JlYXRlLmRhdGEgPSAodWludHB0cl90KSAmdGVzdF9tb2RlX3ZhbGlkOwogCi0JZG9f aW9jdGwoZmQsIERSTV9JT0NUTF9NT0RFX0NSRUFURVBST1BCTE9CLCAmY3JlYXRlKTsKKwlkb19p b2N0bChmZCwgTE9DQUxfRFJNX0lPQ1RMX01PREVfQ1JFQVRFUFJPUEJMT0IsICZjcmVhdGUpOwog CWlndF9hc3NlcnRfbmVxX3UzMihjcmVhdGUuYmxvYl9pZCwgMCk7CiAKIAlyZXR1cm4gY3JlYXRl LmJsb2JfaWQ7CkBAIC0xMDEsMTAgKzk3LDEwIEBAIGNyZWF0ZV9wcm9wKGludCBmZCkKIHN0YXRp YyBpbnQKIGRlc3Ryb3lfcHJvcChpbnQgZmQsIHVpbnQzMl90IHByb3BfaWQpCiB7Ci0Jc3RydWN0 IGRybV9tb2RlX2Rlc3Ryb3lfYmxvYiBkZXN0cm95OworCXN0cnVjdCBsb2NhbF9kcm1fbW9kZV9k ZXN0cm95X2Jsb2IgZGVzdHJveTsKIAogCWRlc3Ryb3kuYmxvYl9pZCA9IHByb3BfaWQ7Ci0JaW9j dGxfb3JfcmV0X2Vycm5vKGZkLCBEUk1fSU9DVExfTU9ERV9ERVNUUk9ZUFJPUEJMT0IsICZkZXN0 cm95KTsKKwlpb2N0bF9vcl9yZXRfZXJybm8oZmQsIExPQ0FMX0RSTV9JT0NUTF9NT0RFX0RFU1RS T1lQUk9QQkxPQiwgJmRlc3Ryb3kpOwogCiAJcmV0dXJuIDA7CiB9CkBAIC0xMTIsOCArMTA4LDgg QEAgZGVzdHJveV9wcm9wKGludCBmZCwgdWludDMyX3QgcHJvcF9pZCkKIHN0YXRpYyB2b2lkCiB0 ZXN0X3ZhbGlkYXRlKGludCBmZCkKIHsKLQlzdHJ1Y3QgZHJtX21vZGVfY3JlYXRlX2Jsb2IgY3Jl YXRlOwotCXN0cnVjdCBkcm1fbW9kZV9nZXRfYmxvYiBnZXQ7CisJc3RydWN0IGxvY2FsX2RybV9t b2RlX2NyZWF0ZV9ibG9iIGNyZWF0ZTsKKwlzdHJ1Y3QgbG9jYWxfZHJtX21vZGVfZ2V0X2Jsb2Ig Z2V0OwogCWNoYXIgdG9vX3NtYWxsWzMyXTsKIAl1aW50MzJfdCBwcm9wX2lkOwogCkBAIC0xMjIs MjQgKzExOCwyNCBAQCB0ZXN0X3ZhbGlkYXRlKGludCBmZCkKIAkvKiBPdXRsYW5kaXNoIHNpemUu ICovCiAJY3JlYXRlLmxlbmd0aCA9IDB4MTAwMDA7CiAJY3JlYXRlLmRhdGEgPSAodWludHB0cl90 KSAmdG9vX3NtYWxsOwotCWRvX2lvY3RsX2VycihmZCwgRFJNX0lPQ1RMX01PREVfQ1JFQVRFUFJP UEJMT0IsICZjcmVhdGUsIEVGQVVMVCk7CisJZG9faW9jdGxfZXJyKGZkLCBMT0NBTF9EUk1fSU9D VExfTU9ERV9DUkVBVEVQUk9QQkxPQiwgJmNyZWF0ZSwgRUZBVUxUKTsKIAogCS8qIE91dGxhbmRp c2ggYWRkcmVzcy4gKi8KIAljcmVhdGUubGVuZ3RoID0gc2l6ZW9mKHRlc3RfbW9kZV92YWxpZCk7 CiAJY3JlYXRlLmRhdGEgPSAodWludHB0cl90KSAweGRlYWRiZWVlOwotCWRvX2lvY3RsX2Vycihm ZCwgRFJNX0lPQ1RMX01PREVfQ1JFQVRFUFJPUEJMT0IsICZjcmVhdGUsIEVGQVVMVCk7CisJZG9f aW9jdGxfZXJyKGZkLCBMT0NBTF9EUk1fSU9DVExfTU9ERV9DUkVBVEVQUk9QQkxPQiwgJmNyZWF0 ZSwgRUZBVUxUKTsKIAogCS8qIFdoZW4gd2UgcGFzcyBhbiBpbmNvcnJlY3Qgc2l6ZSwgdGhlIGtl cm5lbCBzaG91bGQgY29ycmVjdCB1cy4gKi8KIAlwcm9wX2lkID0gY3JlYXRlX3Byb3AoZmQpOwog CWdldC5ibG9iX2lkID0gcHJvcF9pZDsKIAlnZXQubGVuZ3RoID0gc2l6ZW9mKHRvb19zbWFsbCk7 CiAJZ2V0LmRhdGEgPSAodWludHB0cl90KSB0b29fc21hbGw7Ci0JZG9faW9jdGwoZmQsIERSTV9J T0NUTF9NT0RFX0dFVFBST1BCTE9CLCAmZ2V0KTsKKwlkb19pb2N0bChmZCwgTE9DQUxfRFJNX0lP Q1RMX01PREVfR0VUUFJPUEJMT0IsICZnZXQpOwogCWlndF9hc3NlcnRfZXFfdTMyKGdldC5sZW5n dGgsIHNpemVvZih0ZXN0X21vZGVfdmFsaWQpKTsKIAogCWdldC5ibG9iX2lkID0gcHJvcF9pZDsK IAlnZXQuZGF0YSA9ICh1aW50cHRyX3QpIDB4ZGVhZGJlZWU7Ci0JZG9faW9jdGxfZXJyKGZkLCBE Uk1fSU9DVExfTU9ERV9DUkVBVEVQUk9QQkxPQiwgJmNyZWF0ZSwgRUZBVUxUKTsKKwlkb19pb2N0 bF9lcnIoZmQsIExPQ0FMX0RSTV9JT0NUTF9NT0RFX0NSRUFURVBST1BCTE9CLCAmY3JlYXRlLCBF RkFVTFQpOwogfQogCiBzdGF0aWMgdm9pZApAQCAtMjExLDkgKzIwNywxMiBAQCBpZ3RfbWFpbgog CWlndF9maXh0dXJlIHsKIAkJZmQgPSBkcm1fb3Blbl9kcml2ZXIoRFJJVkVSX0FOWSk7CiAJCWln dF9yZXF1aXJlKGZkID49IDApOwotCQl0ZXN0X2Jhc2ljKGZkKTsKKwkJaWd0X3JlcXVpcmVfcHJv cGJsb2IoZmQpOwogCX0KIAorCWlndF9zdWJ0ZXN0KCJiYXNpYyIpCisJCXRlc3RfYmFzaWMoZmQp OworCiAJaWd0X3N1YnRlc3QoImJsb2ItcHJvcC1jb3JlIikKIAkJdGVzdF9jb3JlKGZkKTsKIAot LSAKMS45LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f CkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpo dHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==