From: Joonas Lahtinen Subject: [PATCH v5 2/2] drm/i915: Simplify i915_reg_read_ioctl Date: Mon, 11 Sep 2017 12:59:01 +0300 Message-ID: <20170911095901.13428-2-joonas.lahtinen@linux.intel.com> References: <20170911095901.13428-1-joonas.lahtinen@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id 116026E34B for ; Mon, 11 Sep 2017 09:59:28 +0000 (UTC) In-Reply-To: <20170911095901.13428-1-joonas.lahtinen@linux.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 graphics driver community testing & development Cc: Jani Nikula , Rodrigo Vivi List-Id: intel-gfx@lists.freedesktop.org Q29udmVydCB0byB1c2UgdGhlIGZyZXNobHkgYXZhaWxhYmxlIG1hZGUgSU5URUxfR0VOX01BU0sg Zm9yIGVhc2llcgpncmVwcGluZyBhbmQgaW1wcm92ZSBmdW5jdGlvbiByZWFkYWJpbGl0eSBhbmQg Y2xhcmlmeSB0aGUgVUFCSQpkb2N1bWVudGF0aW9uLgoKTm8gZnVuY3Rpb25hbCBjaGFuZ2VzLgoK djI6Ci0gTGlmdCBHRU1fQlVHX09OcyBhbmQgdXNlIGlzX3Bvd2VyX29mXzIgKENocmlzKQotIFJl dGFpbiAtRUlOVkFMIG9uIGJhZCBmbGFncyBiZWhhdmlvciAoQ2hyaXMpCgp2MzoKLSBFeHRyYWN0 IGZsYWdzIHdpdGggJ2VudHJ5LT5zaXplIC0gMScgKENocmlzKQoKdjQ6Ci0gQWRkIEdFTV9CVUdf T04gb24gZm9yIGZsYWdzIHZzIGVudHJ5IG9mZnNldCAoQ2hyaXMpCgpTaWduZWQtb2ZmLWJ5OiBK b29uYXMgTGFodGluZW4gPGpvb25hcy5sYWh0aW5lbkBsaW51eC5pbnRlbC5jb20+CkNjOiBUdnJ0 a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgpDYzogQ2hyaXMgV2lsc29uIDxj aHJpc0BjaHJpcy13aWxzb24uY28udWs+ClJldmlld2VkLWJ5OiBDaHJpcyBXaWxzb24gPGNocmlz QGNocmlzLXdpbHNvbi5jby51az4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91bmNv cmUuYyB8IDk1ICsrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0KIGluY2x1ZGUv dWFwaS9kcm0vaTkxNV9kcm0uaCAgICAgICAgIHwgIDYgKystCiAyIGZpbGVzIGNoYW5nZWQsIDQ4 IGluc2VydGlvbnMoKyksIDUzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3VuY29yZS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdW5j b3JlLmMKaW5kZXggMWIzOGViOTRkNDYxLi45MjQyMGUwZWZhMDQgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3VuY29yZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3VuY29yZS5jCkBAIC0xMjkyLDcyICsxMjkyLDY1IEBAIHZvaWQgaW50ZWxfdW5jb3Jl X2Zpbmkoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCWludGVsX3VuY29yZV9m b3JjZXdha2VfcmVzZXQoZGV2X3ByaXYsIGZhbHNlKTsKIH0KIAotI2RlZmluZSBHRU5fUkFOR0Uo bCwgaCkgR0VOTUFTSygoaCkgLSAxLCAobCkgLSAxKQotCi1zdGF0aWMgY29uc3Qgc3RydWN0IHJl Z2lzdGVyX3doaXRlbGlzdCB7Ci0JaTkxNV9yZWdfdCBvZmZzZXRfbGR3LCBvZmZzZXRfdWR3Owot CXVpbnQzMl90IHNpemU7Ci0JLyogc3VwcG9ydGVkIGdlbnMsIDB4MTAgZm9yIDQsIDB4MzAgZm9y IDQgYW5kIDUsIGV0Yy4gKi8KLQl1aW50MzJfdCBnZW5fYml0bWFzazsKLX0gd2hpdGVsaXN0W10g PSB7Ci0JeyAub2Zmc2V0X2xkdyA9IFJJTkdfVElNRVNUQU1QKFJFTkRFUl9SSU5HX0JBU0UpLAot CSAgLm9mZnNldF91ZHcgPSBSSU5HX1RJTUVTVEFNUF9VRFcoUkVOREVSX1JJTkdfQkFTRSksCi0J ICAuc2l6ZSA9IDgsIC5nZW5fYml0bWFzayA9IEdFTl9SQU5HRSg0LCAxMCkgfSwKLX07CitzdGF0 aWMgY29uc3Qgc3RydWN0IHJlZ193aGl0ZWxpc3QgeworCWk5MTVfcmVnX3Qgb2Zmc2V0X2xkdzsK KwlpOTE1X3JlZ190IG9mZnNldF91ZHc7CisJdW5zaWduZWQgbG9uZyBnZW5fbWFzazsKKwl1OCBz aXplOworfSByZWdfcmVhZF93aGl0ZWxpc3RbXSA9IHt7CisJLm9mZnNldF9sZHcgPSBSSU5HX1RJ TUVTVEFNUChSRU5ERVJfUklOR19CQVNFKSwKKwkub2Zmc2V0X3VkdyA9IFJJTkdfVElNRVNUQU1Q X1VEVyhSRU5ERVJfUklOR19CQVNFKSwKKwkuZ2VuX21hc2sgPSBJTlRFTF9HRU5fTUFTSyg0LCAx MCksCisJLnNpemUgPSA4Cit9fTsKIAogaW50IGk5MTVfcmVnX3JlYWRfaW9jdGwoc3RydWN0IGRy bV9kZXZpY2UgKmRldiwKIAkJCXZvaWQgKmRhdGEsIHN0cnVjdCBkcm1fZmlsZSAqZmlsZSkKIHsK IAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CiAJc3Ry dWN0IGRybV9pOTE1X3JlZ19yZWFkICpyZWcgPSBkYXRhOwotCXN0cnVjdCByZWdpc3Rlcl93aGl0 ZWxpc3QgY29uc3QgKmVudHJ5ID0gd2hpdGVsaXN0OwotCXVuc2lnbmVkIHNpemU7Ci0JaTkxNV9y ZWdfdCBvZmZzZXRfbGR3LCBvZmZzZXRfdWR3OwotCWludCBpLCByZXQgPSAwOwotCi0JZm9yIChp ID0gMDsgaSA8IEFSUkFZX1NJWkUod2hpdGVsaXN0KTsgaSsrLCBlbnRyeSsrKSB7Ci0JCWlmIChp OTE1X21taW9fcmVnX29mZnNldChlbnRyeS0+b2Zmc2V0X2xkdykgPT0gKHJlZy0+b2Zmc2V0ICYg LWVudHJ5LT5zaXplKSAmJgotCQkgICAgKElOVEVMX0lORk8oZGV2X3ByaXYpLT5nZW5fbWFzayAm IGVudHJ5LT5nZW5fYml0bWFzaykpCisJc3RydWN0IHJlZ193aGl0ZWxpc3QgY29uc3QgKmVudHJ5 OworCXVuc2lnbmVkIGZsYWdzOworCWludCByZW1haW47CisJaW50IHJldCA9IDA7CisKKwllbnRy eSA9IHJlZ19yZWFkX3doaXRlbGlzdDsKKwlyZW1haW4gPSBBUlJBWV9TSVpFKHJlZ19yZWFkX3do aXRlbGlzdCk7CisJd2hpbGUgKHJlbWFpbikgeworCQl1MzIgZW50cnlfb2Zmc2V0ID0gaTkxNV9t bWlvX3JlZ19vZmZzZXQoZW50cnktPm9mZnNldF9sZHcpOworCisJCUdFTV9CVUdfT04oIWlzX3Bv d2VyX29mXzIoZW50cnktPnNpemUpKTsKKwkJR0VNX0JVR19PTihlbnRyeS0+c2l6ZSA+IDgpOwor CQlHRU1fQlVHX09OKGVudHJ5X29mZnNldCAmIChlbnRyeS0+c2l6ZSAtIDEpKTsKKworCQlpZiAo SU5URUxfSU5GTyhkZXZfcHJpdiktPmdlbl9tYXNrICYgZW50cnktPmdlbl9tYXNrICYmCisJCSAg ICBlbnRyeV9vZmZzZXQgPT0gKHJlZy0+b2Zmc2V0ICYgLWVudHJ5LT5zaXplKSkKIAkJCWJyZWFr OworCQllbnRyeSsrOworCQlyZW1haW4tLTsKIAl9CiAKLQlpZiAoaSA9PSBBUlJBWV9TSVpFKHdo aXRlbGlzdCkpCisJaWYgKCFyZW1haW4pCiAJCXJldHVybiAtRUlOVkFMOwogCi0JLyogV2UgdXNl IHRoZSBsb3cgYml0cyB0byBlbmNvZGUgZXh0cmEgZmxhZ3MgYXMgdGhlIHJlZ2lzdGVyIHNob3Vs ZAotCSAqIGJlIG5hdHVyYWxseSBhbGlnbmVkIChhbmQgdGhvc2UgdGhhdCBhcmUgbm90IHNvIGFs aWduZWQgbWVyZWx5Ci0JICogbGltaXQgdGhlIGF2YWlsYWJsZSBmbGFncyBmb3IgdGhhdCByZWdp c3RlcikuCi0JICovCi0Jb2Zmc2V0X2xkdyA9IGVudHJ5LT5vZmZzZXRfbGR3OwotCW9mZnNldF91 ZHcgPSBlbnRyeS0+b2Zmc2V0X3VkdzsKLQlzaXplID0gZW50cnktPnNpemU7Ci0Jc2l6ZSB8PSBy ZWctPm9mZnNldCBeIGk5MTVfbW1pb19yZWdfb2Zmc2V0KG9mZnNldF9sZHcpOworCWZsYWdzID0g cmVnLT5vZmZzZXQgJiAoZW50cnktPnNpemUgLSAxKTsKIAogCWludGVsX3J1bnRpbWVfcG1fZ2V0 KGRldl9wcml2KTsKLQotCXN3aXRjaCAoc2l6ZSkgewotCWNhc2UgOCB8IDE6Ci0JCXJlZy0+dmFs ID0gSTkxNV9SRUFENjRfMngzMihvZmZzZXRfbGR3LCBvZmZzZXRfdWR3KTsKLQkJYnJlYWs7Ci0J Y2FzZSA4OgotCQlyZWctPnZhbCA9IEk5MTVfUkVBRDY0KG9mZnNldF9sZHcpOwotCQlicmVhazsK LQljYXNlIDQ6Ci0JCXJlZy0+dmFsID0gSTkxNV9SRUFEKG9mZnNldF9sZHcpOwotCQlicmVhazsK LQljYXNlIDI6Ci0JCXJlZy0+dmFsID0gSTkxNV9SRUFEMTYob2Zmc2V0X2xkdyk7Ci0JCWJyZWFr OwotCWNhc2UgMToKLQkJcmVnLT52YWwgPSBJOTE1X1JFQUQ4KG9mZnNldF9sZHcpOwotCQlicmVh azsKLQlkZWZhdWx0OgorCWlmIChlbnRyeS0+c2l6ZSA9PSA4ICYmIGZsYWdzID09IEk5MTVfUkVH X1JFQURfOEJfV0EpCisJCXJlZy0+dmFsID0gSTkxNV9SRUFENjRfMngzMihlbnRyeS0+b2Zmc2V0 X2xkdywKKwkJCQkJICAgIGVudHJ5LT5vZmZzZXRfdWR3KTsKKwllbHNlIGlmIChlbnRyeS0+c2l6 ZSA9PSA4ICYmIGZsYWdzID09IDApCisJCXJlZy0+dmFsID0gSTkxNV9SRUFENjQoZW50cnktPm9m ZnNldF9sZHcpOworCWVsc2UgaWYgKGVudHJ5LT5zaXplID09IDQgJiYgZmxhZ3MgPT0gMCkKKwkJ cmVnLT52YWwgPSBJOTE1X1JFQUQoZW50cnktPm9mZnNldF9sZHcpOworCWVsc2UgaWYgKGVudHJ5 LT5zaXplID09IDIgJiYgZmxhZ3MgPT0gMCkKKwkJcmVnLT52YWwgPSBJOTE1X1JFQUQxNihlbnRy eS0+b2Zmc2V0X2xkdyk7CisJZWxzZSBpZiAoZW50cnktPnNpemUgPT0gMSAmJiBmbGFncyA9PSAw KQorCQlyZWctPnZhbCA9IEk5MTVfUkVBRDgoZW50cnktPm9mZnNldF9sZHcpOworCWVsc2UKIAkJ cmV0ID0gLUVJTlZBTDsKLQkJZ290byBvdXQ7Ci0JfQotCi1vdXQ6CiAJaW50ZWxfcnVudGltZV9w bV9wdXQoZGV2X3ByaXYpOworCiAJcmV0dXJuIHJldDsKIH0KIApkaWZmIC0tZ2l0IGEvaW5jbHVk ZS91YXBpL2RybS9pOTE1X2RybS5oIGIvaW5jbHVkZS91YXBpL2RybS9pOTE1X2RybS5oCmluZGV4 IGQ4ZDEwZDkzMjc1OS4uYjQ1MDVkNTU5OTBkIDEwMDY0NAotLS0gYS9pbmNsdWRlL3VhcGkvZHJt L2k5MTVfZHJtLmgKKysrIGIvaW5jbHVkZS91YXBpL2RybS9pOTE1X2RybS5oCkBAIC0xMzA4LDE0 ICsxMzA4LDE2IEBAIHN0cnVjdCBkcm1faTkxNV9yZWdfcmVhZCB7CiAJICogYmUgc3BlY2lmaWVk CiAJICovCiAJX191NjQgb2Zmc2V0OworI2RlZmluZSBJOTE1X1JFR19SRUFEXzhCX1dBIEJJVCgw KQorCiAJX191NjQgdmFsOyAvKiBSZXR1cm4gdmFsdWUgKi8KIH07CiAvKiBLbm93biByZWdpc3Rl cnM6CiAgKgogICogUmVuZGVyIGVuZ2luZSB0aW1lc3RhbXAgLSAweDIzNTggKyA2NGJpdCAtIGdl bjcrCiAgKiAtIE5vdGUgdGhpcyByZWdpc3RlciByZXR1cm5zIGFuIGludmFsaWQgdmFsdWUgaWYg dXNpbmcgdGhlIGRlZmF1bHQKLSAqICAgc2luZ2xlIGluc3RydWN0aW9uIDhieXRlIHJlYWQsIGlu IG9yZGVyIHRvIHdvcmthcm91bmQgdGhhdCB1c2UKLSAqICAgb2Zmc2V0ICgweDI1MzggfCAxKSBp bnN0ZWFkLgorICogICBzaW5nbGUgaW5zdHJ1Y3Rpb24gOGJ5dGUgcmVhZCwgaW4gb3JkZXIgdG8g d29ya2Fyb3VuZCB0aGF0IHBhc3MKKyAqICAgZmxhZyBJOTE1X1JFR19SRUFEXzhCX1dBIGluIG9m ZnNldCBmaWVsZC4KICAqCiAgKi8KIAotLSAKMi4xMy41CgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdm eEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFp bG1hbi9saXN0aW5mby9pbnRlbC1nZngK