From: Joonas Lahtinen Subject: [PATCH v2 2/2] drm/i915: Simplify i915_reg_read_ioctl Date: Fri, 8 Sep 2017 14:49:06 +0300 Message-ID: <20170908114906.9915-2-joonas.lahtinen@linux.intel.com> References: <20170908114906.9915-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 652D76EB26 for ; Fri, 8 Sep 2017 11:49:46 +0000 (UTC) In-Reply-To: <20170908114906.9915-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 dGFpbiAtRUlOVkFMIG9uIGJhZCBmbGFncyBiZWhhdmlvciAoQ2hyaXMpCgpDYzogVHZydGtvIFVy c3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KQ2M6IENocmlzIFdpbHNvbiA8Y2hyaXNA Y2hyaXMtd2lsc29uLmNvLnVrPgpTaWduZWQtb2ZmLWJ5OiBKb29uYXMgTGFodGluZW4gPGpvb25h cy5sYWh0aW5lbkBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfdW5jb3JlLmMgfCA4MSArKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tCiBp bmNsdWRlL3VhcGkvZHJtL2k5MTVfZHJtLmggICAgICAgICB8ICA2ICsrLQogMiBmaWxlcyBjaGFu Z2VkLCA0NCBpbnNlcnRpb25zKCspLCA0MyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91bmNvcmUuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3VuY29yZS5jCmluZGV4IDFiMzhlYjk0ZDQ2MS4uNzRmMTM1ZDI0N2ExIDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91bmNvcmUuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF91bmNvcmUuYwpAQCAtMTI5Miw3MiArMTI5Miw3MSBAQCB2b2lkIGludGVs X3VuY29yZV9maW5pKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAlpbnRlbF91 bmNvcmVfZm9yY2V3YWtlX3Jlc2V0KGRldl9wcml2LCBmYWxzZSk7CiB9CiAKLSNkZWZpbmUgR0VO X1JBTkdFKGwsIGgpIEdFTk1BU0soKGgpIC0gMSwgKGwpIC0gMSkKLQotc3RhdGljIGNvbnN0IHN0 cnVjdCByZWdpc3Rlcl93aGl0ZWxpc3QgewotCWk5MTVfcmVnX3Qgb2Zmc2V0X2xkdywgb2Zmc2V0 X3VkdzsKLQl1aW50MzJfdCBzaXplOwotCS8qIHN1cHBvcnRlZCBnZW5zLCAweDEwIGZvciA0LCAw eDMwIGZvciA0IGFuZCA1LCBldGMuICovCi0JdWludDMyX3QgZ2VuX2JpdG1hc2s7Ci19IHdoaXRl bGlzdFtdID0gewotCXsgLm9mZnNldF9sZHcgPSBSSU5HX1RJTUVTVEFNUChSRU5ERVJfUklOR19C QVNFKSwKLQkgIC5vZmZzZXRfdWR3ID0gUklOR19USU1FU1RBTVBfVURXKFJFTkRFUl9SSU5HX0JB U0UpLAotCSAgLnNpemUgPSA4LCAuZ2VuX2JpdG1hc2sgPSBHRU5fUkFOR0UoNCwgMTApIH0sCi19 Oworc3RhdGljIGNvbnN0IHN0cnVjdCByZWdfd2hpdGVsaXN0IHsKKwlpOTE1X3JlZ190IG9mZnNl dF9sZHc7CisJaTkxNV9yZWdfdCBvZmZzZXRfdWR3OworCXVuc2lnbmVkIGxvbmcgZ2VuX21hc2s7 CisJdTggc2l6ZTsKK30gcmVnX3JlYWRfd2hpdGVsaXN0W10gPSB7eworCS5vZmZzZXRfbGR3ID0g UklOR19USU1FU1RBTVAoUkVOREVSX1JJTkdfQkFTRSksCisJLm9mZnNldF91ZHcgPSBSSU5HX1RJ TUVTVEFNUF9VRFcoUkVOREVSX1JJTkdfQkFTRSksCisJLmdlbl9tYXNrID0gSU5URUxfR0VOX01B U0soNCwgMTApLAorCS5zaXplID0gOAorfX07CiAKIGludCBpOTE1X3JlZ19yZWFkX2lvY3RsKHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCQl2b2lkICpkYXRhLCBzdHJ1Y3QgZHJtX2ZpbGUgKmZp bGUpCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYp OwogCXN0cnVjdCBkcm1faTkxNV9yZWdfcmVhZCAqcmVnID0gZGF0YTsKLQlzdHJ1Y3QgcmVnaXN0 ZXJfd2hpdGVsaXN0IGNvbnN0ICplbnRyeSA9IHdoaXRlbGlzdDsKLQl1bnNpZ25lZCBzaXplOwot CWk5MTVfcmVnX3Qgb2Zmc2V0X2xkdywgb2Zmc2V0X3VkdzsKLQlpbnQgaSwgcmV0ID0gMDsKLQot CWZvciAoaSA9IDA7IGkgPCBBUlJBWV9TSVpFKHdoaXRlbGlzdCk7IGkrKywgZW50cnkrKykgewot CQlpZiAoaTkxNV9tbWlvX3JlZ19vZmZzZXQoZW50cnktPm9mZnNldF9sZHcpID09IChyZWctPm9m ZnNldCAmIC1lbnRyeS0+c2l6ZSkgJiYKLQkJICAgIChJTlRFTF9JTkZPKGRldl9wcml2KS0+Z2Vu X21hc2sgJiBlbnRyeS0+Z2VuX2JpdG1hc2spKQorCXN0cnVjdCByZWdfd2hpdGVsaXN0IGNvbnN0 ICplbnRyeTsKKwl1bnNpZ25lZCBmbGFnczsKKwlpbnQgcmVtYWluOworCWludCByZXQgPSAwOwor CisJZW50cnkgPSByZWdfcmVhZF93aGl0ZWxpc3Q7CisJcmVtYWluID0gQVJSQVlfU0laRShyZWdf cmVhZF93aGl0ZWxpc3QpOworCXdoaWxlIChyZW1haW4pIHsKKwkJaWYgKElOVEVMX0lORk8oZGV2 X3ByaXYpLT5nZW5fbWFzayAmIGVudHJ5LT5nZW5fbWFzayAmJgorCQkgICAgaTkxNV9tbWlvX3Jl Z19vZmZzZXQoZW50cnktPm9mZnNldF9sZHcpID09CisJCQkgICAgKHJlZy0+b2Zmc2V0ICYgLWVu dHJ5LT5zaXplKSkKIAkJCWJyZWFrOworCQllbnRyeSsrOworCQlyZW1haW4tLTsKIAl9CiAKLQlp ZiAoaSA9PSBBUlJBWV9TSVpFKHdoaXRlbGlzdCkpCisJaWYgKCFyZW1haW4pCiAJCXJldHVybiAt RUlOVkFMOwogCi0JLyogV2UgdXNlIHRoZSBsb3cgYml0cyB0byBlbmNvZGUgZXh0cmEgZmxhZ3Mg YXMgdGhlIHJlZ2lzdGVyIHNob3VsZAotCSAqIGJlIG5hdHVyYWxseSBhbGlnbmVkIChhbmQgdGhv c2UgdGhhdCBhcmUgbm90IHNvIGFsaWduZWQgbWVyZWx5Ci0JICogbGltaXQgdGhlIGF2YWlsYWJs ZSBmbGFncyBmb3IgdGhhdCByZWdpc3RlcikuCi0JICovCi0Jb2Zmc2V0X2xkdyA9IGVudHJ5LT5v ZmZzZXRfbGR3OwotCW9mZnNldF91ZHcgPSBlbnRyeS0+b2Zmc2V0X3VkdzsKLQlzaXplID0gZW50 cnktPnNpemU7Ci0Jc2l6ZSB8PSByZWctPm9mZnNldCBeIGk5MTVfbW1pb19yZWdfb2Zmc2V0KG9m ZnNldF9sZHcpOworCUdFTV9CVUdfT04oaHdlaWdodDgoZW50cnktPnNpemUpICE9IDEpOworCUdF TV9CVUdfT04oZW50cnktPnNpemUgPiA4KTsKIAotCWludGVsX3J1bnRpbWVfcG1fZ2V0KGRldl9w cml2KTsKKwlmbGFncyA9IHJlZy0+b2Zmc2V0ICYgfmk5MTVfbW1pb19yZWdfb2Zmc2V0KGVudHJ5 LT5vZmZzZXRfbGR3KTsKIAotCXN3aXRjaCAoc2l6ZSkgewotCWNhc2UgOCB8IDE6Ci0JCXJlZy0+ dmFsID0gSTkxNV9SRUFENjRfMngzMihvZmZzZXRfbGR3LCBvZmZzZXRfdWR3KTsKLQkJYnJlYWs7 CisJaW50ZWxfcnVudGltZV9wbV9nZXQoZGV2X3ByaXYpOworCXN3aXRjaCAoZW50cnktPnNpemUp IHsKIAljYXNlIDg6Ci0JCXJlZy0+dmFsID0gSTkxNV9SRUFENjQob2Zmc2V0X2xkdyk7CisJCWlm IChmbGFncyAmIEk5MTVfUkVHX1JFQURfOEJfV0EpCisJCQlyZWctPnZhbCA9IEk5MTVfUkVBRDY0 XzJ4MzIoZW50cnktPm9mZnNldF9sZHcsCisJCQkJCQkgICAgZW50cnktPm9mZnNldF91ZHcpOwor CQllbHNlCisJCQlyZWctPnZhbCA9IEk5MTVfUkVBRDY0KGVudHJ5LT5vZmZzZXRfbGR3KTsKIAkJ YnJlYWs7CiAJY2FzZSA0OgotCQlyZWctPnZhbCA9IEk5MTVfUkVBRChvZmZzZXRfbGR3KTsKKwkJ cmVnLT52YWwgPSBJOTE1X1JFQUQoZW50cnktPm9mZnNldF9sZHcpOwogCQlicmVhazsKIAljYXNl IDI6Ci0JCXJlZy0+dmFsID0gSTkxNV9SRUFEMTYob2Zmc2V0X2xkdyk7CisJCXJlZy0+dmFsID0g STkxNV9SRUFEMTYoZW50cnktPm9mZnNldF9sZHcpOwogCQlicmVhazsKIAljYXNlIDE6Ci0JCXJl Zy0+dmFsID0gSTkxNV9SRUFEOChvZmZzZXRfbGR3KTsKKwkJcmVnLT52YWwgPSBJOTE1X1JFQUQ4 KGVudHJ5LT5vZmZzZXRfbGR3KTsKIAkJYnJlYWs7CiAJZGVmYXVsdDoKIAkJcmV0ID0gLUVJTlZB TDsKLQkJZ290byBvdXQ7CisJCWJyZWFrOwogCX0KLQotb3V0OgogCWludGVsX3J1bnRpbWVfcG1f cHV0KGRldl9wcml2KTsKKwogCXJldHVybiByZXQ7CiB9CiAKZGlmZiAtLWdpdCBhL2luY2x1ZGUv dWFwaS9kcm0vaTkxNV9kcm0uaCBiL2luY2x1ZGUvdWFwaS9kcm0vaTkxNV9kcm0uaAppbmRleCBk OGQxMGQ5MzI3NTkuLmI0NTA1ZDU1OTkwZCAxMDA2NDQKLS0tIGEvaW5jbHVkZS91YXBpL2RybS9p OTE1X2RybS5oCisrKyBiL2luY2x1ZGUvdWFwaS9kcm0vaTkxNV9kcm0uaApAQCAtMTMwOCwxNCAr MTMwOCwxNiBAQCBzdHJ1Y3QgZHJtX2k5MTVfcmVnX3JlYWQgewogCSAqIGJlIHNwZWNpZmllZAog CSAqLwogCV9fdTY0IG9mZnNldDsKKyNkZWZpbmUgSTkxNV9SRUdfUkVBRF84Ql9XQSBCSVQoMCkK KwogCV9fdTY0IHZhbDsgLyogUmV0dXJuIHZhbHVlICovCiB9OwogLyogS25vd24gcmVnaXN0ZXJz OgogICoKICAqIFJlbmRlciBlbmdpbmUgdGltZXN0YW1wIC0gMHgyMzU4ICsgNjRiaXQgLSBnZW43 KwogICogLSBOb3RlIHRoaXMgcmVnaXN0ZXIgcmV0dXJucyBhbiBpbnZhbGlkIHZhbHVlIGlmIHVz aW5nIHRoZSBkZWZhdWx0Ci0gKiAgIHNpbmdsZSBpbnN0cnVjdGlvbiA4Ynl0ZSByZWFkLCBpbiBv cmRlciB0byB3b3JrYXJvdW5kIHRoYXQgdXNlCi0gKiAgIG9mZnNldCAoMHgyNTM4IHwgMSkgaW5z dGVhZC4KKyAqICAgc2luZ2xlIGluc3RydWN0aW9uIDhieXRlIHJlYWQsIGluIG9yZGVyIHRvIHdv cmthcm91bmQgdGhhdCBwYXNzCisgKiAgIGZsYWcgSTkxNV9SRUdfUkVBRF84Ql9XQSBpbiBvZmZz ZXQgZmllbGQuCiAgKgogICovCiAKLS0gCjIuMTMuNQoKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhA bGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxt YW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==