From: Ander Conselvan de Oliveira Subject: [PATCH v2 7/8] drm/i915: Remove direct usages of intel_crtc->config from DDI code Date: Wed, 1 Mar 2017 16:13:17 +0200 Message-ID: <20170301141318.3607-8-ander.conselvan.de.oliveira@intel.com> References: <20170301141318.3607-1-ander.conselvan.de.oliveira@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id C3BC66E94D for ; Wed, 1 Mar 2017 14:13:59 +0000 (UTC) In-Reply-To: <20170301141318.3607-1-ander.conselvan.de.oliveira@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: Ander Conselvan de Oliveira List-Id: intel-gfx@lists.freedesktop.org UmVtb3ZlIGRpcmVjdCB1c2FnZXMgb2YgaW50ZWxfY3J0Yy0+Y29uZmlnIGZyb20gdGhlIERESSBj b2RlLiBGdW5jdGlvbnMKdGhhdCBkaWRuJ3QgeWV0IHRha2UgYSBwaXBlX2NvbmZpZyBhcyBhbiBh cmd1bWVudCB3ZXJlIGNvdmVydGVkIHRvIGRvCnNvLgoKU2lnbmVkLW9mZi1ieTogQW5kZXIgQ29u c2VsdmFuIGRlIE9saXZlaXJhIDxhbmRlci5jb25zZWx2YW4uZGUub2xpdmVpcmFAaW50ZWwuY29t PgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RkaS5jICAgICB8IDYxICsrKysrKysr KysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZGlzcGxheS5jIHwgMTIgKysrLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2Lmgg ICAgIHwgMTYgKysrKysrKy0tLQogMyBmaWxlcyBjaGFuZ2VkLCA0OSBpbnNlcnRpb25zKCspLCA0 MCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k ZGkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RkaS5jCmluZGV4IDVlMjFiYjUuLjJm MjZjNzUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RkaS5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RkaS5jCkBAIC0xMTkzLDExICsxMTkzLDEyIEBA IGJvb2wgaW50ZWxfZGRpX3BsbF9zZWxlY3Qoc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMs CiAJCQkJCSAgaW50ZWxfZW5jb2Rlcik7CiB9CiAKLXZvaWQgaW50ZWxfZGRpX3NldF9waXBlX3Nl dHRpbmdzKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQordm9pZCBpbnRlbF9kZGlfc2V0X3BpcGVf c2V0dGluZ3Moc3RydWN0IGludGVsX2NydGMgKmNydGMsCisJCQkJIHN0cnVjdCBpbnRlbF9jcnRj X3N0YXRlICpwaXBlX2NvbmZpZykKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYgPSB0b19pOTE1KGNydGMtPmJhc2UuZGV2KTsKIAlzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqaW50 ZWxfZW5jb2RlciA9IGludGVsX2RkaV9nZXRfY3J0Y19lbmNvZGVyKGNydGMpOwotCWVudW0gdHJh bnNjb2RlciBjcHVfdHJhbnNjb2RlciA9IGNydGMtPmNvbmZpZy0+Y3B1X3RyYW5zY29kZXI7CisJ ZW51bSB0cmFuc2NvZGVyIGNwdV90cmFuc2NvZGVyID0gcGlwZV9jb25maWctPmNwdV90cmFuc2Nv ZGVyOwogCWludCB0eXBlID0gaW50ZWxfZW5jb2Rlci0+dHlwZTsKIAl1aW50MzJfdCB0ZW1wOwog CkBAIC0xMjA1LDcgKzEyMDYsNyBAQCB2b2lkIGludGVsX2RkaV9zZXRfcGlwZV9zZXR0aW5ncyhz dHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKIAkJV0FSTl9PTih0cmFuc2NvZGVyX2lzX2RzaShjcHVf dHJhbnNjb2RlcikpOwogCiAJCXRlbXAgPSBUUkFOU19NU0FfU1lOQ19DTEs7Ci0JCXN3aXRjaCAo Y3J0Yy0+Y29uZmlnLT5waXBlX2JwcCkgeworCQlzd2l0Y2ggKHBpcGVfY29uZmlnLT5waXBlX2Jw cCkgewogCQljYXNlIDE4OgogCQkJdGVtcCB8PSBUUkFOU19NU0FfNl9CUEM7CiAJCQlicmVhazsK QEAgLTEyMjUsMTAgKzEyMjYsMTIgQEAgdm9pZCBpbnRlbF9kZGlfc2V0X3BpcGVfc2V0dGluZ3Mo c3RydWN0IGludGVsX2NydGMgKmNydGMpCiAJfQogfQogCi12b2lkIGludGVsX2RkaV9zZXRfdmNf cGF5bG9hZF9hbGxvYyhzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywgYm9vbCBzdGF0ZSkKK3ZvaWQg aW50ZWxfZGRpX3NldF92Y19wYXlsb2FkX2FsbG9jKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAor CQkJCSAgICBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqcGlwZV9jb25maWcsCisJCQkJICAgIGJv b2wgc3RhdGUpCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkx NShjcnRjLT5iYXNlLmRldik7Ci0JZW51bSB0cmFuc2NvZGVyIGNwdV90cmFuc2NvZGVyID0gY3J0 Yy0+Y29uZmlnLT5jcHVfdHJhbnNjb2RlcjsKKwllbnVtIHRyYW5zY29kZXIgY3B1X3RyYW5zY29k ZXIgPSBwaXBlX2NvbmZpZy0+Y3B1X3RyYW5zY29kZXI7CiAJdWludDMyX3QgdGVtcDsKIAl0ZW1w ID0gSTkxNV9SRUFEKFRSQU5TX0RESV9GVU5DX0NUTChjcHVfdHJhbnNjb2RlcikpOwogCWlmIChz dGF0ZSA9PSB0cnVlKQpAQCAtMTIzOCwxMiArMTI0MSwxMyBAQCB2b2lkIGludGVsX2RkaV9zZXRf dmNfcGF5bG9hZF9hbGxvYyhzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywgYm9vbCBzdGF0ZSkKIAlJ OTE1X1dSSVRFKFRSQU5TX0RESV9GVU5DX0NUTChjcHVfdHJhbnNjb2RlciksIHRlbXApOwogfQog Ci12b2lkIGludGVsX2RkaV9lbmFibGVfdHJhbnNjb2Rlcl9mdW5jKHN0cnVjdCBpbnRlbF9jcnRj ICpjcnRjKQordm9pZCBpbnRlbF9kZGlfZW5hYmxlX3RyYW5zY29kZXJfZnVuYyhzdHJ1Y3QgaW50 ZWxfY3J0YyAqY3J0YywKKwkJCQkgICAgICBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqcGlwZV9j b25maWcpCiB7CiAJc3RydWN0IGludGVsX2VuY29kZXIgKmludGVsX2VuY29kZXIgPSBpbnRlbF9k ZGlfZ2V0X2NydGNfZW5jb2RlcihjcnRjKTsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYgPSB0b19pOTE1KGNydGMtPmJhc2UuZGV2KTsKIAllbnVtIHBpcGUgcGlwZSA9IGNydGMt PnBpcGU7Ci0JZW51bSB0cmFuc2NvZGVyIGNwdV90cmFuc2NvZGVyID0gY3J0Yy0+Y29uZmlnLT5j cHVfdHJhbnNjb2RlcjsKKwllbnVtIHRyYW5zY29kZXIgY3B1X3RyYW5zY29kZXIgPSBwaXBlX2Nv bmZpZy0+Y3B1X3RyYW5zY29kZXI7CiAJZW51bSBwb3J0IHBvcnQgPSBpbnRlbF9kZGlfZ2V0X2Vu Y29kZXJfcG9ydChpbnRlbF9lbmNvZGVyKTsKIAlpbnQgdHlwZSA9IGludGVsX2VuY29kZXItPnR5 cGU7CiAJdWludDMyX3QgdGVtcDsKQEAgLTEyNTIsNyArMTI1Niw3IEBAIHZvaWQgaW50ZWxfZGRp X2VuYWJsZV90cmFuc2NvZGVyX2Z1bmMoc3RydWN0IGludGVsX2NydGMgKmNydGMpCiAJdGVtcCA9 IFRSQU5TX0RESV9GVU5DX0VOQUJMRTsKIAl0ZW1wIHw9IFRSQU5TX0RESV9TRUxFQ1RfUE9SVChw b3J0KTsKIAotCXN3aXRjaCAoY3J0Yy0+Y29uZmlnLT5waXBlX2JwcCkgeworCXN3aXRjaCAocGlw ZV9jb25maWctPnBpcGVfYnBwKSB7CiAJY2FzZSAxODoKIAkJdGVtcCB8PSBUUkFOU19ERElfQlBD XzY7CiAJCWJyZWFrOwpAQCAtMTI2OSw5ICsxMjczLDkgQEAgdm9pZCBpbnRlbF9kZGlfZW5hYmxl X3RyYW5zY29kZXJfZnVuYyhzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKIAkJQlVHKCk7CiAJfQog Ci0JaWYgKGNydGMtPmNvbmZpZy0+YmFzZS5hZGp1c3RlZF9tb2RlLmZsYWdzICYgRFJNX01PREVf RkxBR19QVlNZTkMpCisJaWYgKHBpcGVfY29uZmlnLT5iYXNlLmFkanVzdGVkX21vZGUuZmxhZ3Mg JiBEUk1fTU9ERV9GTEFHX1BWU1lOQykKIAkJdGVtcCB8PSBUUkFOU19ERElfUFZTWU5DOwotCWlm IChjcnRjLT5jb25maWctPmJhc2UuYWRqdXN0ZWRfbW9kZS5mbGFncyAmIERSTV9NT0RFX0ZMQUdf UEhTWU5DKQorCWlmIChwaXBlX2NvbmZpZy0+YmFzZS5hZGp1c3RlZF9tb2RlLmZsYWdzICYgRFJN X01PREVfRkxBR19QSFNZTkMpCiAJCXRlbXAgfD0gVFJBTlNfRERJX1BIU1lOQzsKIAogCWlmIChj cHVfdHJhbnNjb2RlciA9PSBUUkFOU0NPREVSX0VEUCkgewpAQCAtMTI4Miw4ICsxMjg2LDggQEAg dm9pZCBpbnRlbF9kZGlfZW5hYmxlX3RyYW5zY29kZXJfZnVuYyhzdHJ1Y3QgaW50ZWxfY3J0YyAq Y3J0YykKIAkJCSAqIHVzaW5nIG1vdGlvbiBibHVyIG1pdGlnYXRpb24gKHdoaWNoIHdlIGRvbid0 CiAJCQkgKiBzdXBwb3J0KS4gKi8KIAkJCWlmIChJU19IQVNXRUxMKGRldl9wcml2KSAmJgotCQkJ ICAgIChjcnRjLT5jb25maWctPnBjaF9wZml0LmVuYWJsZWQgfHwKLQkJCSAgICAgY3J0Yy0+Y29u ZmlnLT5wY2hfcGZpdC5mb3JjZV90aHJ1KSkKKwkJCSAgICAocGlwZV9jb25maWctPnBjaF9wZml0 LmVuYWJsZWQgfHwKKwkJCSAgICAgcGlwZV9jb25maWctPnBjaF9wZml0LmZvcmNlX3RocnUpKQog CQkJCXRlbXAgfD0gVFJBTlNfRERJX0VEUF9JTlBVVF9BX09OT0ZGOwogCQkJZWxzZQogCQkJCXRl bXAgfD0gVFJBTlNfRERJX0VEUF9JTlBVVF9BX09OOwpAQCAtMTMwMSwyMCArMTMwNSwyMCBAQCB2 b2lkIGludGVsX2RkaV9lbmFibGVfdHJhbnNjb2Rlcl9mdW5jKHN0cnVjdCBpbnRlbF9jcnRjICpj cnRjKQogCX0KIAogCWlmICh0eXBlID09IElOVEVMX09VVFBVVF9IRE1JKSB7Ci0JCWlmIChjcnRj LT5jb25maWctPmhhc19oZG1pX3NpbmspCisJCWlmIChwaXBlX2NvbmZpZy0+aGFzX2hkbWlfc2lu aykKIAkJCXRlbXAgfD0gVFJBTlNfRERJX01PREVfU0VMRUNUX0hETUk7CiAJCWVsc2UKIAkJCXRl bXAgfD0gVFJBTlNfRERJX01PREVfU0VMRUNUX0RWSTsKIAl9IGVsc2UgaWYgKHR5cGUgPT0gSU5U RUxfT1VUUFVUX0FOQUxPRykgewogCQl0ZW1wIHw9IFRSQU5TX0RESV9NT0RFX1NFTEVDVF9GREk7 Ci0JCXRlbXAgfD0gKGNydGMtPmNvbmZpZy0+ZmRpX2xhbmVzIC0gMSkgPDwgMTsKKwkJdGVtcCB8 PSAocGlwZV9jb25maWctPmZkaV9sYW5lcyAtIDEpIDw8IDE7CiAJfSBlbHNlIGlmICh0eXBlID09 IElOVEVMX09VVFBVVF9EUCB8fAogCQkgICB0eXBlID09IElOVEVMX09VVFBVVF9FRFApIHsKIAkJ dGVtcCB8PSBUUkFOU19ERElfTU9ERV9TRUxFQ1RfRFBfU1NUOwotCQl0ZW1wIHw9IERESV9QT1JU X1dJRFRIKGNydGMtPmNvbmZpZy0+bGFuZV9jb3VudCk7CisJCXRlbXAgfD0gRERJX1BPUlRfV0lE VEgocGlwZV9jb25maWctPmxhbmVfY291bnQpOwogCX0gZWxzZSBpZiAodHlwZSA9PSBJTlRFTF9P VVRQVVRfRFBfTVNUKSB7CiAJCXRlbXAgfD0gVFJBTlNfRERJX01PREVfU0VMRUNUX0RQX01TVDsK LQkJdGVtcCB8PSBERElfUE9SVF9XSURUSChjcnRjLT5jb25maWctPmxhbmVfY291bnQpOworCQl0 ZW1wIHw9IERESV9QT1JUX1dJRFRIKHBpcGVfY29uZmlnLT5sYW5lX2NvdW50KTsKIAl9IGVsc2Ug ewogCQlXQVJOKDEsICJJbnZhbGlkIGVuY29kZXIgdHlwZSAlZCBmb3IgcGlwZSAlY1xuIiwKIAkJ ICAgICBpbnRlbF9lbmNvZGVyLT50eXBlLCBwaXBlX25hbWUocGlwZSkpOwpAQCAtMTQ3OCwyMiAr MTQ4MiwyNCBAQCBzdGF0aWMgdTY0IGludGVsX2RkaV9nZXRfcG93ZXJfZG9tYWlucyhzdHJ1Y3Qg aW50ZWxfZW5jb2RlciAqZW5jb2RlcikKIAlyZXR1cm4gMDsKIH0KIAotdm9pZCBpbnRlbF9kZGlf ZW5hYmxlX3BpcGVfY2xvY2soc3RydWN0IGludGVsX2NydGMgKmNydGMpCit2b2lkIGludGVsX2Rk aV9lbmFibGVfcGlwZV9jbG9jayhzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywKKwkJCQkgc3RydWN0 IGludGVsX2NydGNfc3RhdGUgKnBpcGVfY29uZmlnKQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoY3J0Yy0+YmFzZS5kZXYpOwogCXN0cnVjdCBpbnRlbF9l bmNvZGVyICppbnRlbF9lbmNvZGVyID0gaW50ZWxfZGRpX2dldF9jcnRjX2VuY29kZXIoY3J0Yyk7 CiAJZW51bSBwb3J0IHBvcnQgPSBpbnRlbF9kZGlfZ2V0X2VuY29kZXJfcG9ydChpbnRlbF9lbmNv ZGVyKTsKLQllbnVtIHRyYW5zY29kZXIgY3B1X3RyYW5zY29kZXIgPSBjcnRjLT5jb25maWctPmNw dV90cmFuc2NvZGVyOworCWVudW0gdHJhbnNjb2RlciBjcHVfdHJhbnNjb2RlciA9IHBpcGVfY29u ZmlnLT5jcHVfdHJhbnNjb2RlcjsKIAogCWlmIChjcHVfdHJhbnNjb2RlciAhPSBUUkFOU0NPREVS X0VEUCkKIAkJSTkxNV9XUklURShUUkFOU19DTEtfU0VMKGNwdV90cmFuc2NvZGVyKSwKIAkJCSAg IFRSQU5TX0NMS19TRUxfUE9SVChwb3J0KSk7CiB9CiAKLXZvaWQgaW50ZWxfZGRpX2Rpc2FibGVf cGlwZV9jbG9jayhzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YykKK3ZvaWQgaW50ZWxfZGRp X2Rpc2FibGVfcGlwZV9jbG9jayhzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YywKKwkJCQkg IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpwaXBlX2NvbmZpZykKIHsKIAlzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGludGVsX2NydGMtPmJhc2UuZGV2KTsKLQll bnVtIHRyYW5zY29kZXIgY3B1X3RyYW5zY29kZXIgPSBpbnRlbF9jcnRjLT5jb25maWctPmNwdV90 cmFuc2NvZGVyOworCWVudW0gdHJhbnNjb2RlciBjcHVfdHJhbnNjb2RlciA9IHBpcGVfY29uZmln LT5jcHVfdHJhbnNjb2RlcjsKIAogCWlmIChjcHVfdHJhbnNjb2RlciAhPSBUUkFOU0NPREVSX0VE UCkKIAkJSTkxNV9XUklURShUUkFOU19DTEtfU0VMKGNwdV90cmFuc2NvZGVyKSwKQEAgLTE3NTks MjMgKzE3NjUsMjEgQEAgc3RhdGljIHZvaWQgaW50ZWxfZGRpX3ByZV9lbmFibGUoc3RydWN0IGlu dGVsX2VuY29kZXIgKmludGVsX2VuY29kZXIsCiAJCQkJIHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRl ICpwaXBlX2NvbmZpZywKIAkJCQkgc3RydWN0IGRybV9jb25uZWN0b3Jfc3RhdGUgKmNvbm5fc3Rh dGUpCiB7Ci0Jc3RydWN0IGRybV9lbmNvZGVyICplbmNvZGVyID0gJmludGVsX2VuY29kZXItPmJh c2U7Ci0Jc3RydWN0IGludGVsX2NydGMgKmNydGMgPSB0b19pbnRlbF9jcnRjKGVuY29kZXItPmNy dGMpOwogCWludCB0eXBlID0gaW50ZWxfZW5jb2Rlci0+dHlwZTsKIAogCWlmICh0eXBlID09IElO VEVMX09VVFBVVF9EUCB8fCB0eXBlID09IElOVEVMX09VVFBVVF9FRFApIHsKIAkJaW50ZWxfZGRp X3ByZV9lbmFibGVfZHAoaW50ZWxfZW5jb2RlciwKLQkJCQkJY3J0Yy0+Y29uZmlnLT5wb3J0X2Ns b2NrLAotCQkJCQljcnRjLT5jb25maWctPmxhbmVfY291bnQsCi0JCQkJCWNydGMtPmNvbmZpZy0+ c2hhcmVkX2RwbGwsCi0JCQkJCWludGVsX2NydGNfaGFzX3R5cGUoY3J0Yy0+Y29uZmlnLAorCQkJ CQlwaXBlX2NvbmZpZy0+cG9ydF9jbG9jaywKKwkJCQkJcGlwZV9jb25maWctPmxhbmVfY291bnQs CisJCQkJCXBpcGVfY29uZmlnLT5zaGFyZWRfZHBsbCwKKwkJCQkJaW50ZWxfY3J0Y19oYXNfdHlw ZShwaXBlX2NvbmZpZywKIAkJCQkJCQkgICAgSU5URUxfT1VUUFVUX0RQX01TVCkpOwogCX0KIAlp ZiAodHlwZSA9PSBJTlRFTF9PVVRQVVRfSERNSSkgewogCQlpbnRlbF9kZGlfcHJlX2VuYWJsZV9o ZG1pKGludGVsX2VuY29kZXIsCiAJCQkJCSAgcGlwZV9jb25maWctPmhhc19oZG1pX3NpbmssCiAJ CQkJCSAgcGlwZV9jb25maWcsIGNvbm5fc3RhdGUsCi0JCQkJCSAgY3J0Yy0+Y29uZmlnLT5zaGFy ZWRfZHBsbCk7CisJCQkJCSAgcGlwZV9jb25maWctPnNoYXJlZF9kcGxsKTsKIAl9CiB9CiAKQEAg LTE5MjIsOCArMTkyNiw3IEBAIHN0YXRpYyB2b2lkIGJ4dF9kZGlfcHJlX3BsbF9lbmFibGUoc3Ry dWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIsCiAJCQkJICAgc3RydWN0IGludGVsX2NydGNfc3Rh dGUgKnBpcGVfY29uZmlnLAogCQkJCSAgIHN0cnVjdCBkcm1fY29ubmVjdG9yX3N0YXRlICpjb25u X3N0YXRlKQogewotCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0 YyhlbmNvZGVyLT5iYXNlLmNydGMpOwotCXVpbnQ4X3QgbWFzayA9IGludGVsX2NydGMtPmNvbmZp Zy0+bGFuZV9sYXRfb3B0aW1fbWFzazsKKwl1aW50OF90IG1hc2sgPSBwaXBlX2NvbmZpZy0+bGFu ZV9sYXRfb3B0aW1fbWFzazsKIAogCWJ4dF9kZGlfcGh5X3NldF9sYW5lX29wdGltX21hc2soZW5j b2RlciwgbWFzayk7CiB9CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k aXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggN2Nk M2I2ZS4uMmM5Zjc4OCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlz cGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtNTM3 Myw3ICs1MzczLDcgQEAgc3RhdGljIHZvaWQgaGFzd2VsbF9jcnRjX2VuYWJsZShzdHJ1Y3QgaW50 ZWxfY3J0Y19zdGF0ZSAqcGlwZV9jb25maWcsCiAJCWRldl9wcml2LT5kaXNwbGF5LmZkaV9saW5r X3RyYWluKGludGVsX2NydGMsIHBpcGVfY29uZmlnKTsKIAogCWlmICghdHJhbnNjb2Rlcl9pc19k c2koY3B1X3RyYW5zY29kZXIpKQotCQlpbnRlbF9kZGlfZW5hYmxlX3BpcGVfY2xvY2soaW50ZWxf Y3J0Yyk7CisJCWludGVsX2RkaV9lbmFibGVfcGlwZV9jbG9jayhpbnRlbF9jcnRjLCBwaXBlX2Nv bmZpZyk7CiAKIAlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA5KQogCQlza3lsYWtlX3BmaXRf ZW5hYmxlKGludGVsX2NydGMpOwpAQCAtNTM4Niw5ICs1Mzg2LDkgQEAgc3RhdGljIHZvaWQgaGFz d2VsbF9jcnRjX2VuYWJsZShzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqcGlwZV9jb25maWcsCiAJ ICovCiAJaW50ZWxfY29sb3JfbG9hZF9sdXRzKCZwaXBlX2NvbmZpZy0+YmFzZSk7CiAKLQlpbnRl bF9kZGlfc2V0X3BpcGVfc2V0dGluZ3MoaW50ZWxfY3J0Yyk7CisJaW50ZWxfZGRpX3NldF9waXBl X3NldHRpbmdzKGludGVsX2NydGMsIHBpcGVfY29uZmlnKTsKIAlpZiAoIXRyYW5zY29kZXJfaXNf ZHNpKGNwdV90cmFuc2NvZGVyKSkKLQkJaW50ZWxfZGRpX2VuYWJsZV90cmFuc2NvZGVyX2Z1bmMo aW50ZWxfY3J0Yyk7CisJCWludGVsX2RkaV9lbmFibGVfdHJhbnNjb2Rlcl9mdW5jKGludGVsX2Ny dGMsIHBpcGVfY29uZmlnKTsKIAogCWlmIChkZXZfcHJpdi0+ZGlzcGxheS5pbml0aWFsX3dhdGVy bWFya3MgIT0gTlVMTCkKIAkJZGV2X3ByaXYtPmRpc3BsYXkuaW5pdGlhbF93YXRlcm1hcmtzKG9s ZF9pbnRlbF9zdGF0ZSwgcGlwZV9jb25maWcpOwpAQCAtNTQwMSw3ICs1NDAxLDcgQEAgc3RhdGlj IHZvaWQgaGFzd2VsbF9jcnRjX2VuYWJsZShzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqcGlwZV9j b25maWcsCiAJCWxwdF9wY2hfZW5hYmxlKGludGVsX2NydGMsIHBpcGVfY29uZmlnKTsKIAogCWlm IChpbnRlbF9jcnRjX2hhc190eXBlKGludGVsX2NydGMtPmNvbmZpZywgSU5URUxfT1VUUFVUX0RQ X01TVCkpCi0JCWludGVsX2RkaV9zZXRfdmNfcGF5bG9hZF9hbGxvYyhpbnRlbF9jcnRjLCB0cnVl KTsKKwkJaW50ZWxfZGRpX3NldF92Y19wYXlsb2FkX2FsbG9jKGludGVsX2NydGMsIHBpcGVfY29u ZmlnLCB0cnVlKTsKIAogCWFzc2VydF92YmxhbmtfZGlzYWJsZWQoY3J0Yyk7CiAJZHJtX2NydGNf dmJsYW5rX29uKGNydGMpOwpAQCAtNTUyMyw3ICs1NTIzLDcgQEAgc3RhdGljIHZvaWQgaGFzd2Vs bF9jcnRjX2Rpc2FibGUoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKm9sZF9jcnRjX3N0YXRlLAog CQlpbnRlbF9kaXNhYmxlX3BpcGUoaW50ZWxfY3J0Yyk7CiAKIAlpZiAoaW50ZWxfY3J0Y19oYXNf dHlwZShpbnRlbF9jcnRjLT5jb25maWcsIElOVEVMX09VVFBVVF9EUF9NU1QpKQotCQlpbnRlbF9k ZGlfc2V0X3ZjX3BheWxvYWRfYWxsb2MoaW50ZWxfY3J0YywgZmFsc2UpOworCQlpbnRlbF9kZGlf c2V0X3ZjX3BheWxvYWRfYWxsb2MoaW50ZWxfY3J0YywgaW50ZWxfY3J0Yy0+Y29uZmlnLCBmYWxz ZSk7CiAKIAlpZiAoIXRyYW5zY29kZXJfaXNfZHNpKGNwdV90cmFuc2NvZGVyKSkKIAkJaW50ZWxf ZGRpX2Rpc2FibGVfdHJhbnNjb2Rlcl9mdW5jKGRldl9wcml2LCBjcHVfdHJhbnNjb2Rlcik7CkBA IC01NTM0LDcgKzU1MzQsNyBAQCBzdGF0aWMgdm9pZCBoYXN3ZWxsX2NydGNfZGlzYWJsZShzdHJ1 Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqb2xkX2NydGNfc3RhdGUsCiAJCWlyb25sYWtlX3BmaXRfZGlz YWJsZShpbnRlbF9jcnRjLCBmYWxzZSk7CiAKIAlpZiAoIXRyYW5zY29kZXJfaXNfZHNpKGNwdV90 cmFuc2NvZGVyKSkKLQkJaW50ZWxfZGRpX2Rpc2FibGVfcGlwZV9jbG9jayhpbnRlbF9jcnRjKTsK KwkJaW50ZWxfZGRpX2Rpc2FibGVfcGlwZV9jbG9jayhpbnRlbF9jcnRjLCBpbnRlbF9jcnRjLT5j b25maWcpOwogCiAJaW50ZWxfZW5jb2RlcnNfcG9zdF9kaXNhYmxlKGNydGMsIG9sZF9jcnRjX3N0 YXRlLCBvbGRfc3RhdGUpOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCmluZGV4IDE4ODlmNmUu LjkxYWJhZDAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCkBAIC0xMjMwLDE0ICsxMjMwLDE4 IEBAIHZvaWQgaHN3X2ZkaV9saW5rX3RyYWluKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAogdm9p ZCBpbnRlbF9kZGlfaW5pdChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIGVudW0g cG9ydCBwb3J0KTsKIGVudW0gcG9ydCBpbnRlbF9kZGlfZ2V0X2VuY29kZXJfcG9ydChzdHJ1Y3Qg aW50ZWxfZW5jb2RlciAqaW50ZWxfZW5jb2Rlcik7CiBib29sIGludGVsX2RkaV9nZXRfaHdfc3Rh dGUoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIsIGVudW0gcGlwZSAqcGlwZSk7Ci12b2lk IGludGVsX2RkaV9lbmFibGVfdHJhbnNjb2Rlcl9mdW5jKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRj KTsKK3ZvaWQgaW50ZWxfZGRpX2VuYWJsZV90cmFuc2NvZGVyX2Z1bmMoc3RydWN0IGludGVsX2Ny dGMgKmNydGMsCisJCQkJICAgICAgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKnBpcGVfY29uZmln KTsKIHZvaWQgaW50ZWxfZGRpX2Rpc2FibGVfdHJhbnNjb2Rlcl9mdW5jKHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiwKIAkJCQkgICAgICAgZW51bSB0cmFuc2NvZGVyIGNwdV90cmFu c2NvZGVyKTsKLXZvaWQgaW50ZWxfZGRpX2VuYWJsZV9waXBlX2Nsb2NrKHN0cnVjdCBpbnRlbF9j cnRjICppbnRlbF9jcnRjKTsKLXZvaWQgaW50ZWxfZGRpX2Rpc2FibGVfcGlwZV9jbG9jayhzdHJ1 Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0Yyk7Cit2b2lkIGludGVsX2RkaV9lbmFibGVfcGlwZV9j bG9jayhzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YywKKwkJCQkgc3RydWN0IGludGVsX2Ny dGNfc3RhdGUgKnBpcGVfY29uZmlnKTsKK3ZvaWQgaW50ZWxfZGRpX2Rpc2FibGVfcGlwZV9jbG9j ayhzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YywKKwkJCQkgIHN0cnVjdCBpbnRlbF9jcnRj X3N0YXRlICpwaXBlX2NvbmZpZyk7CiBib29sIGludGVsX2RkaV9wbGxfc2VsZWN0KHN0cnVjdCBp bnRlbF9jcnRjICpjcnRjLAogCQkJICBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0 ZSk7Ci12b2lkIGludGVsX2RkaV9zZXRfcGlwZV9zZXR0aW5ncyhzdHJ1Y3QgaW50ZWxfY3J0YyAq Y3J0Yyk7Cit2b2lkIGludGVsX2RkaV9zZXRfcGlwZV9zZXR0aW5ncyhzdHJ1Y3QgaW50ZWxfY3J0 YyAqY3J0YywKKwkJCQkgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKnBpcGVfY29uZmlnKTsKIHZv aWQgaW50ZWxfZGRpX3ByZXBhcmVfbGlua19yZXRyYWluKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxf ZHApOwogYm9vbCBpbnRlbF9kZGlfY29ubmVjdG9yX2dldF9od19zdGF0ZShzdHJ1Y3QgaW50ZWxf Y29ubmVjdG9yICppbnRlbF9jb25uZWN0b3IpOwogYm9vbCBpbnRlbF9kZGlfaXNfYXVkaW9fZW5h YmxlZChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCkBAIC0xMjUwLDcgKzEyNTQs OSBAQCBpbnRlbF9kZGlfZ2V0X2NydGNfbmV3X2VuY29kZXIoc3RydWN0IGludGVsX2NydGNfc3Rh dGUgKmNydGNfc3RhdGUpOwogdm9pZCBpbnRlbF9kZGlfaW5pdF9kcF9idWZfcmVnKHN0cnVjdCBp bnRlbF9lbmNvZGVyICplbmNvZGVyKTsKIHZvaWQgaW50ZWxfZGRpX2Nsb2NrX2dldChzdHJ1Y3Qg aW50ZWxfZW5jb2RlciAqZW5jb2RlciwKIAkJCSBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqcGlw ZV9jb25maWcpOwotdm9pZCBpbnRlbF9kZGlfc2V0X3ZjX3BheWxvYWRfYWxsb2Moc3RydWN0IGlu dGVsX2NydGMgKmNydGMsIGJvb2wgc3RhdGUpOwordm9pZCBpbnRlbF9kZGlfc2V0X3ZjX3BheWxv YWRfYWxsb2Moc3RydWN0IGludGVsX2NydGMgKmNydGMsCisJCQkJICAgIHN0cnVjdCBpbnRlbF9j cnRjX3N0YXRlICpwaXBlX2NvbmZpZywKKwkJCQkgICAgYm9vbCBzdGF0ZSk7CiB1aW50MzJfdCBk ZGlfc2lnbmFsX2xldmVscyhzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwKTsKIHU4IGludGVsX2Rk aV9kcF92b2x0YWdlX21heChzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2Rlcik7CiAKLS0gCjIu OS4zCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRl bC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6 Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK