From mboxrd@z Thu Jan 1 00:00:00 1970 From: Robert Bragg Subject: [PATCH igt v3 03/11] igt/gem_exec_parse: move hsw_load_register_reg down Date: Wed, 9 Nov 2016 16:15:54 +0000 Message-ID: <20161109161602.2402-4-robert@sixbynine.org> References: <20161109161602.2402-1-robert@sixbynine.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id B165B6E6EC for ; Wed, 9 Nov 2016 16:16:36 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id u144so30210939wmu.0 for ; Wed, 09 Nov 2016 08:16:36 -0800 (PST) In-Reply-To: <20161109161602.2402-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 YmVydEBzaXhieW5pbmUub3JnPgotLS0KIHRlc3RzL2dlbV9leGVjX3BhcnNlLmMgfCAxODIgKysr KysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNo YW5nZWQsIDkxIGluc2VydGlvbnMoKyksIDkxIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3Rl c3RzL2dlbV9leGVjX3BhcnNlLmMgYi90ZXN0cy9nZW1fZXhlY19wYXJzZS5jCmluZGV4IDcyZDdj N2IuLmM1MzBiYjYgMTAwNjQ0Ci0tLSBhL3Rlc3RzL2dlbV9leGVjX3BhcnNlLmMKKysrIGIvdGVz dHMvZ2VtX2V4ZWNfcGFyc2UuYwpAQCAtNjUsOTcgKzY1LDYgQEAgc3RhdGljIGludCBjb21tYW5k X3BhcnNlcl92ZXJzaW9uKGludCBmZCkKIAlyZXR1cm4gLTE7CiB9CiAKLXN0YXRpYyB2b2lkIGhz d19sb2FkX3JlZ2lzdGVyX3JlZyh2b2lkKQotewotCXVpbnQzMl90IGJ1ZlsxNl0gPSB7Ci0JCU1J X0xPQURfUkVHSVNURVJfSU1NIHwgKDUgLSAyKSwKLQkJSFNXX0NTX0dQUjAsCi0JCTB4YWJjZGFi Y2QsCi0JCUhTV19DU19HUFIxLAotCQkweGRlYWRiZWVmLAotCi0JCU1JX1NUT1JFX1JFR0lTVEVS X01FTSB8ICgzIC0gMiksCi0JCUhTV19DU19HUFIxLAotCQkwLCAvKiBhZGRyZXNzMCAqLwotCi0J CU1JX0xPQURfUkVHSVNURVJfUkVHIHwgKDMgLSAyKSwKLQkJSFNXX0NTX0dQUjAsCi0JCUhTV19D U19HUFIxLAotCi0JCU1JX1NUT1JFX1JFR0lTVEVSX01FTSB8ICgzIC0gMiksCi0JCUhTV19DU19H UFIxLAotCQk0LCAvKiBhZGRyZXNzMSAqLwotCi0JCU1JX0JBVENIX0JVRkZFUl9FTkQsCi0JfTsK LQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX2V4ZWNidWZmZXIyIGV4ZWNidWY7Ci0Jc3RydWN0IGRybV9p OTE1X2dlbV9leGVjX29iamVjdDIgb2JqWzJdOwotCXN0cnVjdCBkcm1faTkxNV9nZW1fcmVsb2Nh dGlvbl9lbnRyeSByZWxvY1syXTsKLQlpbnQgZmQ7Ci0KLQkvKiBPcGVuIGFnYWluIHRvIGdldCBh IG5vbi1tYXN0ZXIgZmlsZSBkZXNjcmlwdG9yICovCi0JZmQgPSBkcm1fb3Blbl9kcml2ZXIoRFJJ VkVSX0lOVEVMKTsKLQotCWlndF9yZXF1aXJlKElTX0hBU1dFTEwoaW50ZWxfZ2V0X2RybV9kZXZp ZChmZCkpKTsKLQlpZ3RfcmVxdWlyZShjb21tYW5kX3BhcnNlcl92ZXJzaW9uKGZkKSA+PSA3KTsK LQotCW1lbXNldChvYmosIDAsIHNpemVvZihvYmopKTsKLQlvYmpbMF0uaGFuZGxlID0gZ2VtX2Ny ZWF0ZShmZCwgNDA5Nik7Ci0Jb2JqWzFdLmhhbmRsZSA9IGdlbV9jcmVhdGUoZmQsIDQwOTYpOwot CWdlbV93cml0ZShmZCwgb2JqWzFdLmhhbmRsZSwgMCwgYnVmLCBzaXplb2YoYnVmKSk7Ci0KLQlt ZW1zZXQocmVsb2MsIDAsIHNpemVvZihyZWxvYykpOwotCXJlbG9jWzBdLm9mZnNldCA9IDcqc2l6 ZW9mKHVpbnQzMl90KTsKLQlyZWxvY1swXS50YXJnZXRfaGFuZGxlID0gb2JqWzBdLmhhbmRsZTsK LQlyZWxvY1swXS5kZWx0YSA9IDA7Ci0JcmVsb2NbMF0ucmVhZF9kb21haW5zID0gSTkxNV9HRU1f RE9NQUlOX0NPTU1BTkQ7Ci0JcmVsb2NbMF0ud3JpdGVfZG9tYWluID0gSTkxNV9HRU1fRE9NQUlO X0NPTU1BTkQ7Ci0JcmVsb2NbMV0ub2Zmc2V0ID0gMTMqc2l6ZW9mKHVpbnQzMl90KTsKLQlyZWxv Y1sxXS50YXJnZXRfaGFuZGxlID0gb2JqWzBdLmhhbmRsZTsKLQlyZWxvY1sxXS5kZWx0YSA9IHNp emVvZih1aW50MzJfdCk7Ci0JcmVsb2NbMV0ucmVhZF9kb21haW5zID0gSTkxNV9HRU1fRE9NQUlO X0NPTU1BTkQ7Ci0JcmVsb2NbMV0ud3JpdGVfZG9tYWluID0gSTkxNV9HRU1fRE9NQUlOX0NPTU1B TkQ7Ci0Jb2JqWzFdLnJlbG9jc19wdHIgPSAodWludHB0cl90KSZyZWxvYzsKLQlvYmpbMV0ucmVs b2NhdGlvbl9jb3VudCA9IDI7Ci0KLQltZW1zZXQoJmV4ZWNidWYsIDAsIHNpemVvZihleGVjYnVm KSk7Ci0JZXhlY2J1Zi5idWZmZXJzX3B0ciA9ICh1aW50cHRyX3Qpb2JqOwotCWV4ZWNidWYuYnVm ZmVyX2NvdW50ID0gMjsKLQlleGVjYnVmLmJhdGNoX2xlbiA9IHNpemVvZihidWYpOwotCWV4ZWNi dWYuZmxhZ3MgPSBJOTE1X0VYRUNfUkVOREVSOwotCWdlbV9leGVjYnVmKGZkLCAmZXhlY2J1Zik7 Ci0JZ2VtX2Nsb3NlKGZkLCBvYmpbMV0uaGFuZGxlKTsKLQotCWdlbV9yZWFkKGZkLCBvYmpbMF0u aGFuZGxlLCAwLCBidWYsIDIqc2l6ZW9mKGJ1ZlswXSkpOwotCWlndF9hc3NlcnRfZXFfdTMyKGJ1 ZlswXSwgMHhkZWFkYmVlZik7IC8qIGJlZm9yZSBjb3B5ICovCi0JaWd0X2Fzc2VydF9lcV91MzIo YnVmWzFdLCAweGFiY2RhYmNkKTsgLyogYWZ0ZXIgY29weSAqLwotCi0JLyogTm93IGEgY291cGxl IG9mIG5lZ2F0aXZlIHRlc3RzIHRoYXQgc2hvdWxkIGJlIGZpbHRlcmVkICovCi0JZXhlY2J1Zi5i dWZmZXJfY291bnQgPSAxOwotCWV4ZWNidWYuYmF0Y2hfbGVuID0gNCpzaXplb2YoYnVmWzBdKTsK LQotCWJ1ZlswXSA9IE1JX0xPQURfUkVHSVNURVJfUkVHIHwgKDMgLSAyKTsKLQlidWZbMV0gPSBI U1dfQ1NfR1BSMDsKLQlidWZbMl0gPSAwOwotCWJ1ZlszXSA9IE1JX0JBVENIX0JVRkZFUl9FTkQ7 Ci0JZ2VtX3dyaXRlKGZkLCBvYmpbMF0uaGFuZGxlLCAwLCBidWYsIGV4ZWNidWYuYmF0Y2hfbGVu KTsKLQlpZ3RfYXNzZXJ0X2VxKF9fZ2VtX2V4ZWNidWYoZmQsICZleGVjYnVmKSwgLUVJTlZBTCk7 Ci0KLQlidWZbMl0gPSBPQUNPTlRST0w7IC8qIGZpbHRlcmVkICovCi0JZ2VtX3dyaXRlKGZkLCBv YmpbMF0uaGFuZGxlLCAwLCBidWYsIGV4ZWNidWYuYmF0Y2hfbGVuKTsKLQlpZ3RfYXNzZXJ0X2Vx KF9fZ2VtX2V4ZWNidWYoZmQsICZleGVjYnVmKSwgLUVJTlZBTCk7Ci0KLQlidWZbMl0gPSBERVJS TVI7IC8qIG1hc3RlciBvbmx5ICovCi0JZ2VtX3dyaXRlKGZkLCBvYmpbMF0uaGFuZGxlLCAwLCBi dWYsIGV4ZWNidWYuYmF0Y2hfbGVuKTsKLQlpZ3RfYXNzZXJ0X2VxKF9fZ2VtX2V4ZWNidWYoZmQs ICZleGVjYnVmKSwgLUVJTlZBTCk7Ci0KLQlidWZbMl0gPSAweDIwMzg7IC8qIFJJTkdfU1RBUlQ6 IGludmFsaWQgKi8KLQlnZW1fd3JpdGUoZmQsIG9ialswXS5oYW5kbGUsIDAsIGJ1ZiwgZXhlY2J1 Zi5iYXRjaF9sZW4pOwotCWlndF9hc3NlcnRfZXEoX19nZW1fZXhlY2J1ZihmZCwgJmV4ZWNidWYp LCAtRUlOVkFMKTsKLQotCWNsb3NlKGZkKTsKLX0KLQogc3RhdGljIHZvaWQgZXhlY19iYXRjaF9w YXRjaGVkKGludCBmZCwgdWludDMyX3QgY21kX2JvLCB1aW50MzJfdCAqY21kcywKIAkJCSAgICAg ICBpbnQgc2l6ZSwgaW50IHBhdGNoX29mZnNldCwgdWludDY0X3QgZXhwZWN0ZWRfdmFsdWUpCiB7 CkBAIC0zNTEsNiArMjYwLDk3IEBAIHN0YXRpYyB2b2lkIHN0cmF5X2xyaShpbnQgZmQsIHVpbnQz Ml90IGhhbmRsZSkKIAlpZ3RfYXNzZXJ0X2VxX3UzMihpbnRlbF9yZWdpc3Rlcl9yZWFkKE9BQ09O VFJPTCksIDB4ZGVhZGJlZWYpOwogfQogCitzdGF0aWMgdm9pZCBoc3dfbG9hZF9yZWdpc3Rlcl9y ZWcodm9pZCkKK3sKKwl1aW50MzJfdCBidWZbMTZdID0geworCQlNSV9MT0FEX1JFR0lTVEVSX0lN TSB8ICg1IC0gMiksCisJCUhTV19DU19HUFIwLAorCQkweGFiY2RhYmNkLAorCQlIU1dfQ1NfR1BS MSwKKwkJMHhkZWFkYmVlZiwKKworCQlNSV9TVE9SRV9SRUdJU1RFUl9NRU0gfCAoMyAtIDIpLAor CQlIU1dfQ1NfR1BSMSwKKwkJMCwgLyogYWRkcmVzczAgKi8KKworCQlNSV9MT0FEX1JFR0lTVEVS X1JFRyB8ICgzIC0gMiksCisJCUhTV19DU19HUFIwLAorCQlIU1dfQ1NfR1BSMSwKKworCQlNSV9T VE9SRV9SRUdJU1RFUl9NRU0gfCAoMyAtIDIpLAorCQlIU1dfQ1NfR1BSMSwKKwkJNCwgLyogYWRk cmVzczEgKi8KKworCQlNSV9CQVRDSF9CVUZGRVJfRU5ELAorCX07CisJc3RydWN0IGRybV9pOTE1 X2dlbV9leGVjYnVmZmVyMiBleGVjYnVmOworCXN0cnVjdCBkcm1faTkxNV9nZW1fZXhlY19vYmpl Y3QyIG9ialsyXTsKKwlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlbG9jYXRpb25fZW50cnkgcmVsb2Nb Ml07CisJaW50IGZkOworCisJLyogT3BlbiBhZ2FpbiB0byBnZXQgYSBub24tbWFzdGVyIGZpbGUg ZGVzY3JpcHRvciAqLworCWZkID0gZHJtX29wZW5fZHJpdmVyKERSSVZFUl9JTlRFTCk7CisKKwlp Z3RfcmVxdWlyZShJU19IQVNXRUxMKGludGVsX2dldF9kcm1fZGV2aWQoZmQpKSk7CisJaWd0X3Jl cXVpcmUoY29tbWFuZF9wYXJzZXJfdmVyc2lvbihmZCkgPj0gNyk7CisKKwltZW1zZXQob2JqLCAw LCBzaXplb2Yob2JqKSk7CisJb2JqWzBdLmhhbmRsZSA9IGdlbV9jcmVhdGUoZmQsIDQwOTYpOwor CW9ialsxXS5oYW5kbGUgPSBnZW1fY3JlYXRlKGZkLCA0MDk2KTsKKwlnZW1fd3JpdGUoZmQsIG9i alsxXS5oYW5kbGUsIDAsIGJ1Ziwgc2l6ZW9mKGJ1ZikpOworCisJbWVtc2V0KHJlbG9jLCAwLCBz aXplb2YocmVsb2MpKTsKKwlyZWxvY1swXS5vZmZzZXQgPSA3KnNpemVvZih1aW50MzJfdCk7CisJ cmVsb2NbMF0udGFyZ2V0X2hhbmRsZSA9IG9ialswXS5oYW5kbGU7CisJcmVsb2NbMF0uZGVsdGEg PSAwOworCXJlbG9jWzBdLnJlYWRfZG9tYWlucyA9IEk5MTVfR0VNX0RPTUFJTl9DT01NQU5EOwor CXJlbG9jWzBdLndyaXRlX2RvbWFpbiA9IEk5MTVfR0VNX0RPTUFJTl9DT01NQU5EOworCXJlbG9j WzFdLm9mZnNldCA9IDEzKnNpemVvZih1aW50MzJfdCk7CisJcmVsb2NbMV0udGFyZ2V0X2hhbmRs ZSA9IG9ialswXS5oYW5kbGU7CisJcmVsb2NbMV0uZGVsdGEgPSBzaXplb2YodWludDMyX3QpOwor CXJlbG9jWzFdLnJlYWRfZG9tYWlucyA9IEk5MTVfR0VNX0RPTUFJTl9DT01NQU5EOworCXJlbG9j WzFdLndyaXRlX2RvbWFpbiA9IEk5MTVfR0VNX0RPTUFJTl9DT01NQU5EOworCW9ialsxXS5yZWxv Y3NfcHRyID0gKHVpbnRwdHJfdCkmcmVsb2M7CisJb2JqWzFdLnJlbG9jYXRpb25fY291bnQgPSAy OworCisJbWVtc2V0KCZleGVjYnVmLCAwLCBzaXplb2YoZXhlY2J1ZikpOworCWV4ZWNidWYuYnVm ZmVyc19wdHIgPSAodWludHB0cl90KW9iajsKKwlleGVjYnVmLmJ1ZmZlcl9jb3VudCA9IDI7CisJ ZXhlY2J1Zi5iYXRjaF9sZW4gPSBzaXplb2YoYnVmKTsKKwlleGVjYnVmLmZsYWdzID0gSTkxNV9F WEVDX1JFTkRFUjsKKwlnZW1fZXhlY2J1ZihmZCwgJmV4ZWNidWYpOworCWdlbV9jbG9zZShmZCwg b2JqWzFdLmhhbmRsZSk7CisKKwlnZW1fcmVhZChmZCwgb2JqWzBdLmhhbmRsZSwgMCwgYnVmLCAy KnNpemVvZihidWZbMF0pKTsKKwlpZ3RfYXNzZXJ0X2VxX3UzMihidWZbMF0sIDB4ZGVhZGJlZWYp OyAvKiBiZWZvcmUgY29weSAqLworCWlndF9hc3NlcnRfZXFfdTMyKGJ1ZlsxXSwgMHhhYmNkYWJj ZCk7IC8qIGFmdGVyIGNvcHkgKi8KKworCS8qIE5vdyBhIGNvdXBsZSBvZiBuZWdhdGl2ZSB0ZXN0 cyB0aGF0IHNob3VsZCBiZSBmaWx0ZXJlZCAqLworCWV4ZWNidWYuYnVmZmVyX2NvdW50ID0gMTsK KwlleGVjYnVmLmJhdGNoX2xlbiA9IDQqc2l6ZW9mKGJ1ZlswXSk7CisKKwlidWZbMF0gPSBNSV9M T0FEX1JFR0lTVEVSX1JFRyB8ICgzIC0gMik7CisJYnVmWzFdID0gSFNXX0NTX0dQUjA7CisJYnVm WzJdID0gMDsKKwlidWZbM10gPSBNSV9CQVRDSF9CVUZGRVJfRU5EOworCWdlbV93cml0ZShmZCwg b2JqWzBdLmhhbmRsZSwgMCwgYnVmLCBleGVjYnVmLmJhdGNoX2xlbik7CisJaWd0X2Fzc2VydF9l cShfX2dlbV9leGVjYnVmKGZkLCAmZXhlY2J1ZiksIC1FSU5WQUwpOworCisJYnVmWzJdID0gT0FD T05UUk9MOyAvKiBmaWx0ZXJlZCAqLworCWdlbV93cml0ZShmZCwgb2JqWzBdLmhhbmRsZSwgMCwg YnVmLCBleGVjYnVmLmJhdGNoX2xlbik7CisJaWd0X2Fzc2VydF9lcShfX2dlbV9leGVjYnVmKGZk LCAmZXhlY2J1ZiksIC1FSU5WQUwpOworCisJYnVmWzJdID0gREVSUk1SOyAvKiBtYXN0ZXIgb25s eSAqLworCWdlbV93cml0ZShmZCwgb2JqWzBdLmhhbmRsZSwgMCwgYnVmLCBleGVjYnVmLmJhdGNo X2xlbik7CisJaWd0X2Fzc2VydF9lcShfX2dlbV9leGVjYnVmKGZkLCAmZXhlY2J1ZiksIC1FSU5W QUwpOworCisJYnVmWzJdID0gMHgyMDM4OyAvKiBSSU5HX1NUQVJUOiBpbnZhbGlkICovCisJZ2Vt X3dyaXRlKGZkLCBvYmpbMF0uaGFuZGxlLCAwLCBidWYsIGV4ZWNidWYuYmF0Y2hfbGVuKTsKKwlp Z3RfYXNzZXJ0X2VxKF9fZ2VtX2V4ZWNidWYoZmQsICZleGVjYnVmKSwgLUVJTlZBTCk7CisKKwlj bG9zZShmZCk7Cit9CisKIHN0YXRpYyB1aW50MzJfdCBoYW5kbGU7CiBzdGF0aWMgaW50IGZkOwog Ci0tIAoyLjEwLjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9y ZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdm eAo=