From: Ville Syrjala Subject: [PATCH 10/10] drm/i915: Drop the redundant hdmi prefix/suffix from a lot of variables Date: Mon, 16 Oct 2017 17:57:05 +0300 Message-ID: <20171016145705.11780-11-ville.syrjala@linux.intel.com> References: <20171016145705.11780-1-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id 00B056E41F for ; Mon, 16 Oct 2017 14:57:43 +0000 (UTC) In-Reply-To: <20171016145705.11780-1-ville.syrjala@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-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCkEg YnVuY2ggb2YgZnVuY3Rpb25zIGFyZSBub3cgZXhjbHVzaXZlbHkgdXNlZCBmb3IgSERNSSwgc28g bmFtaW5nIHRoZQp2YXJpYWJsZXMgd2l0aCBoZG1pIHByZWZpeC9zdWZmaXggaXMgcmVkdW5kYW50 LiBBbHNvIHVzZSBpbnQgcmF0aGVyCnRoYW4gdTMyIGZvciB0aGUgdHJhbnNsYXRpb24gbGV2ZWwg Y29uc2lzdGVudGx5LgoKU2lnbmVkLW9mZi1ieTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJq YWxhQGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kZGku YyB8IDYxICsrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBj aGFuZ2VkLCAyOSBpbnNlcnRpb25zKCspLCAzMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kZGkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2RkaS5jCmluZGV4IDVmMWM1NDZlNWU2MS4uY2Q1NTBhYWIzMzJiIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kZGkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kZGkuYwpAQCAtNzcwLDQxICs3NzAsMzggQEAgY25sX2dldF9idWZfdHJhbnNfZWRw KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgaW50ICpuX2VudHJpZXMpCiAKIHN0 YXRpYyBpbnQgaW50ZWxfZGRpX2hkbWlfbGV2ZWwoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2LCBlbnVtIHBvcnQgcG9ydCkKIHsKLQlpbnQgbl9oZG1pX2VudHJpZXM7Ci0JaW50IGhk bWlfbGV2ZWw7Ci0JaW50IGhkbWlfZGVmYXVsdF9lbnRyeTsKKwlpbnQgbl9lbnRyaWVzLCBsZXZl bCwgZGVmYXVsdF9lbnRyeTsKIAotCWhkbWlfbGV2ZWwgPSBkZXZfcHJpdi0+dmJ0LmRkaV9wb3J0 X2luZm9bcG9ydF0uaGRtaV9sZXZlbF9zaGlmdDsKKwlsZXZlbCA9IGRldl9wcml2LT52YnQuZGRp X3BvcnRfaW5mb1twb3J0XS5oZG1pX2xldmVsX3NoaWZ0OwogCiAJaWYgKElTX0NBTk5PTkxBS0Uo ZGV2X3ByaXYpKSB7Ci0JCWNubF9nZXRfYnVmX3RyYW5zX2hkbWkoZGV2X3ByaXYsICZuX2hkbWlf ZW50cmllcyk7Ci0JCWhkbWlfZGVmYXVsdF9lbnRyeSA9IG5faGRtaV9lbnRyaWVzIC0gMTsKKwkJ Y25sX2dldF9idWZfdHJhbnNfaGRtaShkZXZfcHJpdiwgJm5fZW50cmllcyk7CisJCWRlZmF1bHRf ZW50cnkgPSBuX2VudHJpZXMgLSAxOwogCX0gZWxzZSBpZiAoSVNfR0VOOV9MUChkZXZfcHJpdikp IHsKLQkJYnh0X2dldF9idWZfdHJhbnNfaGRtaShkZXZfcHJpdiwgJm5faGRtaV9lbnRyaWVzKTsK LQkJaGRtaV9kZWZhdWx0X2VudHJ5ID0gbl9oZG1pX2VudHJpZXMgLSAxOworCQlieHRfZ2V0X2J1 Zl90cmFuc19oZG1pKGRldl9wcml2LCAmbl9lbnRyaWVzKTsKKwkJZGVmYXVsdF9lbnRyeSA9IG5f ZW50cmllcyAtIDE7CiAJfSBlbHNlIGlmIChJU19HRU45X0JDKGRldl9wcml2KSkgewotCQlpbnRl bF9kZGlfZ2V0X2J1Zl90cmFuc19oZG1pKGRldl9wcml2LCAmbl9oZG1pX2VudHJpZXMpOwotCQlo ZG1pX2RlZmF1bHRfZW50cnkgPSA4OworCQlpbnRlbF9kZGlfZ2V0X2J1Zl90cmFuc19oZG1pKGRl dl9wcml2LCAmbl9lbnRyaWVzKTsKKwkJZGVmYXVsdF9lbnRyeSA9IDg7CiAJfSBlbHNlIGlmIChJ U19CUk9BRFdFTEwoZGV2X3ByaXYpKSB7Ci0JCWludGVsX2RkaV9nZXRfYnVmX3RyYW5zX2hkbWko ZGV2X3ByaXYsICZuX2hkbWlfZW50cmllcyk7Ci0JCWhkbWlfZGVmYXVsdF9lbnRyeSA9IDc7CisJ CWludGVsX2RkaV9nZXRfYnVmX3RyYW5zX2hkbWkoZGV2X3ByaXYsICZuX2VudHJpZXMpOworCQlk ZWZhdWx0X2VudHJ5ID0gNzsKIAl9IGVsc2UgaWYgKElTX0hBU1dFTEwoZGV2X3ByaXYpKSB7Ci0J CWludGVsX2RkaV9nZXRfYnVmX3RyYW5zX2hkbWkoZGV2X3ByaXYsICZuX2hkbWlfZW50cmllcyk7 Ci0JCWhkbWlfZGVmYXVsdF9lbnRyeSA9IDY7CisJCWludGVsX2RkaV9nZXRfYnVmX3RyYW5zX2hk bWkoZGV2X3ByaXYsICZuX2VudHJpZXMpOworCQlkZWZhdWx0X2VudHJ5ID0gNjsKIAl9IGVsc2Ug ewogCQlXQVJOKDEsICJkZGkgdHJhbnNsYXRpb24gdGFibGUgbWlzc2luZ1xuIik7CiAJCXJldHVy biAwOwogCX0KIAogCS8qIENob29zZSBhIGdvb2QgZGVmYXVsdCBpZiBWQlQgaXMgYmFkbHkgcG9w dWxhdGVkICovCi0JaWYgKGhkbWlfbGV2ZWwgPT0gSERNSV9MRVZFTF9TSElGVF9VTktOT1dOIHx8 Ci0JICAgIGhkbWlfbGV2ZWwgPj0gbl9oZG1pX2VudHJpZXMpCi0JCWhkbWlfbGV2ZWwgPSBoZG1p X2RlZmF1bHRfZW50cnk7CisJaWYgKGxldmVsID09IEhETUlfTEVWRUxfU0hJRlRfVU5LTk9XTiB8 fCBsZXZlbCA+PSBuX2VudHJpZXMpCisJCWxldmVsID0gZGVmYXVsdF9lbnRyeTsKIAotCWlmIChX QVJOX09OX09OQ0UoaGRtaV9sZXZlbCA+PSBuX2hkbWlfZW50cmllcykpCi0JCWhkbWlfbGV2ZWwg PSBuX2hkbWlfZW50cmllcyAtIDE7CisJaWYgKFdBUk5fT05fT05DRShsZXZlbCA+PSBuX2VudHJp ZXMpKQorCQlsZXZlbCA9IG5fZW50cmllcyAtIDE7CiAKLQlyZXR1cm4gaGRtaV9sZXZlbDsKKwly ZXR1cm4gbGV2ZWw7CiB9CiAKIC8qCkBAIC04NTcsMjAgKzg1NCwyMCBAQCBzdGF0aWMgdm9pZCBp bnRlbF9wcmVwYXJlX2RwX2RkaV9idWZmZXJzKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVy KQogICogSERNSS9EVkkgdXNlIGNhc2VzLgogICovCiBzdGF0aWMgdm9pZCBpbnRlbF9wcmVwYXJl X2hkbWlfZGRpX2J1ZmZlcnMoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIsCi0JCQkJCSAg IGludCBoZG1pX2xldmVsKQorCQkJCQkgICBpbnQgbGV2ZWwpCiB7CiAJc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShlbmNvZGVyLT5iYXNlLmRldik7CiAJdTMyIGli b29zdF9iaXQgPSAwOwotCWludCBuX2hkbWlfZW50cmllczsKKwlpbnQgbl9lbnRyaWVzOwogCWVu dW0gcG9ydCBwb3J0ID0gaW50ZWxfZGRpX2dldF9lbmNvZGVyX3BvcnQoZW5jb2Rlcik7Ci0JY29u c3Qgc3RydWN0IGRkaV9idWZfdHJhbnMgKmRkaV90cmFuc2xhdGlvbnNfaGRtaTsKKwljb25zdCBz dHJ1Y3QgZGRpX2J1Zl90cmFucyAqZGRpX3RyYW5zbGF0aW9uczsKIAotCWRkaV90cmFuc2xhdGlv bnNfaGRtaSA9IGludGVsX2RkaV9nZXRfYnVmX3RyYW5zX2hkbWkoZGV2X3ByaXYsICZuX2hkbWlf ZW50cmllcyk7CisJZGRpX3RyYW5zbGF0aW9ucyA9IGludGVsX2RkaV9nZXRfYnVmX3RyYW5zX2hk bWkoZGV2X3ByaXYsICZuX2VudHJpZXMpOwogCi0JaWYgKFdBUk5fT05fT05DRSghZGRpX3RyYW5z bGF0aW9uc19oZG1pKSkKKwlpZiAoV0FSTl9PTl9PTkNFKCFkZGlfdHJhbnNsYXRpb25zKSkKIAkJ cmV0dXJuOwotCWlmIChXQVJOX09OX09OQ0UoaGRtaV9sZXZlbCA+PSBuX2hkbWlfZW50cmllcykp Ci0JCWhkbWlfbGV2ZWwgPSBuX2hkbWlfZW50cmllcyAtIDE7CisJaWYgKFdBUk5fT05fT05DRShs ZXZlbCA+PSBuX2VudHJpZXMpKQorCQlsZXZlbCA9IG5fZW50cmllcyAtIDE7CiAKIAkvKiBJZiB3 ZSdyZSBib29zdGluZyB0aGUgY3VycmVudCwgc2V0IGJpdCAzMSBvZiB0cmFuczEgKi8KIAlpZiAo SVNfR0VOOV9CQyhkZXZfcHJpdikgJiYKQEAgLTg3OSw5ICs4NzYsOSBAQCBzdGF0aWMgdm9pZCBp bnRlbF9wcmVwYXJlX2hkbWlfZGRpX2J1ZmZlcnMoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29k ZXIsCiAKIAkvKiBFbnRyeSA5IGlzIGZvciBIRE1JOiAqLwogCUk5MTVfV1JJVEUoRERJX0JVRl9U UkFOU19MTyhwb3J0LCA5KSwKLQkJICAgZGRpX3RyYW5zbGF0aW9uc19oZG1pW2hkbWlfbGV2ZWxd LnRyYW5zMSB8IGlib29zdF9iaXQpOworCQkgICBkZGlfdHJhbnNsYXRpb25zW2xldmVsXS50cmFu czEgfCBpYm9vc3RfYml0KTsKIAlJOTE1X1dSSVRFKERESV9CVUZfVFJBTlNfSEkocG9ydCwgOSks Ci0JCSAgIGRkaV90cmFuc2xhdGlvbnNfaGRtaVtoZG1pX2xldmVsXS50cmFuczIpOworCQkgICBk ZGlfdHJhbnNsYXRpb25zW2xldmVsXS50cmFuczIpOwogfQogCiBzdGF0aWMgdm9pZCBpbnRlbF93 YWl0X2RkaV9idWZfaWRsZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCkBAIC0y MDk0LDcgKzIwOTEsNyBAQCB1MzIgYnh0X3NpZ25hbF9sZXZlbHMoc3RydWN0IGludGVsX2RwICpp bnRlbF9kcCkKIAlzdHJ1Y3QgaW50ZWxfZGlnaXRhbF9wb3J0ICpkcG9ydCA9IGRwX3RvX2RpZ19w b3J0KGludGVsX2RwKTsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19p OTE1KGRwb3J0LT5iYXNlLmJhc2UuZGV2KTsKIAlzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2Rl ciA9ICZkcG9ydC0+YmFzZTsKLQl1MzIgbGV2ZWwgPSBpbnRlbF9kZGlfZHBfbGV2ZWwoaW50ZWxf ZHApOworCWludCBsZXZlbCA9IGludGVsX2RkaV9kcF9sZXZlbChpbnRlbF9kcCk7CiAKIAlpZiAo SVNfQ0FOTk9OTEFLRShkZXZfcHJpdikpCiAJCWNubF9kZGlfdnN3aW5nX3NlcXVlbmNlKGVuY29k ZXIsIGxldmVsLCBlbmNvZGVyLT50eXBlKTsKQEAgLTIxMDksNyArMjEwNiw3IEBAIHVpbnQzMl90 IGRkaV9zaWduYWxfbGV2ZWxzKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHApCiAJc3RydWN0IGlu dGVsX2RpZ2l0YWxfcG9ydCAqZHBvcnQgPSBkcF90b19kaWdfcG9ydChpbnRlbF9kcCk7CiAJc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkcG9ydC0+YmFzZS5iYXNl LmRldik7CiAJc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIgPSAmZHBvcnQtPmJhc2U7Ci0J dWludDMyX3QgbGV2ZWwgPSBpbnRlbF9kZGlfZHBfbGV2ZWwoaW50ZWxfZHApOworCWludCBsZXZl bCA9IGludGVsX2RkaV9kcF9sZXZlbChpbnRlbF9kcCk7CiAKIAlpZiAoSVNfR0VOOV9CQyhkZXZf cHJpdikpCiAJCXNrbF9kZGlfc2V0X2lib29zdChlbmNvZGVyLCBsZXZlbCwgZW5jb2Rlci0+dHlw ZSk7CkBAIC0yMTgyLDcgKzIxNzksNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9kZGlfcHJlX2VuYWJs ZV9kcChzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwKIAllbnVtIHBvcnQgcG9ydCA9IGlu dGVsX2RkaV9nZXRfZW5jb2Rlcl9wb3J0KGVuY29kZXIpOwogCXN0cnVjdCBpbnRlbF9kaWdpdGFs X3BvcnQgKmRpZ19wb3J0ID0gZW5jX3RvX2RpZ19wb3J0KCZlbmNvZGVyLT5iYXNlKTsKIAlib29s IGlzX21zdCA9IGludGVsX2NydGNfaGFzX3R5cGUoY3J0Y19zdGF0ZSwgSU5URUxfT1VUUFVUX0RQ X01TVCk7Ci0JdWludDMyX3QgbGV2ZWwgPSBpbnRlbF9kZGlfZHBfbGV2ZWwoaW50ZWxfZHApOwor CWludCBsZXZlbCA9IGludGVsX2RkaV9kcF9sZXZlbChpbnRlbF9kcCk7CiAKIAlXQVJOX09OKGlz X21zdCAmJiAocG9ydCA9PSBQT1JUX0EgfHwgcG9ydCA9PSBQT1JUX0UpKTsKIAotLSAKMi4xMy42 CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1n ZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9s aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK