From: Jani Nikula Subject: [PATCH v2 2/4] drm/i915/dsc: clean up rc parameter table access Date: Mon, 4 Nov 2019 16:14:37 +0200 Message-ID: <20191104141439.26312-2-jani.nikula@intel.com> References: <20191104141439.26312-1-jani.nikula@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5E4406E48F for ; Mon, 4 Nov 2019 14:14:52 +0000 (UTC) In-Reply-To: <20191104141439.26312-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 cml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX3Zkc2MuYwppbmRleCA3NjNmMWQ3MjA4 ZTkuLmYxZGY2NTQzNjlhNyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxh 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 ZmlnLT5ody5hZGp1c3RlZF9tb2RlLmNydGNfaGRpc3BsYXk7CkBAIC0zOTksMzkgKzQxNCwyOSBA QCBpbnQgaW50ZWxfZHBfY29tcHV0ZV9kc2NfcGFyYW1zKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxf ZHAsCiAJCXZkc2NfY2ZnLT5yY19idWZfdGhyZXNoWzEzXSA9IDB4N0Q7CiAJfQogCi0Jcm93X2lu ZGV4ID0gZ2V0X3Jvd19pbmRleF9mb3JfcmNfcGFyYW1zKGNvbXByZXNzZWRfYnBwKTsKLQljb2x1 bW5faW5kZXggPQotCQlnZXRfY29sdW1uX2luZGV4X2Zvcl9yY19wYXJhbXModmRzY19jZmctPmJp dHNfcGVyX2NvbXBvbmVudCk7Ci0KLQlpZiAocm93X2luZGV4IDwgMCB8fCBjb2x1bW5faW5kZXgg PCAwKQorCXJjX3BhcmFtcyA9IGdldF9yY19wYXJhbXMoY29tcHJlc3NlZF9icHAsIHZkc2NfY2Zn LT5iaXRzX3Blcl9jb21wb25lbnQpOworCWlmICghcmNfcGFyYW1zKQogCQlyZXR1cm4gLUVJTlZB TDsKIAotCXZkc2NfY2ZnLT5maXJzdF9saW5lX2JwZ19vZmZzZXQgPQotCQlyY19wYXJhbXNbcm93 X2luZGV4XVtjb2x1bW5faW5kZXhdLmZpcnN0X2xpbmVfYnBnX29mZnNldDsKLQl2ZHNjX2NmZy0+ aW5pdGlhbF94bWl0X2RlbGF5ID0KLQkJcmNfcGFyYW1zW3Jvd19pbmRleF1bY29sdW1uX2luZGV4 XS5pbml0aWFsX3htaXRfZGVsYXk7Ci0JdmRzY19jZmctPmluaXRpYWxfb2Zmc2V0ID0KLQkJcmNf cGFyYW1zW3Jvd19pbmRleF1bY29sdW1uX2luZGV4XS5pbml0aWFsX29mZnNldDsKLQl2ZHNjX2Nm Zy0+ZmxhdG5lc3NfbWluX3FwID0KLQkJcmNfcGFyYW1zW3Jvd19pbmRleF1bY29sdW1uX2luZGV4 XS5mbGF0bmVzc19taW5fcXA7Ci0JdmRzY19jZmctPmZsYXRuZXNzX21heF9xcCA9Ci0JCXJjX3Bh cmFtc1tyb3dfaW5kZXhdW2NvbHVtbl9pbmRleF0uZmxhdG5lc3NfbWF4X3FwOwotCXZkc2NfY2Zn LT5yY19xdWFudF9pbmNyX2xpbWl0MCA9Ci0JCXJjX3BhcmFtc1tyb3dfaW5kZXhdW2NvbHVtbl9p bmRleF0ucmNfcXVhbnRfaW5jcl9saW1pdDA7Ci0JdmRzY19jZmctPnJjX3F1YW50X2luY3JfbGlt aXQxID0KLQkJcmNfcGFyYW1zW3Jvd19pbmRleF1bY29sdW1uX2luZGV4XS5yY19xdWFudF9pbmNy X2xpbWl0MTsKKwl2ZHNjX2NmZy0+Zmlyc3RfbGluZV9icGdfb2Zmc2V0ID0gcmNfcGFyYW1zLT5m aXJzdF9saW5lX2JwZ19vZmZzZXQ7CisJdmRzY19jZmctPmluaXRpYWxfeG1pdF9kZWxheSA9IHJj X3BhcmFtcy0+aW5pdGlhbF94bWl0X2RlbGF5OworCXZkc2NfY2ZnLT5pbml0aWFsX29mZnNldCA9 IHJjX3BhcmFtcy0+aW5pdGlhbF9vZmZzZXQ7CisJdmRzY19jZmctPmZsYXRuZXNzX21pbl9xcCA9 IHJjX3BhcmFtcy0+ZmxhdG5lc3NfbWluX3FwOworCXZkc2NfY2ZnLT5mbGF0bmVzc19tYXhfcXAg PSByY19wYXJhbXMtPmZsYXRuZXNzX21heF9xcDsKKwl2ZHNjX2NmZy0+cmNfcXVhbnRfaW5jcl9s aW1pdDAgPSByY19wYXJhbXMtPnJjX3F1YW50X2luY3JfbGltaXQwOworCXZkc2NfY2ZnLT5yY19x dWFudF9pbmNyX2xpbWl0MSA9IHJjX3BhcmFtcy0+cmNfcXVhbnRfaW5jcl9saW1pdDE7CiAKIAlm b3IgKGkgPSAwOyBpIDwgRFNDX05VTV9CVUZfUkFOR0VTOyBpKyspIHsKIAkJdmRzY19jZmctPnJj X3JhbmdlX3BhcmFtc1tpXS5yYW5nZV9taW5fcXAgPQotCQkJcmNfcGFyYW1zW3Jvd19pbmRleF1b Y29sdW1uX2luZGV4XS5yY19yYW5nZV9wYXJhbXNbaV0ucmFuZ2VfbWluX3FwOworCQkJcmNfcGFy YW1zLT5yY19yYW5nZV9wYXJhbXNbaV0ucmFuZ2VfbWluX3FwOwogCQl2ZHNjX2NmZy0+cmNfcmFu Z2VfcGFyYW1zW2ldLnJhbmdlX21heF9xcCA9Ci0JCQlyY19wYXJhbXNbcm93X2luZGV4XVtjb2x1 bW5faW5kZXhdLnJjX3JhbmdlX3BhcmFtc1tpXS5yYW5nZV9tYXhfcXA7CisJCQlyY19wYXJhbXMt PnJjX3JhbmdlX3BhcmFtc1tpXS5yYW5nZV9tYXhfcXA7CiAJCS8qCiAJCSAqIFJhbmdlIEJQRyBP ZmZzZXQgdXNlcyAyJ3MgY29tcGxlbWVudCBhbmQgaXMgb25seSBhIDYgYml0cy4gU28KIAkJICog bWFzayBpdCB0byBnZXQgb25seSA2IGJpdHMuCiAJCSAqLwogCQl2ZHNjX2NmZy0+cmNfcmFuZ2Vf cGFyYW1zW2ldLnJhbmdlX2JwZ19vZmZzZXQgPQotCQkJcmNfcGFyYW1zW3Jvd19pbmRleF1bY29s dW1uX2luZGV4XS5yY19yYW5nZV9wYXJhbXNbaV0ucmFuZ2VfYnBnX29mZnNldCAmCisJCQlyY19w YXJhbXMtPnJjX3JhbmdlX3BhcmFtc1tpXS5yYW5nZV9icGdfb2Zmc2V0ICYKIAkJCURTQ19SQU5H RV9CUEdfT0ZGU0VUX01BU0s7CiAJfQogCi0tIAoyLjIwLjEKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwt Z2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9t YWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeA==