From mboxrd@z Thu Jan 1 00:00:00 1970 From: Robert Bragg Subject: [PATCH igt v4 03/13] igt/gem_exec_parse: move hsw_load_register_reg down Date: Mon, 14 Nov 2016 20:51:12 +0000 Message-ID: <20161114205122.10742-4-robert@sixbynine.org> References: <20161114205122.10742-1-robert@sixbynine.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-pg0-x241.google.com (mail-pg0-x241.google.com [IPv6:2607:f8b0:400e:c05::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 952846E507 for ; Mon, 14 Nov 2016 20:51:40 +0000 (UTC) Received: by mail-pg0-x241.google.com with SMTP id e9so9457386pgc.1 for ; Mon, 14 Nov 2016 12:51:40 -0800 (PST) In-Reply-To: <20161114205122.10742-1-robert@sixbynine.org> 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 Tm8gZnVuY3Rpb25hbCBjaGFuZ2UsIGp1c3QgbW92aW5nIGhzd19sb2FkX3JlZ3N0ZXJfcmVnIHRl c3QgY29kZSBkb3duCmJlbG93IHRoZSBleGVjYnVmIHV0aWxpdGllcyBpbiBwcmVwYXJhdGlvbiBm b3IgdXBkYXRpbmcgdG8gdXNlIHRoZW0uCgpTaWduZWQtb2ZmLWJ5OiBSb2JlcnQgQnJhZ2cgPHJv YmVydEBzaXhieW5pbmUub3JnPgpSZXZpZXdlZC1ieTogTWF0dGhldyBBdWxkIDxtYXR0aGV3LmF1 bGRAaW50ZWwuY29tPgotLS0KIHRlc3RzL2dlbV9leGVjX3BhcnNlLmMgfCAxODIgKysrKysrKysr KysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQs IDkxIGluc2VydGlvbnMoKyksIDkxIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3Rlc3RzL2dl bV9leGVjX3BhcnNlLmMgYi90ZXN0cy9nZW1fZXhlY19wYXJzZS5jCmluZGV4IGM4MWJiYzcuLjdh OWRjODIgMTAwNjQ0Ci0tLSBhL3Rlc3RzL2dlbV9leGVjX3BhcnNlLmMKKysrIGIvdGVzdHMvZ2Vt X2V4ZWNfcGFyc2UuYwpAQCAtNjUsOTcgKzY1LDYgQEAgc3RhdGljIGludCBjb21tYW5kX3BhcnNl cl92ZXJzaW9uKGludCBmZCkKIAlyZXR1cm4gLTE7CiB9CiAKLXN0YXRpYyB2b2lkIGhzd19sb2Fk X3JlZ2lzdGVyX3JlZyh2b2lkKQotewotCXVpbnQzMl90IGJ1ZlsxNl0gPSB7Ci0JCU1JX0xPQURf UkVHSVNURVJfSU1NIHwgKDUgLSAyKSwKLQkJSFNXX0NTX0dQUjAsCi0JCTB4YWJjZGFiY2QsCi0J CUhTV19DU19HUFIxLAotCQkweGRlYWRiZWVmLAotCi0JCU1JX1NUT1JFX1JFR0lTVEVSX01FTSB8 ICgzIC0gMiksCi0JCUhTV19DU19HUFIxLAotCQkwLCAvKiBhZGRyZXNzMCAqLwotCi0JCU1JX0xP QURfUkVHSVNURVJfUkVHIHwgKDMgLSAyKSwKLQkJSFNXX0NTX0dQUjAsCi0JCUhTV19DU19HUFIx LAotCi0JCU1JX1NUT1JFX1JFR0lTVEVSX01FTSB8ICgzIC0gMiksCi0JCUhTV19DU19HUFIxLAot CQk0LCAvKiBhZGRyZXNzMSAqLwotCi0JCU1JX0JBVENIX0JVRkZFUl9FTkQsCi0JfTsKLQlzdHJ1 Y3QgZHJtX2k5MTVfZ2VtX2V4ZWNidWZmZXIyIGV4ZWNidWY7Ci0Jc3RydWN0IGRybV9pOTE1X2dl bV9leGVjX29iamVjdDIgb2JqWzJdOwotCXN0cnVjdCBkcm1faTkxNV9nZW1fcmVsb2NhdGlvbl9l bnRyeSByZWxvY1syXTsKLQlpbnQgZmQ7Ci0KLQkvKiBPcGVuIGFnYWluIHRvIGdldCBhIG5vbi1t YXN0ZXIgZmlsZSBkZXNjcmlwdG9yICovCi0JZmQgPSBkcm1fb3Blbl9kcml2ZXIoRFJJVkVSX0lO VEVMKTsKLQotCWlndF9yZXF1aXJlKElTX0hBU1dFTEwoaW50ZWxfZ2V0X2RybV9kZXZpZChmZCkp KTsKLQlpZ3RfcmVxdWlyZShjb21tYW5kX3BhcnNlcl92ZXJzaW9uKGZkKSA+PSA3KTsKLQotCW1l bXNldChvYmosIDAsIHNpemVvZihvYmopKTsKLQlvYmpbMF0uaGFuZGxlID0gZ2VtX2NyZWF0ZShm ZCwgNDA5Nik7Ci0Jb2JqWzFdLmhhbmRsZSA9IGdlbV9jcmVhdGUoZmQsIDQwOTYpOwotCWdlbV93 cml0ZShmZCwgb2JqWzFdLmhhbmRsZSwgMCwgYnVmLCBzaXplb2YoYnVmKSk7Ci0KLQltZW1zZXQo cmVsb2MsIDAsIHNpemVvZihyZWxvYykpOwotCXJlbG9jWzBdLm9mZnNldCA9IDcqc2l6ZW9mKHVp bnQzMl90KTsKLQlyZWxvY1swXS50YXJnZXRfaGFuZGxlID0gb2JqWzBdLmhhbmRsZTsKLQlyZWxv Y1swXS5kZWx0YSA9IDA7Ci0JcmVsb2NbMF0ucmVhZF9kb21haW5zID0gSTkxNV9HRU1fRE9NQUlO X0NPTU1BTkQ7Ci0JcmVsb2NbMF0ud3JpdGVfZG9tYWluID0gSTkxNV9HRU1fRE9NQUlOX0NPTU1B TkQ7Ci0JcmVsb2NbMV0ub2Zmc2V0ID0gMTMqc2l6ZW9mKHVpbnQzMl90KTsKLQlyZWxvY1sxXS50 YXJnZXRfaGFuZGxlID0gb2JqWzBdLmhhbmRsZTsKLQlyZWxvY1sxXS5kZWx0YSA9IHNpemVvZih1 aW50MzJfdCk7Ci0JcmVsb2NbMV0ucmVhZF9kb21haW5zID0gSTkxNV9HRU1fRE9NQUlOX0NPTU1B TkQ7Ci0JcmVsb2NbMV0ud3JpdGVfZG9tYWluID0gSTkxNV9HRU1fRE9NQUlOX0NPTU1BTkQ7Ci0J b2JqWzFdLnJlbG9jc19wdHIgPSAodWludHB0cl90KSZyZWxvYzsKLQlvYmpbMV0ucmVsb2NhdGlv bl9jb3VudCA9IDI7Ci0KLQltZW1zZXQoJmV4ZWNidWYsIDAsIHNpemVvZihleGVjYnVmKSk7Ci0J ZXhlY2J1Zi5idWZmZXJzX3B0ciA9ICh1aW50cHRyX3Qpb2JqOwotCWV4ZWNidWYuYnVmZmVyX2Nv dW50ID0gMjsKLQlleGVjYnVmLmJhdGNoX2xlbiA9IHNpemVvZihidWYpOwotCWV4ZWNidWYuZmxh Z3MgPSBJOTE1X0VYRUNfUkVOREVSOwotCWdlbV9leGVjYnVmKGZkLCAmZXhlY2J1Zik7Ci0JZ2Vt X2Nsb3NlKGZkLCBvYmpbMV0uaGFuZGxlKTsKLQotCWdlbV9yZWFkKGZkLCBvYmpbMF0uaGFuZGxl LCAwLCBidWYsIDIqc2l6ZW9mKGJ1ZlswXSkpOwotCWlndF9hc3NlcnRfZXFfdTMyKGJ1ZlswXSwg MHhkZWFkYmVlZik7IC8qIGJlZm9yZSBjb3B5ICovCi0JaWd0X2Fzc2VydF9lcV91MzIoYnVmWzFd LCAweGFiY2RhYmNkKTsgLyogYWZ0ZXIgY29weSAqLwotCi0JLyogTm93IGEgY291cGxlIG9mIG5l Z2F0aXZlIHRlc3RzIHRoYXQgc2hvdWxkIGJlIGZpbHRlcmVkICovCi0JZXhlY2J1Zi5idWZmZXJf Y291bnQgPSAxOwotCWV4ZWNidWYuYmF0Y2hfbGVuID0gNCpzaXplb2YoYnVmWzBdKTsKLQotCWJ1 ZlswXSA9IE1JX0xPQURfUkVHSVNURVJfUkVHIHwgKDMgLSAyKTsKLQlidWZbMV0gPSBIU1dfQ1Nf R1BSMDsKLQlidWZbMl0gPSAwOwotCWJ1ZlszXSA9IE1JX0JBVENIX0JVRkZFUl9FTkQ7Ci0JZ2Vt X3dyaXRlKGZkLCBvYmpbMF0uaGFuZGxlLCAwLCBidWYsIGV4ZWNidWYuYmF0Y2hfbGVuKTsKLQlp Z3RfYXNzZXJ0X2VxKF9fZ2VtX2V4ZWNidWYoZmQsICZleGVjYnVmKSwgLUVJTlZBTCk7Ci0KLQli dWZbMl0gPSBPQUNPTlRST0w7IC8qIGZpbHRlcmVkICovCi0JZ2VtX3dyaXRlKGZkLCBvYmpbMF0u aGFuZGxlLCAwLCBidWYsIGV4ZWNidWYuYmF0Y2hfbGVuKTsKLQlpZ3RfYXNzZXJ0X2VxKF9fZ2Vt X2V4ZWNidWYoZmQsICZleGVjYnVmKSwgLUVJTlZBTCk7Ci0KLQlidWZbMl0gPSBERVJSTVI7IC8q IG1hc3RlciBvbmx5ICovCi0JZ2VtX3dyaXRlKGZkLCBvYmpbMF0uaGFuZGxlLCAwLCBidWYsIGV4 ZWNidWYuYmF0Y2hfbGVuKTsKLQlpZ3RfYXNzZXJ0X2VxKF9fZ2VtX2V4ZWNidWYoZmQsICZleGVj YnVmKSwgLUVJTlZBTCk7Ci0KLQlidWZbMl0gPSAweDIwMzg7IC8qIFJJTkdfU1RBUlQ6IGludmFs aWQgKi8KLQlnZW1fd3JpdGUoZmQsIG9ialswXS5oYW5kbGUsIDAsIGJ1ZiwgZXhlY2J1Zi5iYXRj aF9sZW4pOwotCWlndF9hc3NlcnRfZXEoX19nZW1fZXhlY2J1ZihmZCwgJmV4ZWNidWYpLCAtRUlO VkFMKTsKLQotCWNsb3NlKGZkKTsKLX0KLQogc3RhdGljIHZvaWQgZXhlY19iYXRjaF9wYXRjaGVk KGludCBmZCwgdWludDMyX3QgY21kX2JvLCB1aW50MzJfdCAqY21kcywKIAkJCSAgICAgICBpbnQg c2l6ZSwgaW50IHBhdGNoX29mZnNldCwgdWludDY0X3QgZXhwZWN0ZWRfdmFsdWUpCiB7CkBAIC0z ODQsNiArMjkzLDk3IEBAIHN0YXRpYyB2b2lkIHRlc3RfYWxsb2NhdGlvbnMoaW50IGZkKQogCX0K IH0KIAorc3RhdGljIHZvaWQgaHN3X2xvYWRfcmVnaXN0ZXJfcmVnKHZvaWQpCit7CisJdWludDMy X3QgYnVmWzE2XSA9IHsKKwkJTUlfTE9BRF9SRUdJU1RFUl9JTU0gfCAoNSAtIDIpLAorCQlIU1df Q1NfR1BSMCwKKwkJMHhhYmNkYWJjZCwKKwkJSFNXX0NTX0dQUjEsCisJCTB4ZGVhZGJlZWYsCisK KwkJTUlfU1RPUkVfUkVHSVNURVJfTUVNIHwgKDMgLSAyKSwKKwkJSFNXX0NTX0dQUjEsCisJCTAs IC8qIGFkZHJlc3MwICovCisKKwkJTUlfTE9BRF9SRUdJU1RFUl9SRUcgfCAoMyAtIDIpLAorCQlI U1dfQ1NfR1BSMCwKKwkJSFNXX0NTX0dQUjEsCisKKwkJTUlfU1RPUkVfUkVHSVNURVJfTUVNIHwg KDMgLSAyKSwKKwkJSFNXX0NTX0dQUjEsCisJCTQsIC8qIGFkZHJlc3MxICovCisKKwkJTUlfQkFU Q0hfQlVGRkVSX0VORCwKKwl9OworCXN0cnVjdCBkcm1faTkxNV9nZW1fZXhlY2J1ZmZlcjIgZXhl Y2J1ZjsKKwlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX2V4ZWNfb2JqZWN0MiBvYmpbMl07CisJc3RydWN0 IGRybV9pOTE1X2dlbV9yZWxvY2F0aW9uX2VudHJ5IHJlbG9jWzJdOworCWludCBmZDsKKworCS8q IE9wZW4gYWdhaW4gdG8gZ2V0IGEgbm9uLW1hc3RlciBmaWxlIGRlc2NyaXB0b3IgKi8KKwlmZCA9 IGRybV9vcGVuX2RyaXZlcihEUklWRVJfSU5URUwpOworCisJaWd0X3JlcXVpcmUoSVNfSEFTV0VM TChpbnRlbF9nZXRfZHJtX2RldmlkKGZkKSkpOworCWlndF9yZXF1aXJlKGNvbW1hbmRfcGFyc2Vy X3ZlcnNpb24oZmQpID49IDcpOworCisJbWVtc2V0KG9iaiwgMCwgc2l6ZW9mKG9iaikpOworCW9i alswXS5oYW5kbGUgPSBnZW1fY3JlYXRlKGZkLCA0MDk2KTsKKwlvYmpbMV0uaGFuZGxlID0gZ2Vt X2NyZWF0ZShmZCwgNDA5Nik7CisJZ2VtX3dyaXRlKGZkLCBvYmpbMV0uaGFuZGxlLCAwLCBidWYs IHNpemVvZihidWYpKTsKKworCW1lbXNldChyZWxvYywgMCwgc2l6ZW9mKHJlbG9jKSk7CisJcmVs b2NbMF0ub2Zmc2V0ID0gNypzaXplb2YodWludDMyX3QpOworCXJlbG9jWzBdLnRhcmdldF9oYW5k bGUgPSBvYmpbMF0uaGFuZGxlOworCXJlbG9jWzBdLmRlbHRhID0gMDsKKwlyZWxvY1swXS5yZWFk X2RvbWFpbnMgPSBJOTE1X0dFTV9ET01BSU5fQ09NTUFORDsKKwlyZWxvY1swXS53cml0ZV9kb21h aW4gPSBJOTE1X0dFTV9ET01BSU5fQ09NTUFORDsKKwlyZWxvY1sxXS5vZmZzZXQgPSAxMypzaXpl b2YodWludDMyX3QpOworCXJlbG9jWzFdLnRhcmdldF9oYW5kbGUgPSBvYmpbMF0uaGFuZGxlOwor CXJlbG9jWzFdLmRlbHRhID0gc2l6ZW9mKHVpbnQzMl90KTsKKwlyZWxvY1sxXS5yZWFkX2RvbWFp bnMgPSBJOTE1X0dFTV9ET01BSU5fQ09NTUFORDsKKwlyZWxvY1sxXS53cml0ZV9kb21haW4gPSBJ OTE1X0dFTV9ET01BSU5fQ09NTUFORDsKKwlvYmpbMV0ucmVsb2NzX3B0ciA9ICh1aW50cHRyX3Qp JnJlbG9jOworCW9ialsxXS5yZWxvY2F0aW9uX2NvdW50ID0gMjsKKworCW1lbXNldCgmZXhlY2J1 ZiwgMCwgc2l6ZW9mKGV4ZWNidWYpKTsKKwlleGVjYnVmLmJ1ZmZlcnNfcHRyID0gKHVpbnRwdHJf dClvYmo7CisJZXhlY2J1Zi5idWZmZXJfY291bnQgPSAyOworCWV4ZWNidWYuYmF0Y2hfbGVuID0g c2l6ZW9mKGJ1Zik7CisJZXhlY2J1Zi5mbGFncyA9IEk5MTVfRVhFQ19SRU5ERVI7CisJZ2VtX2V4 ZWNidWYoZmQsICZleGVjYnVmKTsKKwlnZW1fY2xvc2UoZmQsIG9ialsxXS5oYW5kbGUpOworCisJ Z2VtX3JlYWQoZmQsIG9ialswXS5oYW5kbGUsIDAsIGJ1ZiwgMipzaXplb2YoYnVmWzBdKSk7CisJ aWd0X2Fzc2VydF9lcV91MzIoYnVmWzBdLCAweGRlYWRiZWVmKTsgLyogYmVmb3JlIGNvcHkgKi8K KwlpZ3RfYXNzZXJ0X2VxX3UzMihidWZbMV0sIDB4YWJjZGFiY2QpOyAvKiBhZnRlciBjb3B5ICov CisKKwkvKiBOb3cgYSBjb3VwbGUgb2YgbmVnYXRpdmUgdGVzdHMgdGhhdCBzaG91bGQgYmUgZmls dGVyZWQgKi8KKwlleGVjYnVmLmJ1ZmZlcl9jb3VudCA9IDE7CisJZXhlY2J1Zi5iYXRjaF9sZW4g PSA0KnNpemVvZihidWZbMF0pOworCisJYnVmWzBdID0gTUlfTE9BRF9SRUdJU1RFUl9SRUcgfCAo MyAtIDIpOworCWJ1ZlsxXSA9IEhTV19DU19HUFIwOworCWJ1ZlsyXSA9IDA7CisJYnVmWzNdID0g TUlfQkFUQ0hfQlVGRkVSX0VORDsKKwlnZW1fd3JpdGUoZmQsIG9ialswXS5oYW5kbGUsIDAsIGJ1 ZiwgZXhlY2J1Zi5iYXRjaF9sZW4pOworCWlndF9hc3NlcnRfZXEoX19nZW1fZXhlY2J1ZihmZCwg JmV4ZWNidWYpLCAtRUlOVkFMKTsKKworCWJ1ZlsyXSA9IE9BQ09OVFJPTDsgLyogZmlsdGVyZWQg Ki8KKwlnZW1fd3JpdGUoZmQsIG9ialswXS5oYW5kbGUsIDAsIGJ1ZiwgZXhlY2J1Zi5iYXRjaF9s ZW4pOworCWlndF9hc3NlcnRfZXEoX19nZW1fZXhlY2J1ZihmZCwgJmV4ZWNidWYpLCAtRUlOVkFM KTsKKworCWJ1ZlsyXSA9IERFUlJNUjsgLyogbWFzdGVyIG9ubHkgKi8KKwlnZW1fd3JpdGUoZmQs IG9ialswXS5oYW5kbGUsIDAsIGJ1ZiwgZXhlY2J1Zi5iYXRjaF9sZW4pOworCWlndF9hc3NlcnRf ZXEoX19nZW1fZXhlY2J1ZihmZCwgJmV4ZWNidWYpLCAtRUlOVkFMKTsKKworCWJ1ZlsyXSA9IDB4 MjAzODsgLyogUklOR19TVEFSVDogaW52YWxpZCAqLworCWdlbV93cml0ZShmZCwgb2JqWzBdLmhh bmRsZSwgMCwgYnVmLCBleGVjYnVmLmJhdGNoX2xlbik7CisJaWd0X2Fzc2VydF9lcShfX2dlbV9l eGVjYnVmKGZkLCAmZXhlY2J1ZiksIC1FSU5WQUwpOworCisJY2xvc2UoZmQpOworfQorCiBzdGF0 aWMgdWludDMyX3QgaGFuZGxlOwogc3RhdGljIGludCBmZDsKIAotLSAKMi4xMC4xCgpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGlu ZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVl ZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK