From: Jani Nikula Subject: [PATCH 2/4] drm/i915/dsc: clean up rc parameter table access Date: Fri, 1 Nov 2019 15:40:52 +0200 Message-ID: <20191101134054.30228-2-jani.nikula@intel.com> References: <20191101134054.30228-1-jani.nikula@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id AF6846F7EA for ; Fri, 1 Nov 2019 13:44:09 +0000 (UTC) In-Reply-To: <20191101134054.30228-1-jani.nikula@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 Cc: Jani Nikula List-Id: intel-gfx@lists.freedesktop.org VXNlIGEgc2ltcGxlIHBvaW50ZXIgdG8gdGhlIHJlbGV2YW50IGVsZW1lbnQgaW5zdGVhZCBvZiBk dXBsaWNhdGluZyB0aGUKYXJyYXkgc3Vic2NyaXB0aW9uLiBObyBmdW5jdGlvbmFsIGNoYW5nZXMu CgpDYzogTWFuYXNpIE5hdmFyZSA8bWFuYXNpLmQubmF2YXJlQGludGVsLmNvbT4KU2lnbmVkLW9m Zi1ieTogSmFuaSBOaWt1bGEgPGphbmkubmlrdWxhQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dw dS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX3Zkc2MuYyB8IDU1ICsrKysrKysrKysrKy0tLS0tLS0t LS0tCiAxIGZpbGUgY2hhbmdlZCwgMzAgaW5zZXJ0aW9ucygrKSwgMjUgZGVsZXRpb25zKC0pCgpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF92ZHNjLmMgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX3Zkc2MuYwppbmRleCA1N2FjMGY2ODhj YTcuLmI2YzA5MDMyNzQ0MyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxh eS9pbnRlbF92ZHNjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF92 ZHNjLmMKQEAgLTUzLDcgKzUzLDcgQEAgc3RydWN0IHJjX3BhcmFtZXRlcnMgewogICogU2VsZWN0 ZWQgUmF0ZSBDb250cm9sIFJlbGF0ZWQgUGFyYW1ldGVyIFJlY29tbWVuZGVkIFZhbHVlcwogICog ZnJvbSBEU0NfdjEuMTEgc3BlYyAmIEMgTW9kZWwgcmVsZWFzZTogRFNDX21vZGVsXzIwMTYxMjEy CiAgKi8KLXN0YXRpYyBjb25zdCBzdHJ1Y3QgcmNfcGFyYW1ldGVycyByY19wYXJhbXNbXVtNQVhf Q09MVU1OX0lOREVYXSA9IHsKK3N0YXRpYyBjb25zdCBzdHJ1Y3QgcmNfcGFyYW1ldGVycyByY19w YXJhbWV0ZXJzW11bTUFYX0NPTFVNTl9JTkRFWF0gPSB7CiB7CiAJLyogNkJQUC84QlBDICovCiAJ eyA3NjgsIDE1LCA2MTQ0LCAzLCAxMywgMTEsIDExLCB7CkBAIC0zMTksMTQgKzMxOSwyOSBAQCBz dGF0aWMgaW50IGdldF9jb2x1bW5faW5kZXhfZm9yX3JjX3BhcmFtcyh1OCBiaXRzX3Blcl9jb21w b25lbnQpCiAJfQogfQogCitzdGF0aWMgY29uc3Qgc3RydWN0IHJjX3BhcmFtZXRlcnMgKmdldF9y Y19wYXJhbXModTE2IGNvbXByZXNzZWRfYnBwLAorCQkJCQkJIHU4IGJpdHNfcGVyX2NvbXBvbmVu dCkKK3sKKwlpbnQgcm93X2luZGV4LCBjb2x1bW5faW5kZXg7CisKKwlyb3dfaW5kZXggPSBnZXRf cm93X2luZGV4X2Zvcl9yY19wYXJhbXMoY29tcHJlc3NlZF9icHApOworCWlmIChyb3dfaW5kZXgg PCAwKQorCQlyZXR1cm4gTlVMTDsKKworCWNvbHVtbl9pbmRleCA9IGdldF9jb2x1bW5faW5kZXhf Zm9yX3JjX3BhcmFtcyhiaXRzX3Blcl9jb21wb25lbnQpOworCWlmIChjb2x1bW5faW5kZXggPCAw KQorCQlyZXR1cm4gTlVMTDsKKworCXJldHVybiAmcmNfcGFyYW1ldGVyc1tyb3dfaW5kZXhdW2Nv bHVtbl9pbmRleF07Cit9CisKIGludCBpbnRlbF9kcF9jb21wdXRlX2RzY19wYXJhbXMoc3RydWN0 IGludGVsX2RwICppbnRlbF9kcCwKIAkJCQlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqcGlwZV9j b25maWcpCiB7CiAJc3RydWN0IGRybV9kc2NfY29uZmlnICp2ZHNjX2NmZyA9ICZwaXBlX2NvbmZp Zy0+ZHNjLmNvbmZpZzsKIAl1MTYgY29tcHJlc3NlZF9icHAgPSBwaXBlX2NvbmZpZy0+ZHNjLmNv bXByZXNzZWRfYnBwOworCWNvbnN0IHN0cnVjdCByY19wYXJhbWV0ZXJzICpyY19wYXJhbXM7CiAJ dTggaSA9IDA7Ci0JaW50IHJvd19pbmRleCA9IDA7Ci0JaW50IGNvbHVtbl9pbmRleCA9IDA7CiAJ dTggbGluZV9idWZfZGVwdGggPSAwOwogCiAJdmRzY19jZmctPnBpY193aWR0aCA9IHBpcGVfY29u ZmlnLT5iYXNlLmFkanVzdGVkX21vZGUuY3J0Y19oZGlzcGxheTsKQEAgLTM5OSwzOSArNDE0LDI5 IEBAIGludCBpbnRlbF9kcF9jb21wdXRlX2RzY19wYXJhbXMoc3RydWN0IGludGVsX2RwICppbnRl bF9kcCwKIAkJdmRzY19jZmctPnJjX2J1Zl90aHJlc2hbMTNdID0gMHg3RDsKIAl9CiAKLQlyb3df aW5kZXggPSBnZXRfcm93X2luZGV4X2Zvcl9yY19wYXJhbXMoY29tcHJlc3NlZF9icHApOwotCWNv bHVtbl9pbmRleCA9Ci0JCWdldF9jb2x1bW5faW5kZXhfZm9yX3JjX3BhcmFtcyh2ZHNjX2NmZy0+ Yml0c19wZXJfY29tcG9uZW50KTsKLQotCWlmIChyb3dfaW5kZXggPCAwIHx8IGNvbHVtbl9pbmRl eCA8IDApCisJcmNfcGFyYW1zID0gZ2V0X3JjX3BhcmFtcyhjb21wcmVzc2VkX2JwcCwgdmRzY19j ZmctPmJpdHNfcGVyX2NvbXBvbmVudCk7CisJaWYgKCFyY19wYXJhbXMpCiAJCXJldHVybiAtRUlO VkFMOwogCi0JdmRzY19jZmctPmZpcnN0X2xpbmVfYnBnX29mZnNldCA9Ci0JCXJjX3BhcmFtc1ty b3dfaW5kZXhdW2NvbHVtbl9pbmRleF0uZmlyc3RfbGluZV9icGdfb2Zmc2V0OwotCXZkc2NfY2Zn LT5pbml0aWFsX3htaXRfZGVsYXkgPQotCQlyY19wYXJhbXNbcm93X2luZGV4XVtjb2x1bW5faW5k ZXhdLmluaXRpYWxfeG1pdF9kZWxheTsKLQl2ZHNjX2NmZy0+aW5pdGlhbF9vZmZzZXQgPQotCQly Y19wYXJhbXNbcm93X2luZGV4XVtjb2x1bW5faW5kZXhdLmluaXRpYWxfb2Zmc2V0OwotCXZkc2Nf Y2ZnLT5mbGF0bmVzc19taW5fcXAgPQotCQlyY19wYXJhbXNbcm93X2luZGV4XVtjb2x1bW5faW5k ZXhdLmZsYXRuZXNzX21pbl9xcDsKLQl2ZHNjX2NmZy0+ZmxhdG5lc3NfbWF4X3FwID0KLQkJcmNf cGFyYW1zW3Jvd19pbmRleF1bY29sdW1uX2luZGV4XS5mbGF0bmVzc19tYXhfcXA7Ci0JdmRzY19j ZmctPnJjX3F1YW50X2luY3JfbGltaXQwID0KLQkJcmNfcGFyYW1zW3Jvd19pbmRleF1bY29sdW1u X2luZGV4XS5yY19xdWFudF9pbmNyX2xpbWl0MDsKLQl2ZHNjX2NmZy0+cmNfcXVhbnRfaW5jcl9s aW1pdDEgPQotCQlyY19wYXJhbXNbcm93X2luZGV4XVtjb2x1bW5faW5kZXhdLnJjX3F1YW50X2lu Y3JfbGltaXQxOworCXZkc2NfY2ZnLT5maXJzdF9saW5lX2JwZ19vZmZzZXQgPSByY19wYXJhbXMt PmZpcnN0X2xpbmVfYnBnX29mZnNldDsKKwl2ZHNjX2NmZy0+aW5pdGlhbF94bWl0X2RlbGF5ID0g cmNfcGFyYW1zLT5pbml0aWFsX3htaXRfZGVsYXk7CisJdmRzY19jZmctPmluaXRpYWxfb2Zmc2V0 ID0gcmNfcGFyYW1zLT5pbml0aWFsX29mZnNldDsKKwl2ZHNjX2NmZy0+ZmxhdG5lc3NfbWluX3Fw ID0gcmNfcGFyYW1zLT5mbGF0bmVzc19taW5fcXA7CisJdmRzY19jZmctPmZsYXRuZXNzX21heF9x cCA9IHJjX3BhcmFtcy0+ZmxhdG5lc3NfbWF4X3FwOworCXZkc2NfY2ZnLT5yY19xdWFudF9pbmNy X2xpbWl0MCA9IHJjX3BhcmFtcy0+cmNfcXVhbnRfaW5jcl9saW1pdDA7CisJdmRzY19jZmctPnJj X3F1YW50X2luY3JfbGltaXQxID0gcmNfcGFyYW1zLT5yY19xdWFudF9pbmNyX2xpbWl0MTsKIAog CWZvciAoaSA9IDA7IGkgPCBEU0NfTlVNX0JVRl9SQU5HRVM7IGkrKykgewogCQl2ZHNjX2NmZy0+ cmNfcmFuZ2VfcGFyYW1zW2ldLnJhbmdlX21pbl9xcCA9Ci0JCQlyY19wYXJhbXNbcm93X2luZGV4 XVtjb2x1bW5faW5kZXhdLnJjX3JhbmdlX3BhcmFtc1tpXS5yYW5nZV9taW5fcXA7CisJCQlyY19w YXJhbXMtPnJjX3JhbmdlX3BhcmFtc1tpXS5yYW5nZV9taW5fcXA7CiAJCXZkc2NfY2ZnLT5yY19y YW5nZV9wYXJhbXNbaV0ucmFuZ2VfbWF4X3FwID0KLQkJCXJjX3BhcmFtc1tyb3dfaW5kZXhdW2Nv bHVtbl9pbmRleF0ucmNfcmFuZ2VfcGFyYW1zW2ldLnJhbmdlX21heF9xcDsKKwkJCXJjX3BhcmFt cy0+cmNfcmFuZ2VfcGFyYW1zW2ldLnJhbmdlX21heF9xcDsKIAkJLyoKIAkJICogUmFuZ2UgQlBH IE9mZnNldCB1c2VzIDIncyBjb21wbGVtZW50IGFuZCBpcyBvbmx5IGEgNiBiaXRzLiBTbwogCQkg KiBtYXNrIGl0IHRvIGdldCBvbmx5IDYgYml0cy4KIAkJICovCiAJCXZkc2NfY2ZnLT5yY19yYW5n ZV9wYXJhbXNbaV0ucmFuZ2VfYnBnX29mZnNldCA9Ci0JCQlyY19wYXJhbXNbcm93X2luZGV4XVtj b2x1bW5faW5kZXhdLnJjX3JhbmdlX3BhcmFtc1tpXS5yYW5nZV9icGdfb2Zmc2V0ICYKKwkJCXJj X3BhcmFtcy0+cmNfcmFuZ2VfcGFyYW1zW2ldLnJhbmdlX2JwZ19vZmZzZXQgJgogCQkJRFNDX1JB TkdFX0JQR19PRkZTRVRfTUFTSzsKIAl9CiAKLS0gCjIuMjAuMQoKX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRl bC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3Jn L21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4