From: Robert Bragg Subject: [PATCH igt v2 5/6] igt/gem_exec_parse: update hsw_load_register_reg Date: Mon, 7 Nov 2016 22:27:02 +0000 Message-ID: <20161107222703.10784-6-robert@sixbynine.org> References: <20161107222703.10784-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-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 723086E2F0 for ; Mon, 7 Nov 2016 22:27:12 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id a20so8169467wme.2 for ; Mon, 07 Nov 2016 14:27:12 -0800 (PST) In-Reply-To: <20161107222703.10784-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 VGhpcyBnZW5lcmFsaXNlcyBoc3dfbG9hZF9yZWdpc3Rlcl9yZWcgdG8gbG9vcCB0aHJvdWdoIGFu IGFycmF5IG9mCmFsbG93ZWQgYW5kIGRpc2FsbG93ZWQgcmVnaXN0ZXJzIGFuZCB0byB1c2UgdGhl IGV4ZWNfYmF0Y2hbX3BhdGNoZWRdCnV0aWxpdGllcy4KClNpZ25lZC1vZmYtYnk6IFJvYmVydCBC cmFnZyA8cm9iZXJ0QHNpeGJ5bmluZS5vcmc+Ci0tLQogdGVzdHMvZ2VtX2V4ZWNfcGFyc2UuYyB8 IDEzMiArKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAx IGZpbGUgY2hhbmdlZCwgNjQgaW5zZXJ0aW9ucygrKSwgNjggZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvdGVzdHMvZ2VtX2V4ZWNfcGFyc2UuYyBiL3Rlc3RzL2dlbV9leGVjX3BhcnNlLmMKaW5k ZXggZDY0MWQwNS4uMWMwOWNmMiAxMDA2NDQKLS0tIGEvdGVzdHMvZ2VtX2V4ZWNfcGFyc2UuYwor KysgYi90ZXN0cy9nZW1fZXhlY19wYXJzZS5jCkBAIC0zNCw3ICszNCwxMCBAQAogI2RlZmluZSBJ OTE1X1BBUkFNX0NNRF9QQVJTRVJfVkVSU0lPTiAgICAgICAyOAogI2VuZGlmCiAKKyNkZWZpbmUg QVJSQVlfTEVOKEEpIChzaXplb2YoQSkgLyBzaXplb2YoQVswXSkpCisKICNkZWZpbmUgREVSUk1S IDB4NDQwNTAKKyNkZWZpbmUgU09fV1JJVEVfT0ZGU0VUXzAgMHg1MjgwCiAKICNkZWZpbmUgSFNX X0NTX0dQUihuKSAoMHgyNjAwICsgOCoobikpCiAjZGVmaW5lIEhTV19DU19HUFIwIEhTV19DU19H UFIoMCkKQEAgLTY0LDggKzY3LDggQEAgc3RhdGljIGludCBjb21tYW5kX3BhcnNlcl92ZXJzaW9u KGludCBmZCkKIAlyZXR1cm4gLTE7CiB9CiAKLXN0YXRpYyB2b2lkIGV4ZWNfYmF0Y2hfcGF0Y2hl ZChpbnQgZmQsIHVpbnQzMl90IGNtZF9ibywgdWludDMyX3QgKmNtZHMsCi0JCQkgICAgICAgaW50 IHNpemUsIGludCBwYXRjaF9vZmZzZXQsIHVpbnQ2NF90IGV4cGVjdGVkX3ZhbHVlKQorc3RhdGlj IHVpbnQ2NF90IF9fZXhlY19iYXRjaF9wYXRjaGVkKGludCBmZCwgdWludDMyX3QgY21kX2JvLCB1 aW50MzJfdCAqY21kcywKKwkJCQkgICAgIGludCBzaXplLCBpbnQgcGF0Y2hfb2Zmc2V0KQogewog CXN0cnVjdCBkcm1faTkxNV9nZW1fZXhlY2J1ZmZlcjIgZXhlY2J1ZjsKIAlzdHJ1Y3QgZHJtX2k5 MTVfZ2VtX2V4ZWNfb2JqZWN0MiBvYmpbMl07CkBAIC05OSw5ICsxMDIsMTkgQEAgc3RhdGljIHZv aWQgZXhlY19iYXRjaF9wYXRjaGVkKGludCBmZCwgdWludDMyX3QgY21kX2JvLCB1aW50MzJfdCAq Y21kcywKIAlnZW1fc3luYyhmZCwgY21kX2JvKTsKIAogCWdlbV9yZWFkKGZkLHRhcmdldF9ibywg MCwgJmFjdHVhbF92YWx1ZSwgc2l6ZW9mKGFjdHVhbF92YWx1ZSkpOwotCWlndF9hc3NlcnRfZXEo ZXhwZWN0ZWRfdmFsdWUsIGFjdHVhbF92YWx1ZSk7CiAKIAlnZW1fY2xvc2UoZmQsIHRhcmdldF9i byk7CisKKwlyZXR1cm4gYWN0dWFsX3ZhbHVlOworfQorCitzdGF0aWMgdm9pZCBleGVjX2JhdGNo X3BhdGNoZWQoaW50IGZkLCB1aW50MzJfdCBjbWRfYm8sIHVpbnQzMl90ICpjbWRzLAorCQkJICAg ICAgIGludCBzaXplLCBpbnQgcGF0Y2hfb2Zmc2V0LAorCQkJICAgICAgIHVpbnQ2NF90IGV4cGVj dGVkX3ZhbHVlKQoreworCWlndF9hc3NlcnRfZXEoX19leGVjX2JhdGNoX3BhdGNoZWQoZmQsIGNt ZF9ibywgY21kcywKKwkJCQkJICAgc2l6ZSwgcGF0Y2hfb2Zmc2V0KSwKKwkJICAgICAgZXhwZWN0 ZWRfdmFsdWUpOwogfQogCiBzdGF0aWMgaW50IF9fZXhlY19iYXRjaChpbnQgZmQsIHVpbnQzMl90 IGNtZF9ibywgdWludDMyX3QgKmNtZHMsCkBAIC0yMzgsMzEgKzI1MSwzNSBAQCBzdGF0aWMgdm9p ZCBleGVjX2JhdGNoX2NoYWluZWQoaW50IGZkLCB1aW50MzJfdCBjbWRfYm8sIHVpbnQzMl90ICpj bWRzLAogCiBzdGF0aWMgdm9pZCBoc3dfbG9hZF9yZWdpc3Rlcl9yZWcodm9pZCkKIHsKLQl1aW50 MzJfdCBidWZbMTZdID0gewotCQlNSV9MT0FEX1JFR0lTVEVSX0lNTSB8ICg1IC0gMiksCisJdWlu dDMyX3QgaW5pdF9ncHIwWzE2XSA9IHsKKwkJTUlfTE9BRF9SRUdJU1RFUl9JTU0gfCAoMyAtIDIp LAogCQlIU1dfQ1NfR1BSMCwKLQkJMHhhYmNkYWJjZCwKLQkJSFNXX0NTX0dQUjEsCi0JCTB4ZGVh ZGJlZWYsCi0KKwkJMHhhYmNkYWJjMCwgLyogbGVhdmUgWzE6MF0gemVybyAqLworCQlNSV9CQVRD SF9CVUZGRVJfRU5ELAorCX07CisJdWludDMyX3Qgc3RvcmVfZ3ByMFsxNl0gPSB7CiAJCU1JX1NU T1JFX1JFR0lTVEVSX01FTSB8ICgzIC0gMiksCi0JCUhTV19DU19HUFIxLAotCQkwLCAvKiBhZGRy ZXNzMCAqLwotCi0JCU1JX0xPQURfUkVHSVNURVJfUkVHIHwgKDMgLSAyKSwKIAkJSFNXX0NTX0dQ UjAsCi0JCUhTV19DU19HUFIxLAotCi0JCU1JX1NUT1JFX1JFR0lTVEVSX01FTSB8ICgzIC0gMiks Ci0JCUhTV19DU19HUFIxLAotCQk0LCAvKiBhZGRyZXNzMSAqLwotCisJCTAsIC8qIHJlbG9jKi8K IAkJTUlfQkFUQ0hfQlVGRkVSX0VORCwKIAl9OwotCXN0cnVjdCBkcm1faTkxNV9nZW1fZXhlY2J1 ZmZlcjIgZXhlY2J1ZjsKLQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX2V4ZWNfb2JqZWN0MiBvYmpbMl07 Ci0Jc3RydWN0IGRybV9pOTE1X2dlbV9yZWxvY2F0aW9uX2VudHJ5IHJlbG9jWzJdOworCXVpbnQz Ml90IGRvX2xyclsxNl0gPSB7CisJCU1JX0xPQURfUkVHSVNURVJfUkVHIHwgKDMgLSAyKSwKKwkJ MCwgLyogWzFdID0gc3JjICovCisJCUhTV19DU19HUFIwLCAvKiBkc3QgKi8KKwkJTUlfQkFUQ0hf QlVGRkVSX0VORCwKKwl9OworCXVpbnQzMl90IGFsbG93ZWRfcmVnc1tdID0geworCQlIU1dfQ1Nf R1BSMSwKKwkJU09fV1JJVEVfT0ZGU0VUXzAsCisJfTsKKwl1aW50MzJfdCBkaXNhbGxvd2VkX3Jl Z3NbXSA9IHsKKwkJMCwKKwkJREVSUk1SLCAvKiBtYXN0ZXIgb25seSAqLworCQkweDIwMzgsIC8q IFJJTkdfU1RBUlQ6IGludmFsaWQgKi8KKwl9OwogCWludCBmZDsKKwl1aW50MzJfdCBoYW5kbGU7 CiAKIAkvKiBPcGVuIGFnYWluIHRvIGdldCBhIG5vbi1tYXN0ZXIgZmlsZSBkZXNjcmlwdG9yICov CiAJZmQgPSBkcm1fb3Blbl9kcml2ZXIoRFJJVkVSX0lOVEVMKTsKQEAgLTI3MCw1NSArMjg3LDM0 IEBAIHN0YXRpYyB2b2lkIGhzd19sb2FkX3JlZ2lzdGVyX3JlZyh2b2lkKQogCWlndF9yZXF1aXJl KElTX0hBU1dFTEwoaW50ZWxfZ2V0X2RybV9kZXZpZChmZCkpKTsKIAlpZ3RfcmVxdWlyZShjb21t YW5kX3BhcnNlcl92ZXJzaW9uKGZkKSA+PSA3KTsKIAotCW1lbXNldChvYmosIDAsIHNpemVvZihv YmopKTsKLQlvYmpbMF0uaGFuZGxlID0gZ2VtX2NyZWF0ZShmZCwgNDA5Nik7Ci0Jb2JqWzFdLmhh bmRsZSA9IGdlbV9jcmVhdGUoZmQsIDQwOTYpOwotCWdlbV93cml0ZShmZCwgb2JqWzFdLmhhbmRs ZSwgMCwgYnVmLCBzaXplb2YoYnVmKSk7CisJaGFuZGxlID0gZ2VtX2NyZWF0ZShmZCwgNDA5Nik7 CiAKLQltZW1zZXQocmVsb2MsIDAsIHNpemVvZihyZWxvYykpOwotCXJlbG9jWzBdLm9mZnNldCA9 IDcqc2l6ZW9mKHVpbnQzMl90KTsKLQlyZWxvY1swXS50YXJnZXRfaGFuZGxlID0gb2JqWzBdLmhh bmRsZTsKLQlyZWxvY1swXS5kZWx0YSA9IDA7Ci0JcmVsb2NbMF0ucmVhZF9kb21haW5zID0gSTkx NV9HRU1fRE9NQUlOX0NPTU1BTkQ7Ci0JcmVsb2NbMF0ud3JpdGVfZG9tYWluID0gSTkxNV9HRU1f RE9NQUlOX0NPTU1BTkQ7Ci0JcmVsb2NbMV0ub2Zmc2V0ID0gMTMqc2l6ZW9mKHVpbnQzMl90KTsK LQlyZWxvY1sxXS50YXJnZXRfaGFuZGxlID0gb2JqWzBdLmhhbmRsZTsKLQlyZWxvY1sxXS5kZWx0 YSA9IHNpemVvZih1aW50MzJfdCk7Ci0JcmVsb2NbMV0ucmVhZF9kb21haW5zID0gSTkxNV9HRU1f RE9NQUlOX0NPTU1BTkQ7Ci0JcmVsb2NbMV0ud3JpdGVfZG9tYWluID0gSTkxNV9HRU1fRE9NQUlO X0NPTU1BTkQ7Ci0Jb2JqWzFdLnJlbG9jc19wdHIgPSAodWludHB0cl90KSZyZWxvYzsKLQlvYmpb MV0ucmVsb2NhdGlvbl9jb3VudCA9IDI7CisJZm9yIChpbnQgaSA9IDAgOyBpIDwgQVJSQVlfTEVO KGFsbG93ZWRfcmVncyk7IGkrKykgeworCQl1aW50MzJfdCB2YXI7CiAKLQltZW1zZXQoJmV4ZWNi dWYsIDAsIHNpemVvZihleGVjYnVmKSk7Ci0JZXhlY2J1Zi5idWZmZXJzX3B0ciA9ICh1aW50cHRy X3Qpb2JqOwotCWV4ZWNidWYuYnVmZmVyX2NvdW50ID0gMjsKLQlleGVjYnVmLmJhdGNoX2xlbiA9 IHNpemVvZihidWYpOwotCWV4ZWNidWYuZmxhZ3MgPSBJOTE1X0VYRUNfUkVOREVSOwotCWdlbV9l eGVjYnVmKGZkLCAmZXhlY2J1Zik7Ci0JZ2VtX2Nsb3NlKGZkLCBvYmpbMV0uaGFuZGxlKTsKLQot CWdlbV9yZWFkKGZkLCBvYmpbMF0uaGFuZGxlLCAwLCBidWYsIDIqc2l6ZW9mKGJ1ZlswXSkpOwot CWlndF9hc3NlcnRfZXFfdTMyKGJ1ZlswXSwgMHhkZWFkYmVlZik7IC8qIGJlZm9yZSBjb3B5ICov Ci0JaWd0X2Fzc2VydF9lcV91MzIoYnVmWzFdLCAweGFiY2RhYmNkKTsgLyogYWZ0ZXIgY29weSAq LworCQlleGVjX2JhdGNoKGZkLCBoYW5kbGUsIGluaXRfZ3ByMCwgc2l6ZW9mKGluaXRfZ3ByMCks CisJCQkgICBJOTE1X0VYRUNfUkVOREVSLAorCQkJICAgMCk7CisJCWV4ZWNfYmF0Y2hfcGF0Y2hl ZChmZCwgaGFuZGxlLAorCQkJCSAgIHN0b3JlX2dwcjAsIHNpemVvZihzdG9yZV9ncHIwKSwKKwkJ CQkgICAyICogc2l6ZW9mKHVpbnQzMl90KSwgLyogcmVsb2MgKi8KKwkJCQkgICAweGFiY2RhYmMw KTsKKwkJZG9fbHJyWzFdID0gYWxsb3dlZF9yZWdzW2ldOworCQlleGVjX2JhdGNoKGZkLCBoYW5k bGUsIGRvX2xyciwgc2l6ZW9mKGRvX2xyciksCisJCQkgICBJOTE1X0VYRUNfUkVOREVSLAorCQkJ ICAgMCk7CisJCXZhciA9IF9fZXhlY19iYXRjaF9wYXRjaGVkKGZkLCBoYW5kbGUsCisJCQkJCSAg IHN0b3JlX2dwcjAsIHNpemVvZihzdG9yZV9ncHIwKSwKKwkJCQkJICAgMiAqIHNpemVvZih1aW50 MzJfdCkpOyAvKiByZWxvYyAqLworCQlpZ3RfYXNzZXJ0X25lcSh2YXIsIDB4YWJjZGFiYzApOwor CX0KIAotCS8qIE5vdyBhIGNvdXBsZSBvZiBuZWdhdGl2ZSB0ZXN0cyB0aGF0IHNob3VsZCBiZSBm aWx0ZXJlZCAqLwotCWV4ZWNidWYuYnVmZmVyX2NvdW50ID0gMTsKLQlleGVjYnVmLmJhdGNoX2xl biA9IDQqc2l6ZW9mKGJ1ZlswXSk7Ci0KLQlidWZbMF0gPSBNSV9MT0FEX1JFR0lTVEVSX1JFRyB8 ICgzIC0gMik7Ci0JYnVmWzFdID0gSFNXX0NTX0dQUjA7Ci0JYnVmWzJdID0gMDsKLQlidWZbM10g PSBNSV9CQVRDSF9CVUZGRVJfRU5EOwotCWdlbV93cml0ZShmZCwgb2JqWzBdLmhhbmRsZSwgMCwg YnVmLCBleGVjYnVmLmJhdGNoX2xlbik7Ci0JaWd0X2Fzc2VydF9lcShfX2dlbV9leGVjYnVmKGZk LCAmZXhlY2J1ZiksIC1FSU5WQUwpOwotCi0JYnVmWzJdID0gREVSUk1SOyAvKiBtYXN0ZXIgb25s eSAqLwotCWdlbV93cml0ZShmZCwgb2JqWzBdLmhhbmRsZSwgMCwgYnVmLCBleGVjYnVmLmJhdGNo X2xlbik7Ci0JaWd0X2Fzc2VydF9lcShfX2dlbV9leGVjYnVmKGZkLCAmZXhlY2J1ZiksIC1FSU5W QUwpOwotCi0JYnVmWzJdID0gMHgyMDM4OyAvKiBSSU5HX1NUQVJUOiBpbnZhbGlkICovCi0JZ2Vt X3dyaXRlKGZkLCBvYmpbMF0uaGFuZGxlLCAwLCBidWYsIGV4ZWNidWYuYmF0Y2hfbGVuKTsKLQlp Z3RfYXNzZXJ0X2VxKF9fZ2VtX2V4ZWNidWYoZmQsICZleGVjYnVmKSwgLUVJTlZBTCk7CisJZm9y IChpbnQgaSA9IDAgOyBpIDwgQVJSQVlfTEVOKGRpc2FsbG93ZWRfcmVncyk7IGkrKykgeworCQlk b19scnJbMV0gPSBkaXNhbGxvd2VkX3JlZ3NbaV07CisJCWV4ZWNfYmF0Y2goZmQsIGhhbmRsZSwg ZG9fbHJyLCBzaXplb2YoZG9fbHJyKSwKKwkJCSAgIEk5MTVfRVhFQ19SRU5ERVIsCisJCQkgICAt RUlOVkFMKTsKKwl9CiAKIAljbG9zZShmZCk7CiB9Ci0tIAoyLjEwLjEKCl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QK SW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9w Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=