From: Joonas Lahtinen Subject: [PATCH v4 2/2] drm/i915: Simplify i915_reg_read_ioctl Date: Mon, 11 Sep 2017 12:44:17 +0300 Message-ID: <20170911094417.10937-2-joonas.lahtinen@linux.intel.com> References: <20170911094417.10937-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 mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id 591426E337 for ; Mon, 11 Sep 2017 09:44:44 +0000 (UTC) In-Reply-To: <20170911094417.10937-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 IGZsYWdzIHdpdGggJ2VudHJ5LT5zaXplIC0gMScgKENocmlzKQoKU2lnbmVkLW9mZi1ieTogSm9v bmFzIExhaHRpbmVuIDxqb29uYXMubGFodGluZW5AbGludXguaW50ZWwuY29tPgpDYzogVHZydGtv IFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KQ2M6IENocmlzIFdpbHNvbiA8Y2hy aXNAY2hyaXMtd2lsc29uLmNvLnVrPgpSZXZpZXdlZC1ieTogQ2hyaXMgV2lsc29uIDxjaHJpc0Bj aHJpcy13aWxzb24uY28udWs+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdW5jb3Jl LmMgfCA5MyArKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tCiBpbmNsdWRlL3Vh cGkvZHJtL2k5MTVfZHJtLmggICAgICAgICB8ICA2ICsrLQogMiBmaWxlcyBjaGFuZ2VkLCA0NiBp bnNlcnRpb25zKCspLCA1MyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF91bmNvcmUuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VuY29y ZS5jCmluZGV4IDFiMzhlYjk0ZDQ2MS4uMzk3YWM3MGI3NmFkIDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF91bmNvcmUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF91bmNvcmUuYwpAQCAtMTI5Miw3MiArMTI5Miw2MyBAQCB2b2lkIGludGVsX3VuY29yZV9m aW5pKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAlpbnRlbF91bmNvcmVfZm9y Y2V3YWtlX3Jlc2V0KGRldl9wcml2LCBmYWxzZSk7CiB9CiAKLSNkZWZpbmUgR0VOX1JBTkdFKGws IGgpIEdFTk1BU0soKGgpIC0gMSwgKGwpIC0gMSkKLQotc3RhdGljIGNvbnN0IHN0cnVjdCByZWdp c3Rlcl93aGl0ZWxpc3QgewotCWk5MTVfcmVnX3Qgb2Zmc2V0X2xkdywgb2Zmc2V0X3VkdzsKLQl1 aW50MzJfdCBzaXplOwotCS8qIHN1cHBvcnRlZCBnZW5zLCAweDEwIGZvciA0LCAweDMwIGZvciA0 IGFuZCA1LCBldGMuICovCi0JdWludDMyX3QgZ2VuX2JpdG1hc2s7Ci19IHdoaXRlbGlzdFtdID0g ewotCXsgLm9mZnNldF9sZHcgPSBSSU5HX1RJTUVTVEFNUChSRU5ERVJfUklOR19CQVNFKSwKLQkg IC5vZmZzZXRfdWR3ID0gUklOR19USU1FU1RBTVBfVURXKFJFTkRFUl9SSU5HX0JBU0UpLAotCSAg LnNpemUgPSA4LCAuZ2VuX2JpdG1hc2sgPSBHRU5fUkFOR0UoNCwgMTApIH0sCi19Oworc3RhdGlj IGNvbnN0IHN0cnVjdCByZWdfd2hpdGVsaXN0IHsKKwlpOTE1X3JlZ190IG9mZnNldF9sZHc7CisJ aTkxNV9yZWdfdCBvZmZzZXRfdWR3OworCXVuc2lnbmVkIGxvbmcgZ2VuX21hc2s7CisJdTggc2l6 ZTsKK30gcmVnX3JlYWRfd2hpdGVsaXN0W10gPSB7eworCS5vZmZzZXRfbGR3ID0gUklOR19USU1F U1RBTVAoUkVOREVSX1JJTkdfQkFTRSksCisJLm9mZnNldF91ZHcgPSBSSU5HX1RJTUVTVEFNUF9V RFcoUkVOREVSX1JJTkdfQkFTRSksCisJLmdlbl9tYXNrID0gSU5URUxfR0VOX01BU0soNCwgMTAp LAorCS5zaXplID0gOAorfX07CiAKIGludCBpOTE1X3JlZ19yZWFkX2lvY3RsKHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYsCiAJCQl2b2lkICpkYXRhLCBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGUpCiB7CiAJ c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOwogCXN0cnVj dCBkcm1faTkxNV9yZWdfcmVhZCAqcmVnID0gZGF0YTsKLQlzdHJ1Y3QgcmVnaXN0ZXJfd2hpdGVs aXN0IGNvbnN0ICplbnRyeSA9IHdoaXRlbGlzdDsKLQl1bnNpZ25lZCBzaXplOwotCWk5MTVfcmVn X3Qgb2Zmc2V0X2xkdywgb2Zmc2V0X3VkdzsKLQlpbnQgaSwgcmV0ID0gMDsKLQotCWZvciAoaSA9 IDA7IGkgPCBBUlJBWV9TSVpFKHdoaXRlbGlzdCk7IGkrKywgZW50cnkrKykgewotCQlpZiAoaTkx NV9tbWlvX3JlZ19vZmZzZXQoZW50cnktPm9mZnNldF9sZHcpID09IChyZWctPm9mZnNldCAmIC1l bnRyeS0+c2l6ZSkgJiYKLQkJICAgIChJTlRFTF9JTkZPKGRldl9wcml2KS0+Z2VuX21hc2sgJiBl bnRyeS0+Z2VuX2JpdG1hc2spKQorCXN0cnVjdCByZWdfd2hpdGVsaXN0IGNvbnN0ICplbnRyeTsK Kwl1bnNpZ25lZCBmbGFnczsKKwlpbnQgcmVtYWluOworCWludCByZXQgPSAwOworCisJZW50cnkg PSByZWdfcmVhZF93aGl0ZWxpc3Q7CisJcmVtYWluID0gQVJSQVlfU0laRShyZWdfcmVhZF93aGl0 ZWxpc3QpOworCXdoaWxlIChyZW1haW4pIHsKKwkJR0VNX0JVR19PTighaXNfcG93ZXJfb2ZfMihl bnRyeS0+c2l6ZSkpOworCQlHRU1fQlVHX09OKGVudHJ5LT5zaXplID4gOCk7CisKKwkJaWYgKElO VEVMX0lORk8oZGV2X3ByaXYpLT5nZW5fbWFzayAmIGVudHJ5LT5nZW5fbWFzayAmJgorCQkgICAg aTkxNV9tbWlvX3JlZ19vZmZzZXQoZW50cnktPm9mZnNldF9sZHcpID09CisJCQkgICAgKHJlZy0+ b2Zmc2V0ICYgLWVudHJ5LT5zaXplKSkKIAkJCWJyZWFrOworCQllbnRyeSsrOworCQlyZW1haW4t LTsKIAl9CiAKLQlpZiAoaSA9PSBBUlJBWV9TSVpFKHdoaXRlbGlzdCkpCisJaWYgKCFyZW1haW4p CiAJCXJldHVybiAtRUlOVkFMOwogCi0JLyogV2UgdXNlIHRoZSBsb3cgYml0cyB0byBlbmNvZGUg ZXh0cmEgZmxhZ3MgYXMgdGhlIHJlZ2lzdGVyIHNob3VsZAotCSAqIGJlIG5hdHVyYWxseSBhbGln bmVkIChhbmQgdGhvc2UgdGhhdCBhcmUgbm90IHNvIGFsaWduZWQgbWVyZWx5Ci0JICogbGltaXQg dGhlIGF2YWlsYWJsZSBmbGFncyBmb3IgdGhhdCByZWdpc3RlcikuCi0JICovCi0Jb2Zmc2V0X2xk dyA9IGVudHJ5LT5vZmZzZXRfbGR3OwotCW9mZnNldF91ZHcgPSBlbnRyeS0+b2Zmc2V0X3VkdzsK LQlzaXplID0gZW50cnktPnNpemU7Ci0Jc2l6ZSB8PSByZWctPm9mZnNldCBeIGk5MTVfbW1pb19y ZWdfb2Zmc2V0KG9mZnNldF9sZHcpOworCWZsYWdzID0gcmVnLT5vZmZzZXQgJiAoZW50cnktPnNp emUgLSAxKTsKIAogCWludGVsX3J1bnRpbWVfcG1fZ2V0KGRldl9wcml2KTsKLQotCXN3aXRjaCAo c2l6ZSkgewotCWNhc2UgOCB8IDE6Ci0JCXJlZy0+dmFsID0gSTkxNV9SRUFENjRfMngzMihvZmZz ZXRfbGR3LCBvZmZzZXRfdWR3KTsKLQkJYnJlYWs7Ci0JY2FzZSA4OgotCQlyZWctPnZhbCA9IEk5 MTVfUkVBRDY0KG9mZnNldF9sZHcpOwotCQlicmVhazsKLQljYXNlIDQ6Ci0JCXJlZy0+dmFsID0g STkxNV9SRUFEKG9mZnNldF9sZHcpOwotCQlicmVhazsKLQljYXNlIDI6Ci0JCXJlZy0+dmFsID0g STkxNV9SRUFEMTYob2Zmc2V0X2xkdyk7Ci0JCWJyZWFrOwotCWNhc2UgMToKLQkJcmVnLT52YWwg PSBJOTE1X1JFQUQ4KG9mZnNldF9sZHcpOwotCQlicmVhazsKLQlkZWZhdWx0OgorCWlmIChlbnRy eS0+c2l6ZSA9PSA4ICYmIGZsYWdzID09IEk5MTVfUkVHX1JFQURfOEJfV0EpCisJCXJlZy0+dmFs ID0gSTkxNV9SRUFENjRfMngzMihlbnRyeS0+b2Zmc2V0X2xkdywKKwkJCQkJICAgIGVudHJ5LT5v ZmZzZXRfdWR3KTsKKwllbHNlIGlmIChlbnRyeS0+c2l6ZSA9PSA4ICYmIGZsYWdzID09IDApCisJ CXJlZy0+dmFsID0gSTkxNV9SRUFENjQoZW50cnktPm9mZnNldF9sZHcpOworCWVsc2UgaWYgKGVu dHJ5LT5zaXplID09IDQgJiYgZmxhZ3MgPT0gMCkKKwkJcmVnLT52YWwgPSBJOTE1X1JFQUQoZW50 cnktPm9mZnNldF9sZHcpOworCWVsc2UgaWYgKGVudHJ5LT5zaXplID09IDIgJiYgZmxhZ3MgPT0g MCkKKwkJcmVnLT52YWwgPSBJOTE1X1JFQUQxNihlbnRyeS0+b2Zmc2V0X2xkdyk7CisJZWxzZSBp ZiAoZW50cnktPnNpemUgPT0gMSAmJiBmbGFncyA9PSAwKQorCQlyZWctPnZhbCA9IEk5MTVfUkVB RDgoZW50cnktPm9mZnNldF9sZHcpOworCWVsc2UKIAkJcmV0ID0gLUVJTlZBTDsKLQkJZ290byBv dXQ7Ci0JfQotCi1vdXQ6CiAJaW50ZWxfcnVudGltZV9wbV9wdXQoZGV2X3ByaXYpOworCiAJcmV0 dXJuIHJldDsKIH0KIApkaWZmIC0tZ2l0IGEvaW5jbHVkZS91YXBpL2RybS9pOTE1X2RybS5oIGIv aW5jbHVkZS91YXBpL2RybS9pOTE1X2RybS5oCmluZGV4IGQ4ZDEwZDkzMjc1OS4uYjQ1MDVkNTU5 OTBkIDEwMDY0NAotLS0gYS9pbmNsdWRlL3VhcGkvZHJtL2k5MTVfZHJtLmgKKysrIGIvaW5jbHVk ZS91YXBpL2RybS9pOTE1X2RybS5oCkBAIC0xMzA4LDE0ICsxMzA4LDE2IEBAIHN0cnVjdCBkcm1f aTkxNV9yZWdfcmVhZCB7CiAJICogYmUgc3BlY2lmaWVkCiAJICovCiAJX191NjQgb2Zmc2V0Owor I2RlZmluZSBJOTE1X1JFR19SRUFEXzhCX1dBIEJJVCgwKQorCiAJX191NjQgdmFsOyAvKiBSZXR1 cm4gdmFsdWUgKi8KIH07CiAvKiBLbm93biByZWdpc3RlcnM6CiAgKgogICogUmVuZGVyIGVuZ2lu ZSB0aW1lc3RhbXAgLSAweDIzNTggKyA2NGJpdCAtIGdlbjcrCiAgKiAtIE5vdGUgdGhpcyByZWdp c3RlciByZXR1cm5zIGFuIGludmFsaWQgdmFsdWUgaWYgdXNpbmcgdGhlIGRlZmF1bHQKLSAqICAg c2luZ2xlIGluc3RydWN0aW9uIDhieXRlIHJlYWQsIGluIG9yZGVyIHRvIHdvcmthcm91bmQgdGhh dCB1c2UKLSAqICAgb2Zmc2V0ICgweDI1MzggfCAxKSBpbnN0ZWFkLgorICogICBzaW5nbGUgaW5z dHJ1Y3Rpb24gOGJ5dGUgcmVhZCwgaW4gb3JkZXIgdG8gd29ya2Fyb3VuZCB0aGF0IHBhc3MKKyAq ICAgZmxhZyBJOTE1X1JFR19SRUFEXzhCX1dBIGluIG9mZnNldCBmaWVsZC4KICAqCiAgKi8KIAot LSAKMi4xMy41CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcK aHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK