From: Joonas Lahtinen Subject: [PATCH 2/2] drm/i915: Simplify i915_reg_read_ioctl Date: Fri, 8 Sep 2017 12:29:35 +0300 Message-ID: <20170908092935.1278-2-joonas.lahtinen@linux.intel.com> References: <20170908092935.1278-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 mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id DFDB16EAEB for ; Fri, 8 Sep 2017 09:30:09 +0000 (UTC) In-Reply-To: <20170908092935.1278-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 Q2M6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+CkNjOiBDaHJpcyBX aWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KU2lnbmVkLW9mZi1ieTogSm9vbmFzIExh aHRpbmVuIDxqb29uYXMubGFodGluZW5AbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3VuY29yZS5jIHwgODEgKysrKysrKysrKysrKysrKysrLS0tLS0tLS0t LS0tLS0tLS0tLQogaW5jbHVkZS91YXBpL2RybS9pOTE1X2RybS5oICAgICAgICAgfCAgNiArKy0K IDIgZmlsZXMgY2hhbmdlZCwgNDQgaW5zZXJ0aW9ucygrKSwgNDMgZGVsZXRpb25zKC0pCgpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdW5jb3JlLmMgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF91bmNvcmUuYwppbmRleCAxYjM4ZWI5NGQ0NjEuLjc0ZjEzNWQyNDdh MSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdW5jb3JlLmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdW5jb3JlLmMKQEAgLTEyOTIsNzIgKzEyOTIsNzEg QEAgdm9pZCBpbnRlbF91bmNvcmVfZmluaShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYpCiAJaW50ZWxfdW5jb3JlX2ZvcmNld2FrZV9yZXNldChkZXZfcHJpdiwgZmFsc2UpOwogfQog Ci0jZGVmaW5lIEdFTl9SQU5HRShsLCBoKSBHRU5NQVNLKChoKSAtIDEsIChsKSAtIDEpCi0KLXN0 YXRpYyBjb25zdCBzdHJ1Y3QgcmVnaXN0ZXJfd2hpdGVsaXN0IHsKLQlpOTE1X3JlZ190IG9mZnNl dF9sZHcsIG9mZnNldF91ZHc7Ci0JdWludDMyX3Qgc2l6ZTsKLQkvKiBzdXBwb3J0ZWQgZ2Vucywg MHgxMCBmb3IgNCwgMHgzMCBmb3IgNCBhbmQgNSwgZXRjLiAqLwotCXVpbnQzMl90IGdlbl9iaXRt YXNrOwotfSB3aGl0ZWxpc3RbXSA9IHsKLQl7IC5vZmZzZXRfbGR3ID0gUklOR19USU1FU1RBTVAo UkVOREVSX1JJTkdfQkFTRSksCi0JICAub2Zmc2V0X3VkdyA9IFJJTkdfVElNRVNUQU1QX1VEVyhS RU5ERVJfUklOR19CQVNFKSwKLQkgIC5zaXplID0gOCwgLmdlbl9iaXRtYXNrID0gR0VOX1JBTkdF KDQsIDEwKSB9LAotfTsKK3N0YXRpYyBjb25zdCBzdHJ1Y3QgcmVnX3doaXRlbGlzdCB7CisJaTkx NV9yZWdfdCBvZmZzZXRfbGR3OworCWk5MTVfcmVnX3Qgb2Zmc2V0X3VkdzsKKwl1bnNpZ25lZCBs b25nIGdlbl9tYXNrOworCXU4IHNpemU7Cit9IHJlZ19yZWFkX3doaXRlbGlzdFtdID0ge3sKKwku b2Zmc2V0X2xkdyA9IFJJTkdfVElNRVNUQU1QKFJFTkRFUl9SSU5HX0JBU0UpLAorCS5vZmZzZXRf dWR3ID0gUklOR19USU1FU1RBTVBfVURXKFJFTkRFUl9SSU5HX0JBU0UpLAorCS5nZW5fbWFzayA9 IElOVEVMX0dFTl9NQVNLKDQsIDEwKSwKKwkuc2l6ZSA9IDgKK319OwogCiBpbnQgaTkxNV9yZWdf cmVhZF9pb2N0bChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQkJdm9pZCAqZGF0YSwgc3RydWN0 IGRybV9maWxlICpmaWxlKQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9 IHRvX2k5MTUoZGV2KTsKIAlzdHJ1Y3QgZHJtX2k5MTVfcmVnX3JlYWQgKnJlZyA9IGRhdGE7Ci0J c3RydWN0IHJlZ2lzdGVyX3doaXRlbGlzdCBjb25zdCAqZW50cnkgPSB3aGl0ZWxpc3Q7Ci0JdW5z aWduZWQgc2l6ZTsKLQlpOTE1X3JlZ190IG9mZnNldF9sZHcsIG9mZnNldF91ZHc7Ci0JaW50IGks IHJldCA9IDA7Ci0KLQlmb3IgKGkgPSAwOyBpIDwgQVJSQVlfU0laRSh3aGl0ZWxpc3QpOyBpKyss IGVudHJ5KyspIHsKLQkJaWYgKGk5MTVfbW1pb19yZWdfb2Zmc2V0KGVudHJ5LT5vZmZzZXRfbGR3 KSA9PSAocmVnLT5vZmZzZXQgJiAtZW50cnktPnNpemUpICYmCi0JCSAgICAoSU5URUxfSU5GTyhk ZXZfcHJpdiktPmdlbl9tYXNrICYgZW50cnktPmdlbl9iaXRtYXNrKSkKKwlzdHJ1Y3QgcmVnX3do aXRlbGlzdCBjb25zdCAqZW50cnk7CisJdW5zaWduZWQgZmxhZ3M7CisJaW50IHJlbWFpbjsKKwlp bnQgcmV0ID0gMDsKKworCWVudHJ5ID0gcmVnX3JlYWRfd2hpdGVsaXN0OworCXJlbWFpbiA9IEFS UkFZX1NJWkUocmVnX3JlYWRfd2hpdGVsaXN0KTsKKwl3aGlsZSAocmVtYWluKSB7CisJCWlmIChJ TlRFTF9JTkZPKGRldl9wcml2KS0+Z2VuX21hc2sgJiBlbnRyeS0+Z2VuX21hc2sgJiYKKwkJICAg IGk5MTVfbW1pb19yZWdfb2Zmc2V0KGVudHJ5LT5vZmZzZXRfbGR3KSA9PQorCQkJICAgIChyZWct Pm9mZnNldCAmIC1lbnRyeS0+c2l6ZSkpCiAJCQlicmVhazsKKwkJZW50cnkrKzsKKwkJcmVtYWlu LS07CiAJfQogCi0JaWYgKGkgPT0gQVJSQVlfU0laRSh3aGl0ZWxpc3QpKQorCWlmICghcmVtYWlu KQogCQlyZXR1cm4gLUVJTlZBTDsKIAotCS8qIFdlIHVzZSB0aGUgbG93IGJpdHMgdG8gZW5jb2Rl IGV4dHJhIGZsYWdzIGFzIHRoZSByZWdpc3RlciBzaG91bGQKLQkgKiBiZSBuYXR1cmFsbHkgYWxp Z25lZCAoYW5kIHRob3NlIHRoYXQgYXJlIG5vdCBzbyBhbGlnbmVkIG1lcmVseQotCSAqIGxpbWl0 IHRoZSBhdmFpbGFibGUgZmxhZ3MgZm9yIHRoYXQgcmVnaXN0ZXIpLgotCSAqLwotCW9mZnNldF9s ZHcgPSBlbnRyeS0+b2Zmc2V0X2xkdzsKLQlvZmZzZXRfdWR3ID0gZW50cnktPm9mZnNldF91ZHc7 Ci0Jc2l6ZSA9IGVudHJ5LT5zaXplOwotCXNpemUgfD0gcmVnLT5vZmZzZXQgXiBpOTE1X21taW9f cmVnX29mZnNldChvZmZzZXRfbGR3KTsKKwlHRU1fQlVHX09OKGh3ZWlnaHQ4KGVudHJ5LT5zaXpl KSAhPSAxKTsKKwlHRU1fQlVHX09OKGVudHJ5LT5zaXplID4gOCk7CiAKLQlpbnRlbF9ydW50aW1l X3BtX2dldChkZXZfcHJpdik7CisJZmxhZ3MgPSByZWctPm9mZnNldCAmIH5pOTE1X21taW9fcmVn X29mZnNldChlbnRyeS0+b2Zmc2V0X2xkdyk7CiAKLQlzd2l0Y2ggKHNpemUpIHsKLQljYXNlIDgg fCAxOgotCQlyZWctPnZhbCA9IEk5MTVfUkVBRDY0XzJ4MzIob2Zmc2V0X2xkdywgb2Zmc2V0X3Vk dyk7Ci0JCWJyZWFrOworCWludGVsX3J1bnRpbWVfcG1fZ2V0KGRldl9wcml2KTsKKwlzd2l0Y2gg KGVudHJ5LT5zaXplKSB7CiAJY2FzZSA4OgotCQlyZWctPnZhbCA9IEk5MTVfUkVBRDY0KG9mZnNl dF9sZHcpOworCQlpZiAoZmxhZ3MgJiBJOTE1X1JFR19SRUFEXzhCX1dBKQorCQkJcmVnLT52YWwg PSBJOTE1X1JFQUQ2NF8yeDMyKGVudHJ5LT5vZmZzZXRfbGR3LAorCQkJCQkJICAgIGVudHJ5LT5v ZmZzZXRfdWR3KTsKKwkJZWxzZQorCQkJcmVnLT52YWwgPSBJOTE1X1JFQUQ2NChlbnRyeS0+b2Zm c2V0X2xkdyk7CiAJCWJyZWFrOwogCWNhc2UgNDoKLQkJcmVnLT52YWwgPSBJOTE1X1JFQUQob2Zm c2V0X2xkdyk7CisJCXJlZy0+dmFsID0gSTkxNV9SRUFEKGVudHJ5LT5vZmZzZXRfbGR3KTsKIAkJ YnJlYWs7CiAJY2FzZSAyOgotCQlyZWctPnZhbCA9IEk5MTVfUkVBRDE2KG9mZnNldF9sZHcpOwor CQlyZWctPnZhbCA9IEk5MTVfUkVBRDE2KGVudHJ5LT5vZmZzZXRfbGR3KTsKIAkJYnJlYWs7CiAJ Y2FzZSAxOgotCQlyZWctPnZhbCA9IEk5MTVfUkVBRDgob2Zmc2V0X2xkdyk7CisJCXJlZy0+dmFs ID0gSTkxNV9SRUFEOChlbnRyeS0+b2Zmc2V0X2xkdyk7CiAJCWJyZWFrOwogCWRlZmF1bHQ6CiAJ CXJldCA9IC1FSU5WQUw7Ci0JCWdvdG8gb3V0OworCQlicmVhazsKIAl9Ci0KLW91dDoKIAlpbnRl bF9ydW50aW1lX3BtX3B1dChkZXZfcHJpdik7CisKIAlyZXR1cm4gcmV0OwogfQogCmRpZmYgLS1n aXQgYS9pbmNsdWRlL3VhcGkvZHJtL2k5MTVfZHJtLmggYi9pbmNsdWRlL3VhcGkvZHJtL2k5MTVf ZHJtLmgKaW5kZXggZDhkMTBkOTMyNzU5Li5iNDUwNWQ1NTk5MGQgMTAwNjQ0Ci0tLSBhL2luY2x1 ZGUvdWFwaS9kcm0vaTkxNV9kcm0uaAorKysgYi9pbmNsdWRlL3VhcGkvZHJtL2k5MTVfZHJtLmgK QEAgLTEzMDgsMTQgKzEzMDgsMTYgQEAgc3RydWN0IGRybV9pOTE1X3JlZ19yZWFkIHsKIAkgKiBi ZSBzcGVjaWZpZWQKIAkgKi8KIAlfX3U2NCBvZmZzZXQ7CisjZGVmaW5lIEk5MTVfUkVHX1JFQURf OEJfV0EgQklUKDApCisKIAlfX3U2NCB2YWw7IC8qIFJldHVybiB2YWx1ZSAqLwogfTsKIC8qIEtu b3duIHJlZ2lzdGVyczoKICAqCiAgKiBSZW5kZXIgZW5naW5lIHRpbWVzdGFtcCAtIDB4MjM1OCAr IDY0Yml0IC0gZ2VuNysKICAqIC0gTm90ZSB0aGlzIHJlZ2lzdGVyIHJldHVybnMgYW4gaW52YWxp ZCB2YWx1ZSBpZiB1c2luZyB0aGUgZGVmYXVsdAotICogICBzaW5nbGUgaW5zdHJ1Y3Rpb24gOGJ5 dGUgcmVhZCwgaW4gb3JkZXIgdG8gd29ya2Fyb3VuZCB0aGF0IHVzZQotICogICBvZmZzZXQgKDB4 MjUzOCB8IDEpIGluc3RlYWQuCisgKiAgIHNpbmdsZSBpbnN0cnVjdGlvbiA4Ynl0ZSByZWFkLCBp biBvcmRlciB0byB3b3JrYXJvdW5kIHRoYXQgcGFzcworICogICBmbGFnIEk5MTVfUkVHX1JFQURf OEJfV0EgaW4gb2Zmc2V0IGZpZWxkLgogICoKICAqLwogCi0tIAoyLjEzLjUKCl9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxp c3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNr dG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=