From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville Syrjala Subject: [PATCH 05/12] drm/i915: Clean up i9xx_load_luts_internal() Date: Thu, 7 Nov 2019 17:17:18 +0200 Message-ID: <20191107151725.10507-6-ville.syrjala@linux.intel.com> References: <20191107151725.10507-1-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20191107151725.10507-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 Cc: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClNw bGl0IGk5eHhfbG9hZF9sdXRzX2ludGVybmFsKCkgaW50byBuZWF0IGdtY2ggdnMuIGlsaysgY2h1 bmtzLgpBdm9pZHMgYXQgbGVhc3Qgb25lIGJyYW5jaCBpbiB0aGUgaW5uZXIgbG9vcCwgYW5kIG1h a2VzIGxpZmUKYSBiaXQgbGVzcyBjb25mdXNpbmcuCgpTaWduZWQtb2ZmLWJ5OiBWaWxsZSBTeXJq w6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2Rpc3BsYXkvaW50ZWxfY29sb3IuYyB8IDk4ICsrKysrKysrKysrKystLS0tLS0tLS0K IDEgZmlsZSBjaGFuZ2VkLCA1NyBpbnNlcnRpb25zKCspLCA0MSBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2NvbG9yLmMgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2NvbG9yLmMKaW5kZXggNTQ0M2I4ZWMwYTRj Li45OTIyOTBhMDcwODYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkv aW50ZWxfY29sb3IuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2Nv bG9yLmMKQEAgLTM5Nyw0MSArMzk3LDYgQEAgc3RhdGljIHUzMiBpbGtfbHV0XzEwKGNvbnN0IHN0 cnVjdCBkcm1fY29sb3JfbHV0ICpjb2xvcikKIAkJZHJtX2NvbG9yX2x1dF9leHRyYWN0KGNvbG9y LT5ibHVlLCAxMCk7CiB9CiAKLS8qIExvYWRzIHRoZSBsZWdhY3kgcGFsZXR0ZS9nYW1tYSB1bml0 IGZvciB0aGUgQ1JUQy4gKi8KLXN0YXRpYyB2b2lkIGk5eHhfbG9hZF9sdXRzX2ludGVybmFsKGNv bnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlLAotCQkJCSAgICBjb25zdCBz dHJ1Y3QgZHJtX3Byb3BlcnR5X2Jsb2IgKmJsb2IpCi17Ci0Jc3RydWN0IGludGVsX2NydGMgKmNy dGMgPSB0b19pbnRlbF9jcnRjKGNydGNfc3RhdGUtPnVhcGkuY3J0Yyk7Ci0Jc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShjcnRjLT5iYXNlLmRldik7Ci0JZW51bSBw aXBlIHBpcGUgPSBjcnRjLT5waXBlOwotCWludCBpOwotCi0JaWYgKEhBU19HTUNIKGRldl9wcml2 KSkgewotCQlpZiAoaW50ZWxfY3J0Y19oYXNfdHlwZShjcnRjX3N0YXRlLCBJTlRFTF9PVVRQVVRf RFNJKSkKLQkJCWFzc2VydF9kc2lfcGxsX2VuYWJsZWQoZGV2X3ByaXYpOwotCQllbHNlCi0JCQlh c3NlcnRfcGxsX2VuYWJsZWQoZGV2X3ByaXYsIHBpcGUpOwotCX0KLQotCWlmIChibG9iKSB7Ci0J CWNvbnN0IHN0cnVjdCBkcm1fY29sb3JfbHV0ICpsdXQgPSBibG9iLT5kYXRhOwotCi0JCWZvciAo aSA9IDA7IGkgPCAyNTY7IGkrKykgewotCQkJdTMyIHdvcmQgPSBpOXh4X2x1dF84KCZsdXRbaV0p OwotCi0JCQlpZiAoSEFTX0dNQ0goZGV2X3ByaXYpKQotCQkJCUk5MTVfV1JJVEUoUEFMRVRURShw aXBlLCBpKSwgd29yZCk7Ci0JCQllbHNlCi0JCQkJSTkxNV9XUklURShMR0NfUEFMRVRURShwaXBl LCBpKSwgd29yZCk7Ci0JCX0KLQl9Ci19Ci0KLXN0YXRpYyB2b2lkIGk5eHhfbG9hZF9sdXRzKGNv bnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlKQotewotCWk5eHhfbG9hZF9s dXRzX2ludGVybmFsKGNydGNfc3RhdGUsIGNydGNfc3RhdGUtPmh3LmdhbW1hX2x1dCk7Ci19Ci0K IHN0YXRpYyB2b2lkIGk5eHhfY29sb3JfY29tbWl0KGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0 YXRlICpjcnRjX3N0YXRlKQogewogCXN0cnVjdCBpbnRlbF9jcnRjICpjcnRjID0gdG9faW50ZWxf Y3J0YyhjcnRjX3N0YXRlLT51YXBpLmNydGMpOwpAQCAtNDk2LDYgKzQ2MSwzNCBAQCBzdGF0aWMg dm9pZCBza2xfY29sb3JfY29tbWl0KGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRj X3N0YXRlKQogCQlpbGtfbG9hZF9jc2NfbWF0cml4KGNydGNfc3RhdGUpOwogfQogCitzdGF0aWMg dm9pZCBpOXh4X2xvYWRfbHV0Xzgoc3RydWN0IGludGVsX2NydGMgKmNydGMsCisJCQkgICAgY29u c3Qgc3RydWN0IGRybV9wcm9wZXJ0eV9ibG9iICpibG9iKQoreworCXN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoY3J0Yy0+YmFzZS5kZXYpOworCWNvbnN0IHN0cnVj dCBkcm1fY29sb3JfbHV0ICpsdXQ7CisJZW51bSBwaXBlIHBpcGUgPSBjcnRjLT5waXBlOworCWlu dCBpOworCisJaWYgKCFibG9iKQorCQlyZXR1cm47CisKKwlsdXQgPSBibG9iLT5kYXRhOworCisJ Zm9yIChpID0gMDsgaSA8IDI1NjsgaSsrKQorCQlJOTE1X1dSSVRFKFBBTEVUVEUocGlwZSwgaSks IGk5eHhfbHV0XzgoJmx1dFtpXSkpOworfQorCitzdGF0aWMgdm9pZCBpOXh4X2xvYWRfbHV0cyhj b25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSkKK3sKKwlzdHJ1Y3QgaW50 ZWxfY3J0YyAqY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Y19zdGF0ZS0+dWFwaS5jcnRjKTsKKwlz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGNydGMtPmJhc2UuZGV2 KTsKKwljb25zdCBzdHJ1Y3QgZHJtX3Byb3BlcnR5X2Jsb2IgKmdhbW1hX2x1dCA9IGNydGNfc3Rh dGUtPmh3LmdhbW1hX2x1dDsKKworCWFzc2VydF9wbGxfZW5hYmxlZChkZXZfcHJpdiwgY3J0Yy0+ cGlwZSk7CisKKwlpOXh4X2xvYWRfbHV0XzgoY3J0YywgZ2FtbWFfbHV0KTsKK30KKwogc3RhdGlj IHZvaWQgaTk2NV9sb2FkX2x1dF8xMHA2KHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAogCQkJICAg ICAgIGNvbnN0IHN0cnVjdCBkcm1fcHJvcGVydHlfYmxvYiAqYmxvYikKIHsKQEAgLTUxOSwxNCAr NTEyLDM3IEBAIHN0YXRpYyB2b2lkIGk5NjVfbG9hZF9sdXRfMTBwNihzdHJ1Y3QgaW50ZWxfY3J0 YyAqY3J0YywKIHN0YXRpYyB2b2lkIGk5NjVfbG9hZF9sdXRzKGNvbnN0IHN0cnVjdCBpbnRlbF9j cnRjX3N0YXRlICpjcnRjX3N0YXRlKQogewogCXN0cnVjdCBpbnRlbF9jcnRjICpjcnRjID0gdG9f aW50ZWxfY3J0YyhjcnRjX3N0YXRlLT51YXBpLmNydGMpOworCXN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoY3J0Yy0+YmFzZS5kZXYpOwogCWNvbnN0IHN0cnVjdCBk cm1fcHJvcGVydHlfYmxvYiAqZ2FtbWFfbHV0ID0gY3J0Y19zdGF0ZS0+aHcuZ2FtbWFfbHV0Owog CisJaWYgKGludGVsX2NydGNfaGFzX3R5cGUoY3J0Y19zdGF0ZSwgSU5URUxfT1VUUFVUX0RTSSkp CisJCWFzc2VydF9kc2lfcGxsX2VuYWJsZWQoZGV2X3ByaXYpOworCWVsc2UKKwkJYXNzZXJ0X3Bs bF9lbmFibGVkKGRldl9wcml2LCBjcnRjLT5waXBlKTsKKwogCWlmIChjcnRjX3N0YXRlLT5nYW1t YV9tb2RlID09IEdBTU1BX01PREVfTU9ERV84QklUKQotCQlpOXh4X2xvYWRfbHV0cyhjcnRjX3N0 YXRlKTsKKwkJaTl4eF9sb2FkX2x1dF84KGNydGMsIGdhbW1hX2x1dCk7CiAJZWxzZQogCQlpOTY1 X2xvYWRfbHV0XzEwcDYoY3J0YywgZ2FtbWFfbHV0KTsKIH0KIAorc3RhdGljIHZvaWQgaWxrX2xv YWRfbHV0Xzgoc3RydWN0IGludGVsX2NydGMgKmNydGMsCisJCQkgICBjb25zdCBzdHJ1Y3QgZHJt X3Byb3BlcnR5X2Jsb2IgKmJsb2IpCit7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2ID0gdG9faTkxNShjcnRjLT5iYXNlLmRldik7CisJY29uc3Qgc3RydWN0IGRybV9jb2xvcl9s dXQgKmx1dDsKKwllbnVtIHBpcGUgcGlwZSA9IGNydGMtPnBpcGU7CisJaW50IGk7CisKKwlpZiAo IWJsb2IpCisJCXJldHVybjsKKworCWx1dCA9IGJsb2ItPmRhdGE7CisKKwlmb3IgKGkgPSAwOyBp IDwgMjU2OyBpKyspCisJCUk5MTVfV1JJVEUoTEdDX1BBTEVUVEUocGlwZSwgaSksIGk5eHhfbHV0 XzgoJmx1dFtpXSkpOworfQorCiBzdGF0aWMgdm9pZCBpbGtfbG9hZF9sdXRfMTAoc3RydWN0IGlu dGVsX2NydGMgKmNydGMsCiAJCQkgICAgY29uc3Qgc3RydWN0IGRybV9wcm9wZXJ0eV9ibG9iICpi bG9iKQogewpAQCAtNTQ1LDcgKzU2MSw3IEBAIHN0YXRpYyB2b2lkIGlsa19sb2FkX2x1dHMoY29u c3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpCiAJY29uc3Qgc3RydWN0IGRy bV9wcm9wZXJ0eV9ibG9iICpnYW1tYV9sdXQgPSBjcnRjX3N0YXRlLT5ody5nYW1tYV9sdXQ7CiAK IAlpZiAoY3J0Y19zdGF0ZS0+Z2FtbWFfbW9kZSA9PSBHQU1NQV9NT0RFX01PREVfOEJJVCkKLQkJ aTl4eF9sb2FkX2x1dHMoY3J0Y19zdGF0ZSk7CisJCWlsa19sb2FkX2x1dF84KGNydGMsIGdhbW1h X2x1dCk7CiAJZWxzZQogCQlpbGtfbG9hZF9sdXRfMTAoY3J0YywgZ2FtbWFfbHV0KTsKIH0KQEAg LTY1Myw3ICs2NjksNyBAQCBzdGF0aWMgdm9pZCBpdmJfbG9hZF9sdXRzKGNvbnN0IHN0cnVjdCBp bnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlKQogCWNvbnN0IHN0cnVjdCBkcm1fcHJvcGVydHlf YmxvYiAqZGVnYW1tYV9sdXQgPSBjcnRjX3N0YXRlLT5ody5kZWdhbW1hX2x1dDsKIAogCWlmIChj cnRjX3N0YXRlLT5nYW1tYV9tb2RlID09IEdBTU1BX01PREVfTU9ERV84QklUKSB7Ci0JCWk5eHhf bG9hZF9sdXRzKGNydGNfc3RhdGUpOworCQlpbGtfbG9hZF9sdXRfOChjcnRjLCBnYW1tYV9sdXQp OwogCX0gZWxzZSBpZiAoY3J0Y19zdGF0ZS0+Z2FtbWFfbW9kZSA9PSBHQU1NQV9NT0RFX01PREVf U1BMSVQpIHsKIAkJaXZiX2xvYWRfbHV0XzEwKGNydGMsIGRlZ2FtbWFfbHV0LCBQQUxfUFJFQ19T UExJVF9NT0RFIHwKIAkJCQlQQUxfUFJFQ19JTkRFWF9WQUxVRSgwKSk7CkBAIC02NzYsNyArNjky LDcgQEAgc3RhdGljIHZvaWQgYmR3X2xvYWRfbHV0cyhjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19z dGF0ZSAqY3J0Y19zdGF0ZSkKIAljb25zdCBzdHJ1Y3QgZHJtX3Byb3BlcnR5X2Jsb2IgKmRlZ2Ft bWFfbHV0ID0gY3J0Y19zdGF0ZS0+aHcuZGVnYW1tYV9sdXQ7CiAKIAlpZiAoY3J0Y19zdGF0ZS0+ Z2FtbWFfbW9kZSA9PSBHQU1NQV9NT0RFX01PREVfOEJJVCkgewotCQlpOXh4X2xvYWRfbHV0cyhj cnRjX3N0YXRlKTsKKwkJaWxrX2xvYWRfbHV0XzgoY3J0YywgZ2FtbWFfbHV0KTsKIAl9IGVsc2Ug aWYgKGNydGNfc3RhdGUtPmdhbW1hX21vZGUgPT0gR0FNTUFfTU9ERV9NT0RFX1NQTElUKSB7CiAJ CWJkd19sb2FkX2x1dF8xMChjcnRjLCBkZWdhbW1hX2x1dCwgUEFMX1BSRUNfU1BMSVRfTU9ERSB8 CiAJCQkJUEFMX1BSRUNfSU5ERVhfVkFMVUUoMCkpOwpAQCAtNzc3LDcgKzc5Myw3IEBAIHN0YXRp YyB2b2lkIGdsa19sb2FkX2x1dHMoY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNf c3RhdGUpCiAJCWdsa19sb2FkX2RlZ2FtbWFfbHV0X2xpbmVhcihjcnRjX3N0YXRlKTsKIAogCWlm IChjcnRjX3N0YXRlLT5nYW1tYV9tb2RlID09IEdBTU1BX01PREVfTU9ERV84QklUKSB7Ci0JCWk5 eHhfbG9hZF9sdXRzKGNydGNfc3RhdGUpOworCQlpbGtfbG9hZF9sdXRfOChjcnRjLCBnYW1tYV9s dXQpOwogCX0gZWxzZSB7CiAJCWJkd19sb2FkX2x1dF8xMChjcnRjLCBnYW1tYV9sdXQsIFBBTF9Q UkVDX0lOREVYX1ZBTFVFKDApKTsKIAkJaXZiX2xvYWRfbHV0X2V4dF9tYXgoY3J0Yyk7CkBAIC05 MTMsNyArOTI5LDcgQEAgc3RhdGljIHZvaWQgaWNsX2xvYWRfbHV0cyhjb25zdCBzdHJ1Y3QgaW50 ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSkKIAogCXN3aXRjaCAoY3J0Y19zdGF0ZS0+Z2FtbWFf bW9kZSAmIEdBTU1BX01PREVfTU9ERV9NQVNLKSB7CiAJY2FzZSBHQU1NQV9NT0RFX01PREVfOEJJ VDoKLQkJaTl4eF9sb2FkX2x1dHMoY3J0Y19zdGF0ZSk7CisJCWlsa19sb2FkX2x1dF84KGNydGMs IGdhbW1hX2x1dCk7CiAJCWJyZWFrOwogCWNhc2UgR0FNTUFfTU9ERV9NT0RFXzEyQklUX01VTFRJ X1NFR01FTlRFRDoKIAkJaWNsX3Byb2dyYW1fZ2FtbWFfc3VwZXJmaW5lX3NlZ21lbnQoY3J0Y19z dGF0ZSk7Ci0tIAoyLjIzLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNr dG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2lu dGVsLWdmeA== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, UNWANTED_LANGUAGE_BODY,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 382A1C43331 for ; Thu, 7 Nov 2019 15:17:52 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 187E521882 for ; Thu, 7 Nov 2019 15:17:52 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 187E521882 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 737006F6E3; Thu, 7 Nov 2019 15:17:51 +0000 (UTC) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id CB8956F6E2; Thu, 7 Nov 2019 15:17:49 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 07 Nov 2019 07:17:49 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,278,1569308400"; d="scan'208";a="206174891" Received: from stinkbox.fi.intel.com (HELO stinkbox) ([10.237.72.174]) by orsmga006.jf.intel.com with SMTP; 07 Nov 2019 07:17:46 -0800 Received: by stinkbox (sSMTP sendmail emulation); Thu, 07 Nov 2019 17:17:45 +0200 From: Ville Syrjala To: intel-gfx@lists.freedesktop.org Subject: [PATCH 05/12] drm/i915: Clean up i9xx_load_luts_internal() Date: Thu, 7 Nov 2019 17:17:18 +0200 Message-Id: <20191107151725.10507-6-ville.syrjala@linux.intel.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191107151725.10507-1-ville.syrjala@linux.intel.com> References: <20191107151725.10507-1-ville.syrjala@linux.intel.com> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Swati Sharma , dri-devel@lists.freedesktop.org Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Message-ID: <20191107151718.2zzx8KbmAE3mea4g_vbJ4LRbMaxDqGWKdvNVy2wSImY@z> RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClNw bGl0IGk5eHhfbG9hZF9sdXRzX2ludGVybmFsKCkgaW50byBuZWF0IGdtY2ggdnMuIGlsaysgY2h1 bmtzLgpBdm9pZHMgYXQgbGVhc3Qgb25lIGJyYW5jaCBpbiB0aGUgaW5uZXIgbG9vcCwgYW5kIG1h a2VzIGxpZmUKYSBiaXQgbGVzcyBjb25mdXNpbmcuCgpTaWduZWQtb2ZmLWJ5OiBWaWxsZSBTeXJq w6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2Rpc3BsYXkvaW50ZWxfY29sb3IuYyB8IDk4ICsrKysrKysrKysrKystLS0tLS0tLS0K IDEgZmlsZSBjaGFuZ2VkLCA1NyBpbnNlcnRpb25zKCspLCA0MSBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2NvbG9yLmMgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2NvbG9yLmMKaW5kZXggNTQ0M2I4ZWMwYTRj Li45OTIyOTBhMDcwODYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkv aW50ZWxfY29sb3IuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2Nv bG9yLmMKQEAgLTM5Nyw0MSArMzk3LDYgQEAgc3RhdGljIHUzMiBpbGtfbHV0XzEwKGNvbnN0IHN0 cnVjdCBkcm1fY29sb3JfbHV0ICpjb2xvcikKIAkJZHJtX2NvbG9yX2x1dF9leHRyYWN0KGNvbG9y LT5ibHVlLCAxMCk7CiB9CiAKLS8qIExvYWRzIHRoZSBsZWdhY3kgcGFsZXR0ZS9nYW1tYSB1bml0 IGZvciB0aGUgQ1JUQy4gKi8KLXN0YXRpYyB2b2lkIGk5eHhfbG9hZF9sdXRzX2ludGVybmFsKGNv bnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlLAotCQkJCSAgICBjb25zdCBz dHJ1Y3QgZHJtX3Byb3BlcnR5X2Jsb2IgKmJsb2IpCi17Ci0Jc3RydWN0IGludGVsX2NydGMgKmNy dGMgPSB0b19pbnRlbF9jcnRjKGNydGNfc3RhdGUtPnVhcGkuY3J0Yyk7Ci0Jc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShjcnRjLT5iYXNlLmRldik7Ci0JZW51bSBw aXBlIHBpcGUgPSBjcnRjLT5waXBlOwotCWludCBpOwotCi0JaWYgKEhBU19HTUNIKGRldl9wcml2 KSkgewotCQlpZiAoaW50ZWxfY3J0Y19oYXNfdHlwZShjcnRjX3N0YXRlLCBJTlRFTF9PVVRQVVRf RFNJKSkKLQkJCWFzc2VydF9kc2lfcGxsX2VuYWJsZWQoZGV2X3ByaXYpOwotCQllbHNlCi0JCQlh c3NlcnRfcGxsX2VuYWJsZWQoZGV2X3ByaXYsIHBpcGUpOwotCX0KLQotCWlmIChibG9iKSB7Ci0J CWNvbnN0IHN0cnVjdCBkcm1fY29sb3JfbHV0ICpsdXQgPSBibG9iLT5kYXRhOwotCi0JCWZvciAo aSA9IDA7IGkgPCAyNTY7IGkrKykgewotCQkJdTMyIHdvcmQgPSBpOXh4X2x1dF84KCZsdXRbaV0p OwotCi0JCQlpZiAoSEFTX0dNQ0goZGV2X3ByaXYpKQotCQkJCUk5MTVfV1JJVEUoUEFMRVRURShw aXBlLCBpKSwgd29yZCk7Ci0JCQllbHNlCi0JCQkJSTkxNV9XUklURShMR0NfUEFMRVRURShwaXBl LCBpKSwgd29yZCk7Ci0JCX0KLQl9Ci19Ci0KLXN0YXRpYyB2b2lkIGk5eHhfbG9hZF9sdXRzKGNv bnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlKQotewotCWk5eHhfbG9hZF9s dXRzX2ludGVybmFsKGNydGNfc3RhdGUsIGNydGNfc3RhdGUtPmh3LmdhbW1hX2x1dCk7Ci19Ci0K IHN0YXRpYyB2b2lkIGk5eHhfY29sb3JfY29tbWl0KGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0 YXRlICpjcnRjX3N0YXRlKQogewogCXN0cnVjdCBpbnRlbF9jcnRjICpjcnRjID0gdG9faW50ZWxf Y3J0YyhjcnRjX3N0YXRlLT51YXBpLmNydGMpOwpAQCAtNDk2LDYgKzQ2MSwzNCBAQCBzdGF0aWMg dm9pZCBza2xfY29sb3JfY29tbWl0KGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRj X3N0YXRlKQogCQlpbGtfbG9hZF9jc2NfbWF0cml4KGNydGNfc3RhdGUpOwogfQogCitzdGF0aWMg dm9pZCBpOXh4X2xvYWRfbHV0Xzgoc3RydWN0IGludGVsX2NydGMgKmNydGMsCisJCQkgICAgY29u c3Qgc3RydWN0IGRybV9wcm9wZXJ0eV9ibG9iICpibG9iKQoreworCXN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoY3J0Yy0+YmFzZS5kZXYpOworCWNvbnN0IHN0cnVj dCBkcm1fY29sb3JfbHV0ICpsdXQ7CisJZW51bSBwaXBlIHBpcGUgPSBjcnRjLT5waXBlOworCWlu dCBpOworCisJaWYgKCFibG9iKQorCQlyZXR1cm47CisKKwlsdXQgPSBibG9iLT5kYXRhOworCisJ Zm9yIChpID0gMDsgaSA8IDI1NjsgaSsrKQorCQlJOTE1X1dSSVRFKFBBTEVUVEUocGlwZSwgaSks IGk5eHhfbHV0XzgoJmx1dFtpXSkpOworfQorCitzdGF0aWMgdm9pZCBpOXh4X2xvYWRfbHV0cyhj b25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSkKK3sKKwlzdHJ1Y3QgaW50 ZWxfY3J0YyAqY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Y19zdGF0ZS0+dWFwaS5jcnRjKTsKKwlz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGNydGMtPmJhc2UuZGV2 KTsKKwljb25zdCBzdHJ1Y3QgZHJtX3Byb3BlcnR5X2Jsb2IgKmdhbW1hX2x1dCA9IGNydGNfc3Rh dGUtPmh3LmdhbW1hX2x1dDsKKworCWFzc2VydF9wbGxfZW5hYmxlZChkZXZfcHJpdiwgY3J0Yy0+ cGlwZSk7CisKKwlpOXh4X2xvYWRfbHV0XzgoY3J0YywgZ2FtbWFfbHV0KTsKK30KKwogc3RhdGlj IHZvaWQgaTk2NV9sb2FkX2x1dF8xMHA2KHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAogCQkJICAg ICAgIGNvbnN0IHN0cnVjdCBkcm1fcHJvcGVydHlfYmxvYiAqYmxvYikKIHsKQEAgLTUxOSwxNCAr NTEyLDM3IEBAIHN0YXRpYyB2b2lkIGk5NjVfbG9hZF9sdXRfMTBwNihzdHJ1Y3QgaW50ZWxfY3J0 YyAqY3J0YywKIHN0YXRpYyB2b2lkIGk5NjVfbG9hZF9sdXRzKGNvbnN0IHN0cnVjdCBpbnRlbF9j cnRjX3N0YXRlICpjcnRjX3N0YXRlKQogewogCXN0cnVjdCBpbnRlbF9jcnRjICpjcnRjID0gdG9f aW50ZWxfY3J0YyhjcnRjX3N0YXRlLT51YXBpLmNydGMpOworCXN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoY3J0Yy0+YmFzZS5kZXYpOwogCWNvbnN0IHN0cnVjdCBk cm1fcHJvcGVydHlfYmxvYiAqZ2FtbWFfbHV0ID0gY3J0Y19zdGF0ZS0+aHcuZ2FtbWFfbHV0Owog CisJaWYgKGludGVsX2NydGNfaGFzX3R5cGUoY3J0Y19zdGF0ZSwgSU5URUxfT1VUUFVUX0RTSSkp CisJCWFzc2VydF9kc2lfcGxsX2VuYWJsZWQoZGV2X3ByaXYpOworCWVsc2UKKwkJYXNzZXJ0X3Bs bF9lbmFibGVkKGRldl9wcml2LCBjcnRjLT5waXBlKTsKKwogCWlmIChjcnRjX3N0YXRlLT5nYW1t YV9tb2RlID09IEdBTU1BX01PREVfTU9ERV84QklUKQotCQlpOXh4X2xvYWRfbHV0cyhjcnRjX3N0 YXRlKTsKKwkJaTl4eF9sb2FkX2x1dF84KGNydGMsIGdhbW1hX2x1dCk7CiAJZWxzZQogCQlpOTY1 X2xvYWRfbHV0XzEwcDYoY3J0YywgZ2FtbWFfbHV0KTsKIH0KIAorc3RhdGljIHZvaWQgaWxrX2xv YWRfbHV0Xzgoc3RydWN0IGludGVsX2NydGMgKmNydGMsCisJCQkgICBjb25zdCBzdHJ1Y3QgZHJt X3Byb3BlcnR5X2Jsb2IgKmJsb2IpCit7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2ID0gdG9faTkxNShjcnRjLT5iYXNlLmRldik7CisJY29uc3Qgc3RydWN0IGRybV9jb2xvcl9s dXQgKmx1dDsKKwllbnVtIHBpcGUgcGlwZSA9IGNydGMtPnBpcGU7CisJaW50IGk7CisKKwlpZiAo IWJsb2IpCisJCXJldHVybjsKKworCWx1dCA9IGJsb2ItPmRhdGE7CisKKwlmb3IgKGkgPSAwOyBp IDwgMjU2OyBpKyspCisJCUk5MTVfV1JJVEUoTEdDX1BBTEVUVEUocGlwZSwgaSksIGk5eHhfbHV0 XzgoJmx1dFtpXSkpOworfQorCiBzdGF0aWMgdm9pZCBpbGtfbG9hZF9sdXRfMTAoc3RydWN0IGlu dGVsX2NydGMgKmNydGMsCiAJCQkgICAgY29uc3Qgc3RydWN0IGRybV9wcm9wZXJ0eV9ibG9iICpi bG9iKQogewpAQCAtNTQ1LDcgKzU2MSw3IEBAIHN0YXRpYyB2b2lkIGlsa19sb2FkX2x1dHMoY29u c3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpCiAJY29uc3Qgc3RydWN0IGRy bV9wcm9wZXJ0eV9ibG9iICpnYW1tYV9sdXQgPSBjcnRjX3N0YXRlLT5ody5nYW1tYV9sdXQ7CiAK IAlpZiAoY3J0Y19zdGF0ZS0+Z2FtbWFfbW9kZSA9PSBHQU1NQV9NT0RFX01PREVfOEJJVCkKLQkJ aTl4eF9sb2FkX2x1dHMoY3J0Y19zdGF0ZSk7CisJCWlsa19sb2FkX2x1dF84KGNydGMsIGdhbW1h X2x1dCk7CiAJZWxzZQogCQlpbGtfbG9hZF9sdXRfMTAoY3J0YywgZ2FtbWFfbHV0KTsKIH0KQEAg LTY1Myw3ICs2NjksNyBAQCBzdGF0aWMgdm9pZCBpdmJfbG9hZF9sdXRzKGNvbnN0IHN0cnVjdCBp bnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlKQogCWNvbnN0IHN0cnVjdCBkcm1fcHJvcGVydHlf YmxvYiAqZGVnYW1tYV9sdXQgPSBjcnRjX3N0YXRlLT5ody5kZWdhbW1hX2x1dDsKIAogCWlmIChj cnRjX3N0YXRlLT5nYW1tYV9tb2RlID09IEdBTU1BX01PREVfTU9ERV84QklUKSB7Ci0JCWk5eHhf bG9hZF9sdXRzKGNydGNfc3RhdGUpOworCQlpbGtfbG9hZF9sdXRfOChjcnRjLCBnYW1tYV9sdXQp OwogCX0gZWxzZSBpZiAoY3J0Y19zdGF0ZS0+Z2FtbWFfbW9kZSA9PSBHQU1NQV9NT0RFX01PREVf U1BMSVQpIHsKIAkJaXZiX2xvYWRfbHV0XzEwKGNydGMsIGRlZ2FtbWFfbHV0LCBQQUxfUFJFQ19T UExJVF9NT0RFIHwKIAkJCQlQQUxfUFJFQ19JTkRFWF9WQUxVRSgwKSk7CkBAIC02NzYsNyArNjky LDcgQEAgc3RhdGljIHZvaWQgYmR3X2xvYWRfbHV0cyhjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19z dGF0ZSAqY3J0Y19zdGF0ZSkKIAljb25zdCBzdHJ1Y3QgZHJtX3Byb3BlcnR5X2Jsb2IgKmRlZ2Ft bWFfbHV0ID0gY3J0Y19zdGF0ZS0+aHcuZGVnYW1tYV9sdXQ7CiAKIAlpZiAoY3J0Y19zdGF0ZS0+ Z2FtbWFfbW9kZSA9PSBHQU1NQV9NT0RFX01PREVfOEJJVCkgewotCQlpOXh4X2xvYWRfbHV0cyhj cnRjX3N0YXRlKTsKKwkJaWxrX2xvYWRfbHV0XzgoY3J0YywgZ2FtbWFfbHV0KTsKIAl9IGVsc2Ug aWYgKGNydGNfc3RhdGUtPmdhbW1hX21vZGUgPT0gR0FNTUFfTU9ERV9NT0RFX1NQTElUKSB7CiAJ CWJkd19sb2FkX2x1dF8xMChjcnRjLCBkZWdhbW1hX2x1dCwgUEFMX1BSRUNfU1BMSVRfTU9ERSB8 CiAJCQkJUEFMX1BSRUNfSU5ERVhfVkFMVUUoMCkpOwpAQCAtNzc3LDcgKzc5Myw3IEBAIHN0YXRp YyB2b2lkIGdsa19sb2FkX2x1dHMoY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNf c3RhdGUpCiAJCWdsa19sb2FkX2RlZ2FtbWFfbHV0X2xpbmVhcihjcnRjX3N0YXRlKTsKIAogCWlm IChjcnRjX3N0YXRlLT5nYW1tYV9tb2RlID09IEdBTU1BX01PREVfTU9ERV84QklUKSB7Ci0JCWk5 eHhfbG9hZF9sdXRzKGNydGNfc3RhdGUpOworCQlpbGtfbG9hZF9sdXRfOChjcnRjLCBnYW1tYV9s dXQpOwogCX0gZWxzZSB7CiAJCWJkd19sb2FkX2x1dF8xMChjcnRjLCBnYW1tYV9sdXQsIFBBTF9Q UkVDX0lOREVYX1ZBTFVFKDApKTsKIAkJaXZiX2xvYWRfbHV0X2V4dF9tYXgoY3J0Yyk7CkBAIC05 MTMsNyArOTI5LDcgQEAgc3RhdGljIHZvaWQgaWNsX2xvYWRfbHV0cyhjb25zdCBzdHJ1Y3QgaW50 ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSkKIAogCXN3aXRjaCAoY3J0Y19zdGF0ZS0+Z2FtbWFf bW9kZSAmIEdBTU1BX01PREVfTU9ERV9NQVNLKSB7CiAJY2FzZSBHQU1NQV9NT0RFX01PREVfOEJJ VDoKLQkJaTl4eF9sb2FkX2x1dHMoY3J0Y19zdGF0ZSk7CisJCWlsa19sb2FkX2x1dF84KGNydGMs IGdhbW1hX2x1dCk7CiAJCWJyZWFrOwogCWNhc2UgR0FNTUFfTU9ERV9NT0RFXzEyQklUX01VTFRJ X1NFR01FTlRFRDoKIAkJaWNsX3Byb2dyYW1fZ2FtbWFfc3VwZXJmaW5lX3NlZ21lbnQoY3J0Y19z dGF0ZSk7Ci0tIAoyLjIzLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNr dG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2Ry aS1kZXZlbA== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, UNWANTED_LANGUAGE_BODY,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0DB03C5DF60 for ; Thu, 7 Nov 2019 15:17:51 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E1E0D21882 for ; Thu, 7 Nov 2019 15:17:50 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E1E0D21882 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 837256F6E2; Thu, 7 Nov 2019 15:17:50 +0000 (UTC) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id CB8956F6E2; Thu, 7 Nov 2019 15:17:49 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 07 Nov 2019 07:17:49 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,278,1569308400"; d="scan'208";a="206174891" Received: from stinkbox.fi.intel.com (HELO stinkbox) ([10.237.72.174]) by orsmga006.jf.intel.com with SMTP; 07 Nov 2019 07:17:46 -0800 Received: by stinkbox (sSMTP sendmail emulation); Thu, 07 Nov 2019 17:17:45 +0200 From: Ville Syrjala To: intel-gfx@lists.freedesktop.org Date: Thu, 7 Nov 2019 17:17:18 +0200 Message-Id: <20191107151725.10507-6-ville.syrjala@linux.intel.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191107151725.10507-1-ville.syrjala@linux.intel.com> References: <20191107151725.10507-1-ville.syrjala@linux.intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH 05/12] drm/i915: Clean up i9xx_load_luts_internal() X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: dri-devel@lists.freedesktop.org Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Message-ID: <20191107151718.e62_eb5Bd4zHO0dLWEeAmUx665C3H2OjhwaoYwgUaoI@z> RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClNw bGl0IGk5eHhfbG9hZF9sdXRzX2ludGVybmFsKCkgaW50byBuZWF0IGdtY2ggdnMuIGlsaysgY2h1 bmtzLgpBdm9pZHMgYXQgbGVhc3Qgb25lIGJyYW5jaCBpbiB0aGUgaW5uZXIgbG9vcCwgYW5kIG1h a2VzIGxpZmUKYSBiaXQgbGVzcyBjb25mdXNpbmcuCgpTaWduZWQtb2ZmLWJ5OiBWaWxsZSBTeXJq w6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2Rpc3BsYXkvaW50ZWxfY29sb3IuYyB8IDk4ICsrKysrKysrKysrKystLS0tLS0tLS0K IDEgZmlsZSBjaGFuZ2VkLCA1NyBpbnNlcnRpb25zKCspLCA0MSBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2NvbG9yLmMgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2NvbG9yLmMKaW5kZXggNTQ0M2I4ZWMwYTRj Li45OTIyOTBhMDcwODYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkv aW50ZWxfY29sb3IuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2Nv bG9yLmMKQEAgLTM5Nyw0MSArMzk3LDYgQEAgc3RhdGljIHUzMiBpbGtfbHV0XzEwKGNvbnN0IHN0 cnVjdCBkcm1fY29sb3JfbHV0ICpjb2xvcikKIAkJZHJtX2NvbG9yX2x1dF9leHRyYWN0KGNvbG9y LT5ibHVlLCAxMCk7CiB9CiAKLS8qIExvYWRzIHRoZSBsZWdhY3kgcGFsZXR0ZS9nYW1tYSB1bml0 IGZvciB0aGUgQ1JUQy4gKi8KLXN0YXRpYyB2b2lkIGk5eHhfbG9hZF9sdXRzX2ludGVybmFsKGNv bnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlLAotCQkJCSAgICBjb25zdCBz dHJ1Y3QgZHJtX3Byb3BlcnR5X2Jsb2IgKmJsb2IpCi17Ci0Jc3RydWN0IGludGVsX2NydGMgKmNy dGMgPSB0b19pbnRlbF9jcnRjKGNydGNfc3RhdGUtPnVhcGkuY3J0Yyk7Ci0Jc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShjcnRjLT5iYXNlLmRldik7Ci0JZW51bSBw aXBlIHBpcGUgPSBjcnRjLT5waXBlOwotCWludCBpOwotCi0JaWYgKEhBU19HTUNIKGRldl9wcml2 KSkgewotCQlpZiAoaW50ZWxfY3J0Y19oYXNfdHlwZShjcnRjX3N0YXRlLCBJTlRFTF9PVVRQVVRf RFNJKSkKLQkJCWFzc2VydF9kc2lfcGxsX2VuYWJsZWQoZGV2X3ByaXYpOwotCQllbHNlCi0JCQlh c3NlcnRfcGxsX2VuYWJsZWQoZGV2X3ByaXYsIHBpcGUpOwotCX0KLQotCWlmIChibG9iKSB7Ci0J CWNvbnN0IHN0cnVjdCBkcm1fY29sb3JfbHV0ICpsdXQgPSBibG9iLT5kYXRhOwotCi0JCWZvciAo aSA9IDA7IGkgPCAyNTY7IGkrKykgewotCQkJdTMyIHdvcmQgPSBpOXh4X2x1dF84KCZsdXRbaV0p OwotCi0JCQlpZiAoSEFTX0dNQ0goZGV2X3ByaXYpKQotCQkJCUk5MTVfV1JJVEUoUEFMRVRURShw aXBlLCBpKSwgd29yZCk7Ci0JCQllbHNlCi0JCQkJSTkxNV9XUklURShMR0NfUEFMRVRURShwaXBl LCBpKSwgd29yZCk7Ci0JCX0KLQl9Ci19Ci0KLXN0YXRpYyB2b2lkIGk5eHhfbG9hZF9sdXRzKGNv bnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlKQotewotCWk5eHhfbG9hZF9s dXRzX2ludGVybmFsKGNydGNfc3RhdGUsIGNydGNfc3RhdGUtPmh3LmdhbW1hX2x1dCk7Ci19Ci0K IHN0YXRpYyB2b2lkIGk5eHhfY29sb3JfY29tbWl0KGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0 YXRlICpjcnRjX3N0YXRlKQogewogCXN0cnVjdCBpbnRlbF9jcnRjICpjcnRjID0gdG9faW50ZWxf Y3J0YyhjcnRjX3N0YXRlLT51YXBpLmNydGMpOwpAQCAtNDk2LDYgKzQ2MSwzNCBAQCBzdGF0aWMg dm9pZCBza2xfY29sb3JfY29tbWl0KGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRj X3N0YXRlKQogCQlpbGtfbG9hZF9jc2NfbWF0cml4KGNydGNfc3RhdGUpOwogfQogCitzdGF0aWMg dm9pZCBpOXh4X2xvYWRfbHV0Xzgoc3RydWN0IGludGVsX2NydGMgKmNydGMsCisJCQkgICAgY29u c3Qgc3RydWN0IGRybV9wcm9wZXJ0eV9ibG9iICpibG9iKQoreworCXN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoY3J0Yy0+YmFzZS5kZXYpOworCWNvbnN0IHN0cnVj dCBkcm1fY29sb3JfbHV0ICpsdXQ7CisJZW51bSBwaXBlIHBpcGUgPSBjcnRjLT5waXBlOworCWlu dCBpOworCisJaWYgKCFibG9iKQorCQlyZXR1cm47CisKKwlsdXQgPSBibG9iLT5kYXRhOworCisJ Zm9yIChpID0gMDsgaSA8IDI1NjsgaSsrKQorCQlJOTE1X1dSSVRFKFBBTEVUVEUocGlwZSwgaSks IGk5eHhfbHV0XzgoJmx1dFtpXSkpOworfQorCitzdGF0aWMgdm9pZCBpOXh4X2xvYWRfbHV0cyhj b25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSkKK3sKKwlzdHJ1Y3QgaW50 ZWxfY3J0YyAqY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Y19zdGF0ZS0+dWFwaS5jcnRjKTsKKwlz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGNydGMtPmJhc2UuZGV2 KTsKKwljb25zdCBzdHJ1Y3QgZHJtX3Byb3BlcnR5X2Jsb2IgKmdhbW1hX2x1dCA9IGNydGNfc3Rh dGUtPmh3LmdhbW1hX2x1dDsKKworCWFzc2VydF9wbGxfZW5hYmxlZChkZXZfcHJpdiwgY3J0Yy0+ cGlwZSk7CisKKwlpOXh4X2xvYWRfbHV0XzgoY3J0YywgZ2FtbWFfbHV0KTsKK30KKwogc3RhdGlj IHZvaWQgaTk2NV9sb2FkX2x1dF8xMHA2KHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAogCQkJICAg ICAgIGNvbnN0IHN0cnVjdCBkcm1fcHJvcGVydHlfYmxvYiAqYmxvYikKIHsKQEAgLTUxOSwxNCAr NTEyLDM3IEBAIHN0YXRpYyB2b2lkIGk5NjVfbG9hZF9sdXRfMTBwNihzdHJ1Y3QgaW50ZWxfY3J0 YyAqY3J0YywKIHN0YXRpYyB2b2lkIGk5NjVfbG9hZF9sdXRzKGNvbnN0IHN0cnVjdCBpbnRlbF9j cnRjX3N0YXRlICpjcnRjX3N0YXRlKQogewogCXN0cnVjdCBpbnRlbF9jcnRjICpjcnRjID0gdG9f aW50ZWxfY3J0YyhjcnRjX3N0YXRlLT51YXBpLmNydGMpOworCXN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoY3J0Yy0+YmFzZS5kZXYpOwogCWNvbnN0IHN0cnVjdCBk cm1fcHJvcGVydHlfYmxvYiAqZ2FtbWFfbHV0ID0gY3J0Y19zdGF0ZS0+aHcuZ2FtbWFfbHV0Owog CisJaWYgKGludGVsX2NydGNfaGFzX3R5cGUoY3J0Y19zdGF0ZSwgSU5URUxfT1VUUFVUX0RTSSkp CisJCWFzc2VydF9kc2lfcGxsX2VuYWJsZWQoZGV2X3ByaXYpOworCWVsc2UKKwkJYXNzZXJ0X3Bs bF9lbmFibGVkKGRldl9wcml2LCBjcnRjLT5waXBlKTsKKwogCWlmIChjcnRjX3N0YXRlLT5nYW1t YV9tb2RlID09IEdBTU1BX01PREVfTU9ERV84QklUKQotCQlpOXh4X2xvYWRfbHV0cyhjcnRjX3N0 YXRlKTsKKwkJaTl4eF9sb2FkX2x1dF84KGNydGMsIGdhbW1hX2x1dCk7CiAJZWxzZQogCQlpOTY1 X2xvYWRfbHV0XzEwcDYoY3J0YywgZ2FtbWFfbHV0KTsKIH0KIAorc3RhdGljIHZvaWQgaWxrX2xv YWRfbHV0Xzgoc3RydWN0IGludGVsX2NydGMgKmNydGMsCisJCQkgICBjb25zdCBzdHJ1Y3QgZHJt X3Byb3BlcnR5X2Jsb2IgKmJsb2IpCit7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2ID0gdG9faTkxNShjcnRjLT5iYXNlLmRldik7CisJY29uc3Qgc3RydWN0IGRybV9jb2xvcl9s dXQgKmx1dDsKKwllbnVtIHBpcGUgcGlwZSA9IGNydGMtPnBpcGU7CisJaW50IGk7CisKKwlpZiAo IWJsb2IpCisJCXJldHVybjsKKworCWx1dCA9IGJsb2ItPmRhdGE7CisKKwlmb3IgKGkgPSAwOyBp IDwgMjU2OyBpKyspCisJCUk5MTVfV1JJVEUoTEdDX1BBTEVUVEUocGlwZSwgaSksIGk5eHhfbHV0 XzgoJmx1dFtpXSkpOworfQorCiBzdGF0aWMgdm9pZCBpbGtfbG9hZF9sdXRfMTAoc3RydWN0IGlu dGVsX2NydGMgKmNydGMsCiAJCQkgICAgY29uc3Qgc3RydWN0IGRybV9wcm9wZXJ0eV9ibG9iICpi bG9iKQogewpAQCAtNTQ1LDcgKzU2MSw3IEBAIHN0YXRpYyB2b2lkIGlsa19sb2FkX2x1dHMoY29u c3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpCiAJY29uc3Qgc3RydWN0IGRy bV9wcm9wZXJ0eV9ibG9iICpnYW1tYV9sdXQgPSBjcnRjX3N0YXRlLT5ody5nYW1tYV9sdXQ7CiAK IAlpZiAoY3J0Y19zdGF0ZS0+Z2FtbWFfbW9kZSA9PSBHQU1NQV9NT0RFX01PREVfOEJJVCkKLQkJ aTl4eF9sb2FkX2x1dHMoY3J0Y19zdGF0ZSk7CisJCWlsa19sb2FkX2x1dF84KGNydGMsIGdhbW1h X2x1dCk7CiAJZWxzZQogCQlpbGtfbG9hZF9sdXRfMTAoY3J0YywgZ2FtbWFfbHV0KTsKIH0KQEAg LTY1Myw3ICs2NjksNyBAQCBzdGF0aWMgdm9pZCBpdmJfbG9hZF9sdXRzKGNvbnN0IHN0cnVjdCBp bnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlKQogCWNvbnN0IHN0cnVjdCBkcm1fcHJvcGVydHlf YmxvYiAqZGVnYW1tYV9sdXQgPSBjcnRjX3N0YXRlLT5ody5kZWdhbW1hX2x1dDsKIAogCWlmIChj cnRjX3N0YXRlLT5nYW1tYV9tb2RlID09IEdBTU1BX01PREVfTU9ERV84QklUKSB7Ci0JCWk5eHhf bG9hZF9sdXRzKGNydGNfc3RhdGUpOworCQlpbGtfbG9hZF9sdXRfOChjcnRjLCBnYW1tYV9sdXQp OwogCX0gZWxzZSBpZiAoY3J0Y19zdGF0ZS0+Z2FtbWFfbW9kZSA9PSBHQU1NQV9NT0RFX01PREVf U1BMSVQpIHsKIAkJaXZiX2xvYWRfbHV0XzEwKGNydGMsIGRlZ2FtbWFfbHV0LCBQQUxfUFJFQ19T UExJVF9NT0RFIHwKIAkJCQlQQUxfUFJFQ19JTkRFWF9WQUxVRSgwKSk7CkBAIC02NzYsNyArNjky LDcgQEAgc3RhdGljIHZvaWQgYmR3X2xvYWRfbHV0cyhjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19z dGF0ZSAqY3J0Y19zdGF0ZSkKIAljb25zdCBzdHJ1Y3QgZHJtX3Byb3BlcnR5X2Jsb2IgKmRlZ2Ft bWFfbHV0ID0gY3J0Y19zdGF0ZS0+aHcuZGVnYW1tYV9sdXQ7CiAKIAlpZiAoY3J0Y19zdGF0ZS0+ Z2FtbWFfbW9kZSA9PSBHQU1NQV9NT0RFX01PREVfOEJJVCkgewotCQlpOXh4X2xvYWRfbHV0cyhj cnRjX3N0YXRlKTsKKwkJaWxrX2xvYWRfbHV0XzgoY3J0YywgZ2FtbWFfbHV0KTsKIAl9IGVsc2Ug aWYgKGNydGNfc3RhdGUtPmdhbW1hX21vZGUgPT0gR0FNTUFfTU9ERV9NT0RFX1NQTElUKSB7CiAJ CWJkd19sb2FkX2x1dF8xMChjcnRjLCBkZWdhbW1hX2x1dCwgUEFMX1BSRUNfU1BMSVRfTU9ERSB8 CiAJCQkJUEFMX1BSRUNfSU5ERVhfVkFMVUUoMCkpOwpAQCAtNzc3LDcgKzc5Myw3IEBAIHN0YXRp YyB2b2lkIGdsa19sb2FkX2x1dHMoY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNf c3RhdGUpCiAJCWdsa19sb2FkX2RlZ2FtbWFfbHV0X2xpbmVhcihjcnRjX3N0YXRlKTsKIAogCWlm IChjcnRjX3N0YXRlLT5nYW1tYV9tb2RlID09IEdBTU1BX01PREVfTU9ERV84QklUKSB7Ci0JCWk5 eHhfbG9hZF9sdXRzKGNydGNfc3RhdGUpOworCQlpbGtfbG9hZF9sdXRfOChjcnRjLCBnYW1tYV9s dXQpOwogCX0gZWxzZSB7CiAJCWJkd19sb2FkX2x1dF8xMChjcnRjLCBnYW1tYV9sdXQsIFBBTF9Q UkVDX0lOREVYX1ZBTFVFKDApKTsKIAkJaXZiX2xvYWRfbHV0X2V4dF9tYXgoY3J0Yyk7CkBAIC05 MTMsNyArOTI5LDcgQEAgc3RhdGljIHZvaWQgaWNsX2xvYWRfbHV0cyhjb25zdCBzdHJ1Y3QgaW50 ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSkKIAogCXN3aXRjaCAoY3J0Y19zdGF0ZS0+Z2FtbWFf bW9kZSAmIEdBTU1BX01PREVfTU9ERV9NQVNLKSB7CiAJY2FzZSBHQU1NQV9NT0RFX01PREVfOEJJ VDoKLQkJaTl4eF9sb2FkX2x1dHMoY3J0Y19zdGF0ZSk7CisJCWlsa19sb2FkX2x1dF84KGNydGMs IGdhbW1hX2x1dCk7CiAJCWJyZWFrOwogCWNhc2UgR0FNTUFfTU9ERV9NT0RFXzEyQklUX01VTFRJ X1NFR01FTlRFRDoKIAkJaWNsX3Byb2dyYW1fZ2FtbWFfc3VwZXJmaW5lX3NlZ21lbnQoY3J0Y19z dGF0ZSk7Ci0tIAoyLjIzLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNr dG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2lu dGVsLWdmeA==