From: Joonas Lahtinen Subject: [PATCH v3 2/2] drm/i915: Simplify i915_reg_read_ioctl Date: Mon, 11 Sep 2017 10:57:19 +0300 Message-ID: <20170911075719.4665-2-joonas.lahtinen@linux.intel.com> References: <20170911075719.4665-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 100A06E2DC for ; Mon, 11 Sep 2017 07:57:45 +0000 (UTC) In-Reply-To: <20170911075719.4665-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 ZWxfdW5jb3JlLmMgfCA5MyArKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tCiBp bmNsdWRlL3VhcGkvZHJtL2k5MTVfZHJtLmggICAgICAgICB8ICA2ICsrLQogMiBmaWxlcyBjaGFu Z2VkLCA0NiBpbnNlcnRpb25zKCspLCA1MyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91bmNvcmUuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3VuY29yZS5jCmluZGV4IDFiMzhlYjk0ZDQ2MS4uNjQ3YmFjZDdjNTZiIDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91bmNvcmUuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF91bmNvcmUuYwpAQCAtMTI5Miw3MiArMTI5Miw2MyBAQCB2b2lkIGludGVs 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 cmVhZF93aGl0ZWxpc3QpOworCXdoaWxlIChyZW1haW4pIHsKKwkJR0VNX0JVR19PTighaXNfcG93 ZXJfb2ZfMihlbnRyeS0+c2l6ZSkpOworCQlHRU1fQlVHX09OKGVudHJ5LT5zaXplID4gOCk7CisK KwkJaWYgKElOVEVMX0lORk8oZGV2X3ByaXYpLT5nZW5fbWFzayAmIGVudHJ5LT5nZW5fbWFzayAm JgorCQkgICAgaTkxNV9tbWlvX3JlZ19vZmZzZXQoZW50cnktPm9mZnNldF9sZHcpID09CisJCQkg ICAgKHJlZy0+b2Zmc2V0ICYgLWVudHJ5LT5zaXplKSkKIAkJCWJyZWFrOworCQllbnRyeSsrOwor CQlyZW1haW4tLTsKIAl9CiAKLQlpZiAoaSA9PSBBUlJBWV9TSVpFKHdoaXRlbGlzdCkpCisJaWYg KCFyZW1haW4pCiAJCXJldHVybiAtRUlOVkFMOwogCi0JLyogV2UgdXNlIHRoZSBsb3cgYml0cyB0 byBlbmNvZGUgZXh0cmEgZmxhZ3MgYXMgdGhlIHJlZ2lzdGVyIHNob3VsZAotCSAqIGJlIG5hdHVy YWxseSBhbGlnbmVkIChhbmQgdGhvc2UgdGhhdCBhcmUgbm90IHNvIGFsaWduZWQgbWVyZWx5Ci0J ICogbGltaXQgdGhlIGF2YWlsYWJsZSBmbGFncyBmb3IgdGhhdCByZWdpc3RlcikuCi0JICovCi0J b2Zmc2V0X2xkdyA9IGVudHJ5LT5vZmZzZXRfbGR3OwotCW9mZnNldF91ZHcgPSBlbnRyeS0+b2Zm c2V0X3VkdzsKLQlzaXplID0gZW50cnktPnNpemU7Ci0Jc2l6ZSB8PSByZWctPm9mZnNldCBeIGk5 MTVfbW1pb19yZWdfb2Zmc2V0KG9mZnNldF9sZHcpOworCWZsYWdzID0gcmVnLT5vZmZzZXQgJiB+ aTkxNV9tbWlvX3JlZ19vZmZzZXQoZW50cnktPm9mZnNldF9sZHcpOwogCiAJaW50ZWxfcnVudGlt ZV9wbV9nZXQoZGV2X3ByaXYpOwotCi0Jc3dpdGNoIChzaXplKSB7Ci0JY2FzZSA4IHwgMToKLQkJ cmVnLT52YWwgPSBJOTE1X1JFQUQ2NF8yeDMyKG9mZnNldF9sZHcsIG9mZnNldF91ZHcpOwotCQli cmVhazsKLQljYXNlIDg6Ci0JCXJlZy0+dmFsID0gSTkxNV9SRUFENjQob2Zmc2V0X2xkdyk7Ci0J CWJyZWFrOwotCWNhc2UgNDoKLQkJcmVnLT52YWwgPSBJOTE1X1JFQUQob2Zmc2V0X2xkdyk7Ci0J CWJyZWFrOwotCWNhc2UgMjoKLQkJcmVnLT52YWwgPSBJOTE1X1JFQUQxNihvZmZzZXRfbGR3KTsK LQkJYnJlYWs7Ci0JY2FzZSAxOgotCQlyZWctPnZhbCA9IEk5MTVfUkVBRDgob2Zmc2V0X2xkdyk7 Ci0JCWJyZWFrOwotCWRlZmF1bHQ6CisJaWYgKGVudHJ5LT5zaXplID09IDggJiYgZmxhZ3MgPT0g STkxNV9SRUdfUkVBRF84Ql9XQSkKKwkJcmVnLT52YWwgPSBJOTE1X1JFQUQ2NF8yeDMyKGVudHJ5 LT5vZmZzZXRfbGR3LAorCQkJCQkgICAgZW50cnktPm9mZnNldF91ZHcpOworCWVsc2UgaWYgKGVu dHJ5LT5zaXplID09IDggJiYgZmxhZ3MgPT0gMCkKKwkJcmVnLT52YWwgPSBJOTE1X1JFQUQ2NChl bnRyeS0+b2Zmc2V0X2xkdyk7CisJZWxzZSBpZiAoZW50cnktPnNpemUgPT0gNCAmJiBmbGFncyA9 PSAwKQorCQlyZWctPnZhbCA9IEk5MTVfUkVBRChlbnRyeS0+b2Zmc2V0X2xkdyk7CisJZWxzZSBp ZiAoZW50cnktPnNpemUgPT0gMiAmJiBmbGFncyA9PSAwKQorCQlyZWctPnZhbCA9IEk5MTVfUkVB RDE2KGVudHJ5LT5vZmZzZXRfbGR3KTsKKwllbHNlIGlmIChlbnRyeS0+c2l6ZSA9PSAxICYmIGZs YWdzID09IDApCisJCXJlZy0+dmFsID0gSTkxNV9SRUFEOChlbnRyeS0+b2Zmc2V0X2xkdyk7CisJ ZWxzZQogCQlyZXQgPSAtRUlOVkFMOwotCQlnb3RvIG91dDsKLQl9Ci0KLW91dDoKIAlpbnRlbF9y dW50aW1lX3BtX3B1dChkZXZfcHJpdik7CisKIAlyZXR1cm4gcmV0OwogfQogCmRpZmYgLS1naXQg YS9pbmNsdWRlL3VhcGkvZHJtL2k5MTVfZHJtLmggYi9pbmNsdWRlL3VhcGkvZHJtL2k5MTVfZHJt LmgKaW5kZXggZDhkMTBkOTMyNzU5Li5iNDUwNWQ1NTk5MGQgMTAwNjQ0Ci0tLSBhL2luY2x1ZGUv dWFwaS9kcm0vaTkxNV9kcm0uaAorKysgYi9pbmNsdWRlL3VhcGkvZHJtL2k5MTVfZHJtLmgKQEAg LTEzMDgsMTQgKzEzMDgsMTYgQEAgc3RydWN0IGRybV9pOTE1X3JlZ19yZWFkIHsKIAkgKiBiZSBz cGVjaWZpZWQKIAkgKi8KIAlfX3U2NCBvZmZzZXQ7CisjZGVmaW5lIEk5MTVfUkVHX1JFQURfOEJf V0EgQklUKDApCisKIAlfX3U2NCB2YWw7IC8qIFJldHVybiB2YWx1ZSAqLwogfTsKIC8qIEtub3du IHJlZ2lzdGVyczoKICAqCiAgKiBSZW5kZXIgZW5naW5lIHRpbWVzdGFtcCAtIDB4MjM1OCArIDY0 Yml0IC0gZ2VuNysKICAqIC0gTm90ZSB0aGlzIHJlZ2lzdGVyIHJldHVybnMgYW4gaW52YWxpZCB2 YWx1ZSBpZiB1c2luZyB0aGUgZGVmYXVsdAotICogICBzaW5nbGUgaW5zdHJ1Y3Rpb24gOGJ5dGUg cmVhZCwgaW4gb3JkZXIgdG8gd29ya2Fyb3VuZCB0aGF0IHVzZQotICogICBvZmZzZXQgKDB4MjUz OCB8IDEpIGluc3RlYWQuCisgKiAgIHNpbmdsZSBpbnN0cnVjdGlvbiA4Ynl0ZSByZWFkLCBpbiBv cmRlciB0byB3b3JrYXJvdW5kIHRoYXQgcGFzcworICogICBmbGFnIEk5MTVfUkVHX1JFQURfOEJf V0EgaW4gb2Zmc2V0IGZpZWxkLgogICoKICAqLwogCi0tIAoyLjEzLjUKCl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QK SW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9w Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=