From: Joonas Lahtinen Subject: [PATCH v6 2/2] drm/i915: Simplify i915_reg_read_ioctl Date: Mon, 11 Sep 2017 15:32:03 +0300 Message-ID: <20170911123203.19867-2-joonas.lahtinen@linux.intel.com> References: <20170911123203.19867-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 mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id 669AE6E3AB for ; Mon, 11 Sep 2017 12:32:25 +0000 (UTC) In-Reply-To: <20170911123203.19867-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 T04gb24gZm9yIGZsYWdzIHZzIGVudHJ5IG9mZnNldCAoQ2hyaXMpCgp2NToKLSBVc2UgJ3UxNicg dG8gbWF0Y2ggJ2Rldl9wcml2JyAoVmlsbGUpCgpTaWduZWQtb2ZmLWJ5OiBKb29uYXMgTGFodGlu ZW4gPGpvb25hcy5sYWh0aW5lbkBsaW51eC5pbnRlbC5jb20+CkNjOiBUdnJ0a28gVXJzdWxpbiA8 dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgpDYzogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13 aWxzb24uY28udWs+CkNjOiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50 ZWwuY29tPgpSZXZpZXdlZC1ieTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28u dWs+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdW5jb3JlLmMgfCA5NSArKysrKysr KysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tCiBpbmNsdWRlL3VhcGkvZHJtL2k5MTVfZHJt LmggICAgICAgICB8ICA2ICsrLQogMiBmaWxlcyBjaGFuZ2VkLCA0OCBpbnNlcnRpb25zKCspLCA1 MyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91 bmNvcmUuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VuY29yZS5jCmluZGV4IDFiMzhl Yjk0ZDQ2MS4uNjM4ZWFmMjFkYmNlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF91bmNvcmUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91bmNvcmUuYwpA QCAtMTI5Miw3MiArMTI5Miw2NSBAQCB2b2lkIGludGVsX3VuY29yZV9maW5pKHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAlpbnRlbF91bmNvcmVfZm9yY2V3YWtlX3Jlc2V0KGRl dl9wcml2LCBmYWxzZSk7CiB9CiAKLSNkZWZpbmUgR0VOX1JBTkdFKGwsIGgpIEdFTk1BU0soKGgp IC0gMSwgKGwpIC0gMSkKLQotc3RhdGljIGNvbnN0IHN0cnVjdCByZWdpc3Rlcl93aGl0ZWxpc3Qg ewotCWk5MTVfcmVnX3Qgb2Zmc2V0X2xkdywgb2Zmc2V0X3VkdzsKLQl1aW50MzJfdCBzaXplOwot CS8qIHN1cHBvcnRlZCBnZW5zLCAweDEwIGZvciA0LCAweDMwIGZvciA0IGFuZCA1LCBldGMuICov Ci0JdWludDMyX3QgZ2VuX2JpdG1hc2s7Ci19IHdoaXRlbGlzdFtdID0gewotCXsgLm9mZnNldF9s ZHcgPSBSSU5HX1RJTUVTVEFNUChSRU5ERVJfUklOR19CQVNFKSwKLQkgIC5vZmZzZXRfdWR3ID0g UklOR19USU1FU1RBTVBfVURXKFJFTkRFUl9SSU5HX0JBU0UpLAotCSAgLnNpemUgPSA4LCAuZ2Vu X2JpdG1hc2sgPSBHRU5fUkFOR0UoNCwgMTApIH0sCi19Oworc3RhdGljIGNvbnN0IHN0cnVjdCBy ZWdfd2hpdGVsaXN0IHsKKwlpOTE1X3JlZ190IG9mZnNldF9sZHc7CisJaTkxNV9yZWdfdCBvZmZz ZXRfdWR3OworCXUxNiBnZW5fbWFzazsKKwl1OCBzaXplOworfSByZWdfcmVhZF93aGl0ZWxpc3Rb XSA9IHt7CisJLm9mZnNldF9sZHcgPSBSSU5HX1RJTUVTVEFNUChSRU5ERVJfUklOR19CQVNFKSwK Kwkub2Zmc2V0X3VkdyA9IFJJTkdfVElNRVNUQU1QX1VEVyhSRU5ERVJfUklOR19CQVNFKSwKKwku Z2VuX21hc2sgPSBJTlRFTF9HRU5fTUFTSyg0LCAxMCksCisJLnNpemUgPSA4Cit9fTsKIAogaW50 IGk5MTVfcmVnX3JlYWRfaW9jdGwoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJCXZvaWQgKmRh dGEsIHN0cnVjdCBkcm1fZmlsZSAqZmlsZSkKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CiAJc3RydWN0IGRybV9pOTE1X3JlZ19yZWFkICpyZWcg PSBkYXRhOwotCXN0cnVjdCByZWdpc3Rlcl93aGl0ZWxpc3QgY29uc3QgKmVudHJ5ID0gd2hpdGVs aXN0OwotCXVuc2lnbmVkIHNpemU7Ci0JaTkxNV9yZWdfdCBvZmZzZXRfbGR3LCBvZmZzZXRfdWR3 OwotCWludCBpLCByZXQgPSAwOwotCi0JZm9yIChpID0gMDsgaSA8IEFSUkFZX1NJWkUod2hpdGVs aXN0KTsgaSsrLCBlbnRyeSsrKSB7Ci0JCWlmIChpOTE1X21taW9fcmVnX29mZnNldChlbnRyeS0+ b2Zmc2V0X2xkdykgPT0gKHJlZy0+b2Zmc2V0ICYgLWVudHJ5LT5zaXplKSAmJgotCQkgICAgKElO VEVMX0lORk8oZGV2X3ByaXYpLT5nZW5fbWFzayAmIGVudHJ5LT5nZW5fYml0bWFzaykpCisJc3Ry dWN0IHJlZ193aGl0ZWxpc3QgY29uc3QgKmVudHJ5OworCXVuc2lnbmVkIGZsYWdzOworCWludCBy ZW1haW47CisJaW50IHJldCA9IDA7CisKKwllbnRyeSA9IHJlZ19yZWFkX3doaXRlbGlzdDsKKwly ZW1haW4gPSBBUlJBWV9TSVpFKHJlZ19yZWFkX3doaXRlbGlzdCk7CisJd2hpbGUgKHJlbWFpbikg eworCQl1MzIgZW50cnlfb2Zmc2V0ID0gaTkxNV9tbWlvX3JlZ19vZmZzZXQoZW50cnktPm9mZnNl dF9sZHcpOworCisJCUdFTV9CVUdfT04oIWlzX3Bvd2VyX29mXzIoZW50cnktPnNpemUpKTsKKwkJ R0VNX0JVR19PTihlbnRyeS0+c2l6ZSA+IDgpOworCQlHRU1fQlVHX09OKGVudHJ5X29mZnNldCAm IChlbnRyeS0+c2l6ZSAtIDEpKTsKKworCQlpZiAoSU5URUxfSU5GTyhkZXZfcHJpdiktPmdlbl9t YXNrICYgZW50cnktPmdlbl9tYXNrICYmCisJCSAgICBlbnRyeV9vZmZzZXQgPT0gKHJlZy0+b2Zm c2V0ICYgLWVudHJ5LT5zaXplKSkKIAkJCWJyZWFrOworCQllbnRyeSsrOworCQlyZW1haW4tLTsK IAl9CiAKLQlpZiAoaSA9PSBBUlJBWV9TSVpFKHdoaXRlbGlzdCkpCisJaWYgKCFyZW1haW4pCiAJ CXJldHVybiAtRUlOVkFMOwogCi0JLyogV2UgdXNlIHRoZSBsb3cgYml0cyB0byBlbmNvZGUgZXh0 cmEgZmxhZ3MgYXMgdGhlIHJlZ2lzdGVyIHNob3VsZAotCSAqIGJlIG5hdHVyYWxseSBhbGlnbmVk IChhbmQgdGhvc2UgdGhhdCBhcmUgbm90IHNvIGFsaWduZWQgbWVyZWx5Ci0JICogbGltaXQgdGhl IGF2YWlsYWJsZSBmbGFncyBmb3IgdGhhdCByZWdpc3RlcikuCi0JICovCi0Jb2Zmc2V0X2xkdyA9 IGVudHJ5LT5vZmZzZXRfbGR3OwotCW9mZnNldF91ZHcgPSBlbnRyeS0+b2Zmc2V0X3VkdzsKLQlz aXplID0gZW50cnktPnNpemU7Ci0Jc2l6ZSB8PSByZWctPm9mZnNldCBeIGk5MTVfbW1pb19yZWdf b2Zmc2V0KG9mZnNldF9sZHcpOworCWZsYWdzID0gcmVnLT5vZmZzZXQgJiAoZW50cnktPnNpemUg LSAxKTsKIAogCWludGVsX3J1bnRpbWVfcG1fZ2V0KGRldl9wcml2KTsKLQotCXN3aXRjaCAoc2l6 ZSkgewotCWNhc2UgOCB8IDE6Ci0JCXJlZy0+dmFsID0gSTkxNV9SRUFENjRfMngzMihvZmZzZXRf bGR3LCBvZmZzZXRfdWR3KTsKLQkJYnJlYWs7Ci0JY2FzZSA4OgotCQlyZWctPnZhbCA9IEk5MTVf UkVBRDY0KG9mZnNldF9sZHcpOwotCQlicmVhazsKLQljYXNlIDQ6Ci0JCXJlZy0+dmFsID0gSTkx NV9SRUFEKG9mZnNldF9sZHcpOwotCQlicmVhazsKLQljYXNlIDI6Ci0JCXJlZy0+dmFsID0gSTkx NV9SRUFEMTYob2Zmc2V0X2xkdyk7Ci0JCWJyZWFrOwotCWNhc2UgMToKLQkJcmVnLT52YWwgPSBJ OTE1X1JFQUQ4KG9mZnNldF9sZHcpOwotCQlicmVhazsKLQlkZWZhdWx0OgorCWlmIChlbnRyeS0+ c2l6ZSA9PSA4ICYmIGZsYWdzID09IEk5MTVfUkVHX1JFQURfOEJfV0EpCisJCXJlZy0+dmFsID0g STkxNV9SRUFENjRfMngzMihlbnRyeS0+b2Zmc2V0X2xkdywKKwkJCQkJICAgIGVudHJ5LT5vZmZz ZXRfdWR3KTsKKwllbHNlIGlmIChlbnRyeS0+c2l6ZSA9PSA4ICYmIGZsYWdzID09IDApCisJCXJl Zy0+dmFsID0gSTkxNV9SRUFENjQoZW50cnktPm9mZnNldF9sZHcpOworCWVsc2UgaWYgKGVudHJ5 LT5zaXplID09IDQgJiYgZmxhZ3MgPT0gMCkKKwkJcmVnLT52YWwgPSBJOTE1X1JFQUQoZW50cnkt Pm9mZnNldF9sZHcpOworCWVsc2UgaWYgKGVudHJ5LT5zaXplID09IDIgJiYgZmxhZ3MgPT0gMCkK KwkJcmVnLT52YWwgPSBJOTE1X1JFQUQxNihlbnRyeS0+b2Zmc2V0X2xkdyk7CisJZWxzZSBpZiAo ZW50cnktPnNpemUgPT0gMSAmJiBmbGFncyA9PSAwKQorCQlyZWctPnZhbCA9IEk5MTVfUkVBRDgo ZW50cnktPm9mZnNldF9sZHcpOworCWVsc2UKIAkJcmV0ID0gLUVJTlZBTDsKLQkJZ290byBvdXQ7 Ci0JfQotCi1vdXQ6CiAJaW50ZWxfcnVudGltZV9wbV9wdXQoZGV2X3ByaXYpOworCiAJcmV0dXJu IHJldDsKIH0KIApkaWZmIC0tZ2l0IGEvaW5jbHVkZS91YXBpL2RybS9pOTE1X2RybS5oIGIvaW5j bHVkZS91YXBpL2RybS9pOTE1X2RybS5oCmluZGV4IGQ4ZDEwZDkzMjc1OS4uYjQ1MDVkNTU5OTBk IDEwMDY0NAotLS0gYS9pbmNsdWRlL3VhcGkvZHJtL2k5MTVfZHJtLmgKKysrIGIvaW5jbHVkZS91 YXBpL2RybS9pOTE1X2RybS5oCkBAIC0xMzA4LDE0ICsxMzA4LDE2IEBAIHN0cnVjdCBkcm1faTkx NV9yZWdfcmVhZCB7CiAJICogYmUgc3BlY2lmaWVkCiAJICovCiAJX191NjQgb2Zmc2V0OworI2Rl ZmluZSBJOTE1X1JFR19SRUFEXzhCX1dBIEJJVCgwKQorCiAJX191NjQgdmFsOyAvKiBSZXR1cm4g dmFsdWUgKi8KIH07CiAvKiBLbm93biByZWdpc3RlcnM6CiAgKgogICogUmVuZGVyIGVuZ2luZSB0 aW1lc3RhbXAgLSAweDIzNTggKyA2NGJpdCAtIGdlbjcrCiAgKiAtIE5vdGUgdGhpcyByZWdpc3Rl ciByZXR1cm5zIGFuIGludmFsaWQgdmFsdWUgaWYgdXNpbmcgdGhlIGRlZmF1bHQKLSAqICAgc2lu Z2xlIGluc3RydWN0aW9uIDhieXRlIHJlYWQsIGluIG9yZGVyIHRvIHdvcmthcm91bmQgdGhhdCB1 c2UKLSAqICAgb2Zmc2V0ICgweDI1MzggfCAxKSBpbnN0ZWFkLgorICogICBzaW5nbGUgaW5zdHJ1 Y3Rpb24gOGJ5dGUgcmVhZCwgaW4gb3JkZXIgdG8gd29ya2Fyb3VuZCB0aGF0IHBhc3MKKyAqICAg ZmxhZyBJOTE1X1JFR19SRUFEXzhCX1dBIGluIG9mZnNldCBmaWVsZC4KICAqCiAgKi8KIAotLSAK Mi4xMy41CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJ bnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0 cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK