From mboxrd@z Thu Jan 1 00:00:00 1970 From: Imre Deak Subject: [PATCH 4/5] drm/i915: Cleanup instdone collection Date: Wed, 30 Sep 2015 23:00:45 +0300 Message-ID: <1443643246-7832-5-git-send-email-imre.deak@intel.com> References: <1443643246-7832-1-git-send-email-imre.deak@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id D280E6E8D5 for ; Wed, 30 Sep 2015 13:00:54 -0700 (PDT) In-Reply-To: <1443643246-7832-1-git-send-email-imre.deak@intel.com> 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: Ben Widawsky List-Id: intel-gfx@lists.freedesktop.org RnJvbTogQmVuIFdpZGF3c2t5IDxiZW5qYW1pbi53aWRhd3NreUBpbnRlbC5jb20+CgpDb25zb2xp ZGF0ZSB0aGUgaW5zdGRvbmUgbG9naWMgc28gd2UgY2FuIGdldCBhIGJpdCBmYW5jaWVyLiBUaGlz IHBhdGNoIGFsc28KcmVtb3ZlcyB0aGUgZHVwbGljYXRlZCBwcmludCBvZiBJTlNURE9ORVswXS4K ClNpZ25lZC1vZmYtYnk6IEJlbiBXaWRhd3NreSA8YmVuQGJ3aWRhd3NrLm5ldD4KCi0tLQoKQ2hh bmdlczogKEltcmUpCi0ga2VlcCBjYXB0dXJpbmcgR0VONF9JTlNURE9ORTEgdG9vCi0gZG9uJ3Qg c2F2ZSBHRU43IHJlZ2lzdGVycyBvbiBHRU40LTYKLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2Rydi5oICAgICAgIHwgMTAgKysrKysrLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Z3B1X2Vycm9yLmMgfCA0MyArKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYyAgICAgICB8IDI1ICsrKysrKysrKysrKysrLS0t LS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3JlZy5oICAgICAgIHwgIDEgLQogNCBmaWxl cyBjaGFuZ2VkLCA1MyBpbnNlcnRpb25zKCspLCAyNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9kcnYuaAppbmRleCA5YzEwMjcwLi42MjFhY2YxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2 LmgKQEAgLTUxMyw3ICs1MTMsMTIgQEAgc3RydWN0IGRybV9pOTE1X2Vycm9yX3N0YXRlIHsKIAl1 MzIgZ2FtX2Vjb2NoazsKIAl1MzIgZ2FiX2N0bDsKIAl1MzIgZ2Z4X21vZGU7Ci0JdTMyIGV4dHJh X2luc3Rkb25lW0k5MTVfTlVNX0lOU1RET05FX1JFR107CisJc3RydWN0IGV4dHJhX2luc3Rkb25l IHsKKwkJdTMyIHNsaWNlX2NvbW1vbjsKKwkJdTMyIHNhbXBsZXI7CisJCXUzMiByb3c7CisJfSBl eHRyYV9pbnN0ZG9uZTsKKwogCXU2NCBmZW5jZVtJOTE1X01BWF9OVU1fRkVOQ0VTXTsKIAlzdHJ1 Y3QgaW50ZWxfb3ZlcmxheV9lcnJvcl9zdGF0ZSAqb3ZlcmxheTsKIAlzdHJ1Y3QgaW50ZWxfZGlz cGxheV9lcnJvcl9zdGF0ZSAqZGlzcGxheTsKQEAgLTMyNTksNyArMzI2NCw4IEBAIHZvaWQgaTkx NV9lcnJvcl9zdGF0ZV9nZXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIHZvaWQgaTkxNV9lcnJv cl9zdGF0ZV9wdXQoc3RydWN0IGk5MTVfZXJyb3Jfc3RhdGVfZmlsZV9wcml2ICplcnJvcl9wcml2 KTsKIHZvaWQgaTkxNV9kZXN0cm95X2Vycm9yX3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYp OwogCi12b2lkIGk5MTVfZ2V0X2V4dHJhX2luc3Rkb25lKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYs IHVpbnQzMl90ICppbnN0ZG9uZSk7Cit2b2lkIGk5MTVfZ2V0X2V4dHJhX2luc3Rkb25lKHN0cnVj dCBkcm1fZGV2aWNlICpkZXYsCisJCQkgICAgIHN0cnVjdCBleHRyYV9pbnN0ZG9uZSAqZXh0cmEp OwogY29uc3QgY2hhciAqaTkxNV9jYWNoZV9sZXZlbF9zdHIoc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmk5MTUsIGludCB0eXBlKTsKIAogLyogaTkxNV9jbWRfcGFyc2VyLmMgKi8KZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmMgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dwdV9lcnJvci5jCmluZGV4IDJmMDRlNGYuLmU3OGU1MTIgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3IuYwpAQCAtMzgzLDkgKzM4MywxMSBAQCBpbnQgaTkx NV9lcnJvcl9zdGF0ZV90b19zdHIoc3RydWN0IGRybV9pOTE1X2Vycm9yX3N0YXRlX2J1ZiAqbSwK IAlmb3IgKGkgPSAwOyBpIDwgZGV2X3ByaXYtPm51bV9mZW5jZV9yZWdzOyBpKyspCiAJCWVycl9w cmludGYobSwgIiAgZmVuY2VbJWRdID0gJTA4bGx4XG4iLCBpLCBlcnJvci0+ZmVuY2VbaV0pOwog Ci0JZm9yIChpID0gMDsgaSA8IEFSUkFZX1NJWkUoZXJyb3ItPmV4dHJhX2luc3Rkb25lKTsgaSsr KQotCQllcnJfcHJpbnRmKG0sICIgIElOU1RET05FXyVkOiAweCUwOHhcbiIsIGksCi0JCQkgICBl cnJvci0+ZXh0cmFfaW5zdGRvbmVbaV0pOworCWVycl9wcmludGYobSwgIiAgU0NfSU5TVERPTkUg KHNsaWNlIGNvbW1vbik6IDB4JTA4eFxuIiwKKwkJICAgZXJyb3ItPmV4dHJhX2luc3Rkb25lLnNs aWNlX2NvbW1vbik7CisJZXJyX3ByaW50ZihtLCAiICBTQU1QTEVSX0lOVFNET05FOiAweCUwOHhc biIsCisJCSAgIGVycm9yLT5leHRyYV9pbnN0ZG9uZS5zYW1wbGVyKTsKKwllcnJfcHJpbnRmKG0s ICIgIFJPV19JTlNURE9ORTogMHglMDh4XG4iLCBlcnJvci0+ZXh0cmFfaW5zdGRvbmUucm93KTsK IAogCWlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA+PSA2KSB7CiAJCWVycl9wcmludGYobSwgIkVS Uk9SOiAweCUwOHhcbiIsIGVycm9yLT5lcnJvcik7CkBAIC0xMjMzLDcgKzEyMzUsNyBAQCBzdGF0 aWMgdm9pZCBpOTE1X2NhcHR1cmVfcmVnX3N0YXRlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdiwKIAllcnJvci0+ZWlyID0gSTkxNV9SRUFEKEVJUik7CiAJZXJyb3ItPnBndGJsX2Vy ID0gSTkxNV9SRUFEKFBHVEJMX0VSKTsKIAotCWk5MTVfZ2V0X2V4dHJhX2luc3Rkb25lKGRldiwg ZXJyb3ItPmV4dHJhX2luc3Rkb25lKTsKKwlpOTE1X2dldF9leHRyYV9pbnN0ZG9uZShkZXYsICZl cnJvci0+ZXh0cmFfaW5zdGRvbmUpOwogfQogCiBzdGF0aWMgdm9pZCBpOTE1X2Vycm9yX2NhcHR1 cmVfbXNnKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCkBAIC0xMzgyLDIwICsxMzg0LDI5IEBAIGNv bnN0IGNoYXIgKmk5MTVfY2FjaGVfbGV2ZWxfc3RyKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpp OTE1LCBpbnQgdHlwZSkKIH0KIAogLyogTkI6IHBsZWFzZSBub3RpY2UgdGhlIG1lbXNldCAqLwot dm9pZCBpOTE1X2dldF9leHRyYV9pbnN0ZG9uZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB1aW50 MzJfdCAqaW5zdGRvbmUpCit2b2lkIGk5MTVfZ2V0X2V4dHJhX2luc3Rkb25lKHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYsCisJCQkgICAgIHN0cnVjdCBleHRyYV9pbnN0ZG9uZSAqZXh0cmEpCiB7CiAJ c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKLQlt ZW1zZXQoaW5zdGRvbmUsIDAsIHNpemVvZigqaW5zdGRvbmUpICogSTkxNV9OVU1fSU5TVERPTkVf UkVHKTsKIAotCWlmIChJU19HRU4yKGRldikgfHwgSVNfR0VOMyhkZXYpKQotCQlpbnN0ZG9uZVsw XSA9IEk5MTVfUkVBRChHRU4yX0lOU1RET05FKTsKLQllbHNlIGlmIChJU19HRU40KGRldikgfHwg SVNfR0VONShkZXYpIHx8IElTX0dFTjYoZGV2KSkgewotCQlpbnN0ZG9uZVswXSA9IEk5MTVfUkVB RChSSU5HX0lOU1RET05FKFJFTkRFUl9SSU5HX0JBU0UpKTsKLQkJaW5zdGRvbmVbMV0gPSBJOTE1 X1JFQUQoR0VONF9JTlNURE9ORTEpOwotCX0gZWxzZSBpZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4g Pj0gNykgewotCQlpbnN0ZG9uZVswXSA9IEk5MTVfUkVBRChSSU5HX0lOU1RET05FKFJFTkRFUl9S SU5HX0JBU0UpKTsKLQkJaW5zdGRvbmVbMV0gPSBJOTE1X1JFQUQoR0VON19TQ19JTlNURE9ORSk7 Ci0JCWluc3Rkb25lWzJdID0gSTkxNV9SRUFEKEdFTjdfU0FNUExFUl9JTlNURE9ORSk7Ci0JCWlu c3Rkb25lWzNdID0gSTkxNV9SRUFEKEdFTjdfUk9XX0lOU1RET05FKTsKKwkvKgorCSAqIFRoZSBy ZW5kZXIgSU5TVERPTkUgcmVnaXN0ZXIgKEdFTjJfSU5TVERPTkUsIFJJTkdfSU5TVERPTkUpIGlz IHJlYWQKKwkgKiBieSB0aGUgcmluZyBjb2xsZWN0aW9uLgorCSAqLworCXN3aXRjaCAoSU5URUxf SU5GTyhkZXYpLT5nZW4pIHsKKwlkZWZhdWx0OgorCQlleHRyYS0+c2xpY2VfY29tbW9uID0gSTkx NV9SRUFEKEdFTjdfU0NfSU5TVERPTkUpOworCQlleHRyYS0+c2FtcGxlciA9IEk5MTVfUkVBRChH RU43X1NBTVBMRVJfSU5TVERPTkUpOworCQlleHRyYS0+cm93ID0gSTkxNV9SRUFEKEdFTjdfUk9X X0lOU1RET05FKTsKKwkJYnJlYWs7CisJY2FzZSA2OgorCWNhc2UgNToKKwljYXNlIDQ6CisJCS8q IEhBQ0s6IFVzaW5nIHRoZSB3cm9uZyBzdHJ1Y3QgbWVtYmVyICovCisJCWV4dHJhLT5zbGljZV9j b21tb24gPSBJOTE1X1JFQUQoR0VONF9JTlNURE9ORTEpOworCQlicmVhazsKKwljYXNlIDM6CisJ Y2FzZSAyOgorCQlicmVhazsKIAl9CiB9CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2lycS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYwppbmRleCA3NmJk NDBlLi44YTNkYzczIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMKQEAgLTI0NzMsMTkgKzI0NzMs MzIgQEAgc3RhdGljIHZvaWQgaTkxNV9yZXNldF9hbmRfd2FrZXVwKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYpCiAJfQogfQogCitzdGF0aWMgaW5saW5lIHZvaWQKK2k5MTVfZXJyX3ByaW50X2luc3Rk b25lKHVpbnQzMl90IHJlbmRlciwgc3RydWN0IGV4dHJhX2luc3Rkb25lICpleHRyYSkKK3sKKwlw cl9lcnIoIiAgSU5TVERPTkUgKHJlbmRlcik6IDB4JTA4eFxuIiwgcmVuZGVyKTsKKwlwcl9lcnIo IiAgSU5TVERPTkUgKGNvbW1vbik6IDB4JTA4eFxuIiwgZXh0cmEtPnNsaWNlX2NvbW1vbik7CisJ cHJfZXJyKCIgIElOU1RET05FIChzYW1wbGVyKTogMHglMDh4XG4iLCBleHRyYS0+c2FtcGxlcik7 CisJcHJfZXJyKCIgIElOU1RET05FIChyb3cpOiAweCUwOHhcbiIsIGV4dHJhLT5yb3cpOworfQor CiBzdGF0aWMgdm9pZCBpOTE1X3JlcG9ydF9hbmRfY2xlYXJfZWlyKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYpCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZf cHJpdmF0ZTsKLQl1aW50MzJfdCBpbnN0ZG9uZVtJOTE1X05VTV9JTlNURE9ORV9SRUddOworCXUz MiByZW5kZXJfaW5zdGRvbmU7CisJc3RydWN0IGV4dHJhX2luc3Rkb25lIGV4dHJhID0gezB9Owog CXUzMiBlaXIgPSBJOTE1X1JFQUQoRUlSKTsKLQlpbnQgcGlwZSwgaTsKKwlpbnQgcGlwZTsKIAog CWlmICghZWlyKQogCQlyZXR1cm47CiAKIAlwcl9lcnIoInJlbmRlciBlcnJvciBkZXRlY3RlZCwg RUlSOiAweCUwOHhcbiIsIGVpcik7CiAKLQlpOTE1X2dldF9leHRyYV9pbnN0ZG9uZShkZXYsIGlu c3Rkb25lKTsKKwlyZW5kZXJfaW5zdGRvbmUgPSBJOTE1X1JFQUQoSU5URUxfSU5GTyhkZXYpLT5n ZW4gPCA0ID8KKwkJCQkgICAgR0VOMl9JTlNURE9ORSA6CisJCQkJICAgIFJJTkdfSU5TVERPTkUo UkVOREVSX1JJTkdfQkFTRSkpOworCWk5MTVfZ2V0X2V4dHJhX2luc3Rkb25lKGRldiwgJmV4dHJh KTsKIAogCWlmIChJU19HNFgoZGV2KSkgewogCQlpZiAoZWlyICYgKEdNNDVfRVJST1JfTUVNX1BS SVYgfCBHTTQ1X0VSUk9SX0NQX1BSSVYpKSB7CkBAIC0yNDkzLDggKzI1MDYsNyBAQCBzdGF0aWMg dm9pZCBpOTE1X3JlcG9ydF9hbmRfY2xlYXJfZWlyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAK IAkJCXByX2VycigiICBJUEVJUjogMHglMDh4XG4iLCBJOTE1X1JFQUQoSVBFSVJfSTk2NSkpOwog CQkJcHJfZXJyKCIgIElQRUhSOiAweCUwOHhcbiIsIEk5MTVfUkVBRChJUEVIUl9JOTY1KSk7Ci0J CQlmb3IgKGkgPSAwOyBpIDwgQVJSQVlfU0laRShpbnN0ZG9uZSk7IGkrKykKLQkJCQlwcl9lcnIo IiAgSU5TVERPTkVfJWQ6IDB4JTA4eFxuIiwgaSwgaW5zdGRvbmVbaV0pOworCQkJaTkxNV9lcnJf cHJpbnRfaW5zdGRvbmUocmVuZGVyX2luc3Rkb25lLCAmZXh0cmEpOwogCQkJcHJfZXJyKCIgIElO U1RQUzogMHglMDh4XG4iLCBJOTE1X1JFQUQoSU5TVFBTKSk7CiAJCQlwcl9lcnIoIiAgQUNUSEQ6 IDB4JTA4eFxuIiwgSTkxNV9SRUFEKEFDVEhEX0k5NjUpKTsKIAkJCUk5MTVfV1JJVEUoSVBFSVJf STk2NSwgaXBlaXIpOwpAQCAtMjUyOSw4ICsyNTQxLDcgQEAgc3RhdGljIHZvaWQgaTkxNV9yZXBv cnRfYW5kX2NsZWFyX2VpcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCWlmIChlaXIgJiBJOTE1 X0VSUk9SX0lOU1RSVUNUSU9OKSB7CiAJCXByX2VycigiaW5zdHJ1Y3Rpb24gZXJyb3JcbiIpOwog CQlwcl9lcnIoIiAgSU5TVFBNOiAweCUwOHhcbiIsIEk5MTVfUkVBRChJTlNUUE0pKTsKLQkJZm9y IChpID0gMDsgaSA8IEFSUkFZX1NJWkUoaW5zdGRvbmUpOyBpKyspCi0JCQlwcl9lcnIoIiAgSU5T VERPTkVfJWQ6IDB4JTA4eFxuIiwgaSwgaW5zdGRvbmVbaV0pOworCQlpOTE1X2Vycl9wcmludF9p bnN0ZG9uZShyZW5kZXJfaW5zdGRvbmUsICZleHRyYSk7CiAJCWlmIChJTlRFTF9JTkZPKGRldikt PmdlbiA8IDQpIHsKIAkJCXUzMiBpcGVpciA9IEk5MTVfUkVBRChJUEVJUik7CiAKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVnLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X3JlZy5oCmluZGV4IGMxMmYzYjguLmFjNWY0OWEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfcmVnLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9y ZWcuaApAQCAtMTU5Niw3ICsxNTk2LDYgQEAgZW51bSBza2xfZGlzcF9wb3dlcl93ZWxscyB7CiAj ZGVmaW5lIEdFTjdfU0NfSU5TVERPTkUJMHgwNzEwMAogI2RlZmluZSBHRU43X1NBTVBMRVJfSU5T VERPTkUJMHgwZTE2MAogI2RlZmluZSBHRU43X1JPV19JTlNURE9ORQkweDBlMTY0Ci0jZGVmaW5l IEk5MTVfTlVNX0lOU1RET05FX1JFRwk0CiAjZGVmaW5lIFJJTkdfSVBFSVIoYmFzZSkJKChiYXNl KSsweDY0KQogI2RlZmluZSBSSU5HX0lQRUhSKGJhc2UpCSgoYmFzZSkrMHg2OCkKIC8qCi0tIAoy LjEuNAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50 ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6 Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK