From: Ander Conselvan de Oliveira Subject: [PATCH v3 6/7] drm/i915: Remove direct usages of intel_crtc->config from DDI code Date: Thu, 2 Mar 2017 14:58:56 +0200 Message-ID: <20170302125857.14665-7-ander.conselvan.de.oliveira@intel.com> References: <20170302125857.14665-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 mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id EE8526EB2D for ; Thu, 2 Mar 2017 12:59:20 +0000 (UTC) In-Reply-To: <20170302125857.14665-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 cmd1bWVudCB3ZXJlIGNvdmVydGVkIHRvIGRvCnNvLgoKdjI6IHMvcGlwZV9jb25maWcvY29uc3Qg Y3J0Y19zdGF0ZS8gKFZpbGxlKQogIC0gdGFrZSBjcnRjIGZyb20gY3J0Y19zdGF0ZS4gKFZpbGxl KQpTaWduZWQtb2ZmLWJ5OiBBbmRlciBDb25zZWx2YW4gZGUgT2xpdmVpcmEgPGFuZGVyLmNvbnNl bHZhbi5kZS5vbGl2ZWlyYUBpbnRlbC5jb20+ClJldmlld2VkLWJ5OiBWaWxsZSBTeXJqw6Rsw6Qg PHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2RkaS5jICAgICB8IDYyICsrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0t LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgMTIgKysrLS0tLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggICAgIHwgMTEgKysrKy0tLQogMyBmaWxlcyBj aGFuZ2VkLCA0NCBpbnNlcnRpb25zKCspLCA0MSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kZGkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2RkaS5jCmluZGV4IDBkYjUyNmUuLmViY2NkNDggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2RkaS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rk aS5jCkBAIC0xMTkzLDExICsxMTkzLDEyIEBAIGJvb2wgaW50ZWxfZGRpX3BsbF9zZWxlY3Qoc3Ry dWN0IGludGVsX2NydGMgKmludGVsX2NydGMsCiAJCQkJCSAgaW50ZWxfZW5jb2Rlcik7CiB9CiAK LXZvaWQgaW50ZWxfZGRpX3NldF9waXBlX3NldHRpbmdzKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRj KQordm9pZCBpbnRlbF9kZGlfc2V0X3BpcGVfc2V0dGluZ3MoY29uc3Qgc3RydWN0IGludGVsX2Ny dGNfc3RhdGUgKmNydGNfc3RhdGUpCiB7CisJc3RydWN0IGludGVsX2NydGMgKmNydGMgPSB0b19p bnRlbF9jcnRjKGNydGNfc3RhdGUtPmJhc2UuY3J0Yyk7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2ID0gdG9faTkxNShjcnRjLT5iYXNlLmRldik7CiAJc3RydWN0IGludGVsX2Vu Y29kZXIgKmludGVsX2VuY29kZXIgPSBpbnRlbF9kZGlfZ2V0X2NydGNfZW5jb2RlcihjcnRjKTsK LQllbnVtIHRyYW5zY29kZXIgY3B1X3RyYW5zY29kZXIgPSBjcnRjLT5jb25maWctPmNwdV90cmFu c2NvZGVyOworCWVudW0gdHJhbnNjb2RlciBjcHVfdHJhbnNjb2RlciA9IGNydGNfc3RhdGUtPmNw dV90cmFuc2NvZGVyOwogCWludCB0eXBlID0gaW50ZWxfZW5jb2Rlci0+dHlwZTsKIAl1aW50MzJf dCB0ZW1wOwogCkBAIC0xMjA1LDcgKzEyMDYsNyBAQCB2b2lkIGludGVsX2RkaV9zZXRfcGlwZV9z ZXR0aW5ncyhzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKIAkJV0FSTl9PTih0cmFuc2NvZGVyX2lz X2RzaShjcHVfdHJhbnNjb2RlcikpOwogCiAJCXRlbXAgPSBUUkFOU19NU0FfU1lOQ19DTEs7Ci0J CXN3aXRjaCAoY3J0Yy0+Y29uZmlnLT5waXBlX2JwcCkgeworCQlzd2l0Y2ggKGNydGNfc3RhdGUt PnBpcGVfYnBwKSB7CiAJCWNhc2UgMTg6CiAJCQl0ZW1wIHw9IFRSQU5TX01TQV82X0JQQzsKIAkJ CWJyZWFrOwpAQCAtMTIyNSwxMCArMTIyNiwxMiBAQCB2b2lkIGludGVsX2RkaV9zZXRfcGlwZV9z ZXR0aW5ncyhzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKIAl9CiB9CiAKLXZvaWQgaW50ZWxfZGRp X3NldF92Y19wYXlsb2FkX2FsbG9jKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLCBib29sIHN0YXRl KQordm9pZCBpbnRlbF9kZGlfc2V0X3ZjX3BheWxvYWRfYWxsb2MoY29uc3Qgc3RydWN0IGludGVs X2NydGNfc3RhdGUgKmNydGNfc3RhdGUsCisJCQkJICAgIGJvb2wgc3RhdGUpCiB7CisJc3RydWN0 IGludGVsX2NydGMgKmNydGMgPSB0b19pbnRlbF9jcnRjKGNydGNfc3RhdGUtPmJhc2UuY3J0Yyk7 CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShjcnRjLT5iYXNl LmRldik7Ci0JZW51bSB0cmFuc2NvZGVyIGNwdV90cmFuc2NvZGVyID0gY3J0Yy0+Y29uZmlnLT5j cHVfdHJhbnNjb2RlcjsKKwllbnVtIHRyYW5zY29kZXIgY3B1X3RyYW5zY29kZXIgPSBjcnRjX3N0 YXRlLT5jcHVfdHJhbnNjb2RlcjsKIAl1aW50MzJfdCB0ZW1wOwogCXRlbXAgPSBJOTE1X1JFQUQo VFJBTlNfRERJX0ZVTkNfQ1RMKGNwdV90cmFuc2NvZGVyKSk7CiAJaWYgKHN0YXRlID09IHRydWUp CkBAIC0xMjM4LDEyICsxMjQxLDEzIEBAIHZvaWQgaW50ZWxfZGRpX3NldF92Y19wYXlsb2FkX2Fs bG9jKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLCBib29sIHN0YXRlKQogCUk5MTVfV1JJVEUoVFJB TlNfRERJX0ZVTkNfQ1RMKGNwdV90cmFuc2NvZGVyKSwgdGVtcCk7CiB9CiAKLXZvaWQgaW50ZWxf ZGRpX2VuYWJsZV90cmFuc2NvZGVyX2Z1bmMoc3RydWN0IGludGVsX2NydGMgKmNydGMpCit2b2lk IGludGVsX2RkaV9lbmFibGVfdHJhbnNjb2Rlcl9mdW5jKGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRj X3N0YXRlICpjcnRjX3N0YXRlKQogeworCXN0cnVjdCBpbnRlbF9jcnRjICpjcnRjID0gdG9faW50 ZWxfY3J0YyhjcnRjX3N0YXRlLT5iYXNlLmNydGMpOwogCXN0cnVjdCBpbnRlbF9lbmNvZGVyICpp bnRlbF9lbmNvZGVyID0gaW50ZWxfZGRpX2dldF9jcnRjX2VuY29kZXIoY3J0Yyk7CiAJc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShjcnRjLT5iYXNlLmRldik7CiAJ ZW51bSBwaXBlIHBpcGUgPSBjcnRjLT5waXBlOwotCWVudW0gdHJhbnNjb2RlciBjcHVfdHJhbnNj b2RlciA9IGNydGMtPmNvbmZpZy0+Y3B1X3RyYW5zY29kZXI7CisJZW51bSB0cmFuc2NvZGVyIGNw dV90cmFuc2NvZGVyID0gY3J0Y19zdGF0ZS0+Y3B1X3RyYW5zY29kZXI7CiAJZW51bSBwb3J0IHBv cnQgPSBpbnRlbF9kZGlfZ2V0X2VuY29kZXJfcG9ydChpbnRlbF9lbmNvZGVyKTsKIAlpbnQgdHlw ZSA9IGludGVsX2VuY29kZXItPnR5cGU7CiAJdWludDMyX3QgdGVtcDsKQEAgLTEyNTIsNyArMTI1 Niw3IEBAIHZvaWQgaW50ZWxfZGRpX2VuYWJsZV90cmFuc2NvZGVyX2Z1bmMoc3RydWN0IGludGVs X2NydGMgKmNydGMpCiAJdGVtcCA9IFRSQU5TX0RESV9GVU5DX0VOQUJMRTsKIAl0ZW1wIHw9IFRS QU5TX0RESV9TRUxFQ1RfUE9SVChwb3J0KTsKIAotCXN3aXRjaCAoY3J0Yy0+Y29uZmlnLT5waXBl X2JwcCkgeworCXN3aXRjaCAoY3J0Y19zdGF0ZS0+cGlwZV9icHApIHsKIAljYXNlIDE4OgogCQl0 ZW1wIHw9IFRSQU5TX0RESV9CUENfNjsKIAkJYnJlYWs7CkBAIC0xMjY5LDkgKzEyNzMsOSBAQCB2 b2lkIGludGVsX2RkaV9lbmFibGVfdHJhbnNjb2Rlcl9mdW5jKHN0cnVjdCBpbnRlbF9jcnRjICpj cnRjKQogCQlCVUcoKTsKIAl9CiAKLQlpZiAoY3J0Yy0+Y29uZmlnLT5iYXNlLmFkanVzdGVkX21v ZGUuZmxhZ3MgJiBEUk1fTU9ERV9GTEFHX1BWU1lOQykKKwlpZiAoY3J0Y19zdGF0ZS0+YmFzZS5h ZGp1c3RlZF9tb2RlLmZsYWdzICYgRFJNX01PREVfRkxBR19QVlNZTkMpCiAJCXRlbXAgfD0gVFJB TlNfRERJX1BWU1lOQzsKLQlpZiAoY3J0Yy0+Y29uZmlnLT5iYXNlLmFkanVzdGVkX21vZGUuZmxh Z3MgJiBEUk1fTU9ERV9GTEFHX1BIU1lOQykKKwlpZiAoY3J0Y19zdGF0ZS0+YmFzZS5hZGp1c3Rl ZF9tb2RlLmZsYWdzICYgRFJNX01PREVfRkxBR19QSFNZTkMpCiAJCXRlbXAgfD0gVFJBTlNfRERJ X1BIU1lOQzsKIAogCWlmIChjcHVfdHJhbnNjb2RlciA9PSBUUkFOU0NPREVSX0VEUCkgewpAQCAt MTI4Miw4ICsxMjg2LDggQEAgdm9pZCBpbnRlbF9kZGlfZW5hYmxlX3RyYW5zY29kZXJfZnVuYyhz dHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKIAkJCSAqIHVzaW5nIG1vdGlvbiBibHVyIG1pdGlnYXRp b24gKHdoaWNoIHdlIGRvbid0CiAJCQkgKiBzdXBwb3J0KS4gKi8KIAkJCWlmIChJU19IQVNXRUxM KGRldl9wcml2KSAmJgotCQkJICAgIChjcnRjLT5jb25maWctPnBjaF9wZml0LmVuYWJsZWQgfHwK LQkJCSAgICAgY3J0Yy0+Y29uZmlnLT5wY2hfcGZpdC5mb3JjZV90aHJ1KSkKKwkJCSAgICAoY3J0 Y19zdGF0ZS0+cGNoX3BmaXQuZW5hYmxlZCB8fAorCQkJICAgICBjcnRjX3N0YXRlLT5wY2hfcGZp dC5mb3JjZV90aHJ1KSkKIAkJCQl0ZW1wIHw9IFRSQU5TX0RESV9FRFBfSU5QVVRfQV9PTk9GRjsK IAkJCWVsc2UKIAkJCQl0ZW1wIHw9IFRSQU5TX0RESV9FRFBfSU5QVVRfQV9PTjsKQEAgLTEzMDEs MjAgKzEzMDUsMjAgQEAgdm9pZCBpbnRlbF9kZGlfZW5hYmxlX3RyYW5zY29kZXJfZnVuYyhzdHJ1 Y3QgaW50ZWxfY3J0YyAqY3J0YykKIAl9CiAKIAlpZiAodHlwZSA9PSBJTlRFTF9PVVRQVVRfSERN SSkgewotCQlpZiAoY3J0Yy0+Y29uZmlnLT5oYXNfaGRtaV9zaW5rKQorCQlpZiAoY3J0Y19zdGF0 ZS0+aGFzX2hkbWlfc2luaykKIAkJCXRlbXAgfD0gVFJBTlNfRERJX01PREVfU0VMRUNUX0hETUk7 CiAJCWVsc2UKIAkJCXRlbXAgfD0gVFJBTlNfRERJX01PREVfU0VMRUNUX0RWSTsKIAl9IGVsc2Ug aWYgKHR5cGUgPT0gSU5URUxfT1VUUFVUX0FOQUxPRykgewogCQl0ZW1wIHw9IFRSQU5TX0RESV9N T0RFX1NFTEVDVF9GREk7Ci0JCXRlbXAgfD0gKGNydGMtPmNvbmZpZy0+ZmRpX2xhbmVzIC0gMSkg PDwgMTsKKwkJdGVtcCB8PSAoY3J0Y19zdGF0ZS0+ZmRpX2xhbmVzIC0gMSkgPDwgMTsKIAl9IGVs c2UgaWYgKHR5cGUgPT0gSU5URUxfT1VUUFVUX0RQIHx8CiAJCSAgIHR5cGUgPT0gSU5URUxfT1VU UFVUX0VEUCkgewogCQl0ZW1wIHw9IFRSQU5TX0RESV9NT0RFX1NFTEVDVF9EUF9TU1Q7Ci0JCXRl bXAgfD0gRERJX1BPUlRfV0lEVEgoY3J0Yy0+Y29uZmlnLT5sYW5lX2NvdW50KTsKKwkJdGVtcCB8 PSBERElfUE9SVF9XSURUSChjcnRjX3N0YXRlLT5sYW5lX2NvdW50KTsKIAl9IGVsc2UgaWYgKHR5 cGUgPT0gSU5URUxfT1VUUFVUX0RQX01TVCkgewogCQl0ZW1wIHw9IFRSQU5TX0RESV9NT0RFX1NF TEVDVF9EUF9NU1Q7Ci0JCXRlbXAgfD0gRERJX1BPUlRfV0lEVEgoY3J0Yy0+Y29uZmlnLT5sYW5l X2NvdW50KTsKKwkJdGVtcCB8PSBERElfUE9SVF9XSURUSChjcnRjX3N0YXRlLT5sYW5lX2NvdW50 KTsKIAl9IGVsc2UgewogCQlXQVJOKDEsICJJbnZhbGlkIGVuY29kZXIgdHlwZSAlZCBmb3IgcGlw ZSAlY1xuIiwKIAkJICAgICBpbnRlbF9lbmNvZGVyLT50eXBlLCBwaXBlX25hbWUocGlwZSkpOwpA QCAtMTQ3OCwyMiArMTQ4MiwyMyBAQCBzdGF0aWMgdTY0IGludGVsX2RkaV9nZXRfcG93ZXJfZG9t YWlucyhzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlcikKIAlyZXR1cm4gMDsKIH0KIAotdm9p ZCBpbnRlbF9kZGlfZW5hYmxlX3BpcGVfY2xvY2soc3RydWN0IGludGVsX2NydGMgKmNydGMpCit2 b2lkIGludGVsX2RkaV9lbmFibGVfcGlwZV9jbG9jayhjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19z dGF0ZSAqY3J0Y19zdGF0ZSkKIHsKKwlzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YyA9IHRvX2ludGVs X2NydGMoY3J0Y19zdGF0ZS0+YmFzZS5jcnRjKTsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYgPSB0b19pOTE1KGNydGMtPmJhc2UuZGV2KTsKIAlzdHJ1Y3QgaW50ZWxfZW5jb2Rl ciAqaW50ZWxfZW5jb2RlciA9IGludGVsX2RkaV9nZXRfY3J0Y19lbmNvZGVyKGNydGMpOwogCWVu dW0gcG9ydCBwb3J0ID0gaW50ZWxfZGRpX2dldF9lbmNvZGVyX3BvcnQoaW50ZWxfZW5jb2Rlcik7 Ci0JZW51bSB0cmFuc2NvZGVyIGNwdV90cmFuc2NvZGVyID0gY3J0Yy0+Y29uZmlnLT5jcHVfdHJh bnNjb2RlcjsKKwllbnVtIHRyYW5zY29kZXIgY3B1X3RyYW5zY29kZXIgPSBjcnRjX3N0YXRlLT5j cHVfdHJhbnNjb2RlcjsKIAogCWlmIChjcHVfdHJhbnNjb2RlciAhPSBUUkFOU0NPREVSX0VEUCkK IAkJSTkxNV9XUklURShUUkFOU19DTEtfU0VMKGNwdV90cmFuc2NvZGVyKSwKIAkJCSAgIFRSQU5T X0NMS19TRUxfUE9SVChwb3J0KSk7CiB9CiAKLXZvaWQgaW50ZWxfZGRpX2Rpc2FibGVfcGlwZV9j bG9jayhzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YykKK3ZvaWQgaW50ZWxfZGRpX2Rpc2Fi bGVfcGlwZV9jbG9jayhjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSkK IHsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGludGVsX2Ny dGMtPmJhc2UuZGV2KTsKLQllbnVtIHRyYW5zY29kZXIgY3B1X3RyYW5zY29kZXIgPSBpbnRlbF9j cnRjLT5jb25maWctPmNwdV90cmFuc2NvZGVyOworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdiA9IHRvX2k5MTUoY3J0Y19zdGF0ZS0+YmFzZS5jcnRjLT5kZXYpOworCWVudW0gdHJh bnNjb2RlciBjcHVfdHJhbnNjb2RlciA9IGNydGNfc3RhdGUtPmNwdV90cmFuc2NvZGVyOwogCiAJ aWYgKGNwdV90cmFuc2NvZGVyICE9IFRSQU5TQ09ERVJfRURQKQogCQlJOTE1X1dSSVRFKFRSQU5T X0NMS19TRUwoY3B1X3RyYW5zY29kZXIpLApAQCAtMTc1OSwyMyArMTc2NCwyMSBAQCBzdGF0aWMg dm9pZCBpbnRlbF9kZGlfcHJlX2VuYWJsZShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqaW50ZWxfZW5j b2RlciwKIAkJCQkgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKnBpcGVfY29uZmlnLAogCQkJCSBz dHJ1Y3QgZHJtX2Nvbm5lY3Rvcl9zdGF0ZSAqY29ubl9zdGF0ZSkKIHsKLQlzdHJ1Y3QgZHJtX2Vu Y29kZXIgKmVuY29kZXIgPSAmaW50ZWxfZW5jb2Rlci0+YmFzZTsKLQlzdHJ1Y3QgaW50ZWxfY3J0 YyAqY3J0YyA9IHRvX2ludGVsX2NydGMoZW5jb2Rlci0+Y3J0Yyk7CiAJaW50IHR5cGUgPSBpbnRl bF9lbmNvZGVyLT50eXBlOwogCiAJaWYgKHR5cGUgPT0gSU5URUxfT1VUUFVUX0RQIHx8IHR5cGUg PT0gSU5URUxfT1VUUFVUX0VEUCkgewogCQlpbnRlbF9kZGlfcHJlX2VuYWJsZV9kcChpbnRlbF9l bmNvZGVyLAotCQkJCQljcnRjLT5jb25maWctPnBvcnRfY2xvY2ssCi0JCQkJCWNydGMtPmNvbmZp Zy0+bGFuZV9jb3VudCwKLQkJCQkJY3J0Yy0+Y29uZmlnLT5zaGFyZWRfZHBsbCwKLQkJCQkJaW50 ZWxfY3J0Y19oYXNfdHlwZShjcnRjLT5jb25maWcsCisJCQkJCXBpcGVfY29uZmlnLT5wb3J0X2Ns b2NrLAorCQkJCQlwaXBlX2NvbmZpZy0+bGFuZV9jb3VudCwKKwkJCQkJcGlwZV9jb25maWctPnNo YXJlZF9kcGxsLAorCQkJCQlpbnRlbF9jcnRjX2hhc190eXBlKHBpcGVfY29uZmlnLAogCQkJCQkJ CSAgICBJTlRFTF9PVVRQVVRfRFBfTVNUKSk7CiAJfQogCWlmICh0eXBlID09IElOVEVMX09VVFBV VF9IRE1JKSB7CiAJCWludGVsX2RkaV9wcmVfZW5hYmxlX2hkbWkoaW50ZWxfZW5jb2RlciwKIAkJ CQkJICBwaXBlX2NvbmZpZy0+aGFzX2hkbWlfc2luaywKIAkJCQkJICBwaXBlX2NvbmZpZywgY29u bl9zdGF0ZSwKLQkJCQkJICBjcnRjLT5jb25maWctPnNoYXJlZF9kcGxsKTsKKwkJCQkJICBwaXBl X2NvbmZpZy0+c2hhcmVkX2RwbGwpOwogCX0KIH0KIApAQCAtMTkyMiw4ICsxOTI1LDcgQEAgc3Rh dGljIHZvaWQgYnh0X2RkaV9wcmVfcGxsX2VuYWJsZShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5j b2RlciwKIAkJCQkgICBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqcGlwZV9jb25maWcsCiAJCQkJ ICAgc3RydWN0IGRybV9jb25uZWN0b3Jfc3RhdGUgKmNvbm5fc3RhdGUpCiB7Ci0Jc3RydWN0IGlu dGVsX2NydGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGVuY29kZXItPmJhc2UuY3J0Yyk7 Ci0JdWludDhfdCBtYXNrID0gaW50ZWxfY3J0Yy0+Y29uZmlnLT5sYW5lX2xhdF9vcHRpbV9tYXNr OworCXVpbnQ4X3QgbWFzayA9IHBpcGVfY29uZmlnLT5sYW5lX2xhdF9vcHRpbV9tYXNrOwogCiAJ Ynh0X2RkaV9waHlfc2V0X2xhbmVfb3B0aW1fbWFzayhlbmNvZGVyLCBtYXNrKTsKIH0KZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCA1MDNkY2ZhLi45NDRiZmY1IDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC01MzczLDcgKzUzNzMsNyBAQCBzdGF0aWMg dm9pZCBoYXN3ZWxsX2NydGNfZW5hYmxlKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpwaXBlX2Nv bmZpZywKIAkJZGV2X3ByaXYtPmRpc3BsYXkuZmRpX2xpbmtfdHJhaW4oaW50ZWxfY3J0YywgcGlw ZV9jb25maWcpOwogCiAJaWYgKCF0cmFuc2NvZGVyX2lzX2RzaShjcHVfdHJhbnNjb2RlcikpCi0J CWludGVsX2RkaV9lbmFibGVfcGlwZV9jbG9jayhpbnRlbF9jcnRjKTsKKwkJaW50ZWxfZGRpX2Vu YWJsZV9waXBlX2Nsb2NrKHBpcGVfY29uZmlnKTsKIAogCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYp ID49IDkpCiAJCXNreWxha2VfcGZpdF9lbmFibGUoaW50ZWxfY3J0Yyk7CkBAIC01Mzg2LDkgKzUz ODYsOSBAQCBzdGF0aWMgdm9pZCBoYXN3ZWxsX2NydGNfZW5hYmxlKHN0cnVjdCBpbnRlbF9jcnRj X3N0YXRlICpwaXBlX2NvbmZpZywKIAkgKi8KIAlpbnRlbF9jb2xvcl9sb2FkX2x1dHMoJnBpcGVf Y29uZmlnLT5iYXNlKTsKIAotCWludGVsX2RkaV9zZXRfcGlwZV9zZXR0aW5ncyhpbnRlbF9jcnRj KTsKKwlpbnRlbF9kZGlfc2V0X3BpcGVfc2V0dGluZ3MocGlwZV9jb25maWcpOwogCWlmICghdHJh bnNjb2Rlcl9pc19kc2koY3B1X3RyYW5zY29kZXIpKQotCQlpbnRlbF9kZGlfZW5hYmxlX3RyYW5z Y29kZXJfZnVuYyhpbnRlbF9jcnRjKTsKKwkJaW50ZWxfZGRpX2VuYWJsZV90cmFuc2NvZGVyX2Z1 bmMocGlwZV9jb25maWcpOwogCiAJaWYgKGRldl9wcml2LT5kaXNwbGF5LmluaXRpYWxfd2F0ZXJt YXJrcyAhPSBOVUxMKQogCQlkZXZfcHJpdi0+ZGlzcGxheS5pbml0aWFsX3dhdGVybWFya3Mob2xk X2ludGVsX3N0YXRlLCBwaXBlX2NvbmZpZyk7CkBAIC01NDAxLDcgKzU0MDEsNyBAQCBzdGF0aWMg dm9pZCBoYXN3ZWxsX2NydGNfZW5hYmxlKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpwaXBlX2Nv bmZpZywKIAkJbHB0X3BjaF9lbmFibGUocGlwZV9jb25maWcpOwogCiAJaWYgKGludGVsX2NydGNf aGFzX3R5cGUoaW50ZWxfY3J0Yy0+Y29uZmlnLCBJTlRFTF9PVVRQVVRfRFBfTVNUKSkKLQkJaW50 ZWxfZGRpX3NldF92Y19wYXlsb2FkX2FsbG9jKGludGVsX2NydGMsIHRydWUpOworCQlpbnRlbF9k ZGlfc2V0X3ZjX3BheWxvYWRfYWxsb2MocGlwZV9jb25maWcsIHRydWUpOwogCiAJYXNzZXJ0X3Zi bGFua19kaXNhYmxlZChjcnRjKTsKIAlkcm1fY3J0Y192Ymxhbmtfb24oY3J0Yyk7CkBAIC01NTIz LDcgKzU1MjMsNyBAQCBzdGF0aWMgdm9pZCBoYXN3ZWxsX2NydGNfZGlzYWJsZShzdHJ1Y3QgaW50 ZWxfY3J0Y19zdGF0ZSAqb2xkX2NydGNfc3RhdGUsCiAJCWludGVsX2Rpc2FibGVfcGlwZShpbnRl bF9jcnRjKTsKIAogCWlmIChpbnRlbF9jcnRjX2hhc190eXBlKGludGVsX2NydGMtPmNvbmZpZywg SU5URUxfT1VUUFVUX0RQX01TVCkpCi0JCWludGVsX2RkaV9zZXRfdmNfcGF5bG9hZF9hbGxvYyhp bnRlbF9jcnRjLCBmYWxzZSk7CisJCWludGVsX2RkaV9zZXRfdmNfcGF5bG9hZF9hbGxvYyhpbnRl bF9jcnRjLT5jb25maWcsIGZhbHNlKTsKIAogCWlmICghdHJhbnNjb2Rlcl9pc19kc2koY3B1X3Ry YW5zY29kZXIpKQogCQlpbnRlbF9kZGlfZGlzYWJsZV90cmFuc2NvZGVyX2Z1bmMoZGV2X3ByaXYs IGNwdV90cmFuc2NvZGVyKTsKQEAgLTU1MzQsNyArNTUzNCw3IEBAIHN0YXRpYyB2b2lkIGhhc3dl bGxfY3J0Y19kaXNhYmxlKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpvbGRfY3J0Y19zdGF0ZSwK IAkJaXJvbmxha2VfcGZpdF9kaXNhYmxlKGludGVsX2NydGMsIGZhbHNlKTsKIAogCWlmICghdHJh bnNjb2Rlcl9pc19kc2koY3B1X3RyYW5zY29kZXIpKQotCQlpbnRlbF9kZGlfZGlzYWJsZV9waXBl X2Nsb2NrKGludGVsX2NydGMpOworCQlpbnRlbF9kZGlfZGlzYWJsZV9waXBlX2Nsb2NrKGludGVs X2NydGMtPmNvbmZpZyk7CiAKIAlpbnRlbF9lbmNvZGVyc19wb3N0X2Rpc2FibGUoY3J0Yywgb2xk X2NydGNfc3RhdGUsIG9sZF9zdGF0ZSk7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKaW5kZXgg NGJhNWYyMy4uNDQ0NjdhZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKQEAgLTEyMzAsMTQg KzEyMzAsMTQgQEAgdm9pZCBoc3dfZmRpX2xpbmtfdHJhaW4oc3RydWN0IGludGVsX2NydGMgKmNy dGMsCiB2b2lkIGludGVsX2RkaV9pbml0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp diwgZW51bSBwb3J0IHBvcnQpOwogZW51bSBwb3J0IGludGVsX2RkaV9nZXRfZW5jb2Rlcl9wb3J0 KHN0cnVjdCBpbnRlbF9lbmNvZGVyICppbnRlbF9lbmNvZGVyKTsKIGJvb2wgaW50ZWxfZGRpX2dl dF9od19zdGF0ZShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwgZW51bSBwaXBlICpwaXBl KTsKLXZvaWQgaW50ZWxfZGRpX2VuYWJsZV90cmFuc2NvZGVyX2Z1bmMoc3RydWN0IGludGVsX2Ny dGMgKmNydGMpOwordm9pZCBpbnRlbF9kZGlfZW5hYmxlX3RyYW5zY29kZXJfZnVuYyhjb25zdCBz dHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSk7CiB2b2lkIGludGVsX2RkaV9kaXNh YmxlX3RyYW5zY29kZXJfZnVuYyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJ CQkJICAgICAgIGVudW0gdHJhbnNjb2RlciBjcHVfdHJhbnNjb2Rlcik7Ci12b2lkIGludGVsX2Rk aV9lbmFibGVfcGlwZV9jbG9jayhzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0Yyk7Ci12b2lk IGludGVsX2RkaV9kaXNhYmxlX3BpcGVfY2xvY2soc3RydWN0IGludGVsX2NydGMgKmludGVsX2Ny dGMpOwordm9pZCBpbnRlbF9kZGlfZW5hYmxlX3BpcGVfY2xvY2soY29uc3Qgc3RydWN0IGludGVs X2NydGNfc3RhdGUgKmNydGNfc3RhdGUpOwordm9pZCBpbnRlbF9kZGlfZGlzYWJsZV9waXBlX2Ns b2NrKGNvbnN0ICBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSk7CiBib29sIGlu dGVsX2RkaV9wbGxfc2VsZWN0KHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAogCQkJICBzdHJ1Y3Qg aW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSk7Ci12b2lkIGludGVsX2RkaV9zZXRfcGlwZV9z ZXR0aW5ncyhzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0Yyk7Cit2b2lkIGludGVsX2RkaV9zZXRfcGlw ZV9zZXR0aW5ncyhjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSk7CiB2 b2lkIGludGVsX2RkaV9wcmVwYXJlX2xpbmtfcmV0cmFpbihzdHJ1Y3QgaW50ZWxfZHAgKmludGVs X2RwKTsKIGJvb2wgaW50ZWxfZGRpX2Nvbm5lY3Rvcl9nZXRfaHdfc3RhdGUoc3RydWN0IGludGVs X2Nvbm5lY3RvciAqaW50ZWxfY29ubmVjdG9yKTsKIGJvb2wgaW50ZWxfZGRpX2lzX2F1ZGlvX2Vu YWJsZWQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LApAQCAtMTI1MCw3ICsxMjUw LDggQEAgaW50ZWxfZGRpX2dldF9jcnRjX25ld19lbmNvZGVyKHN0cnVjdCBpbnRlbF9jcnRjX3N0 YXRlICpjcnRjX3N0YXRlKTsKIHZvaWQgaW50ZWxfZGRpX2luaXRfZHBfYnVmX3JlZyhzdHJ1Y3Qg aW50ZWxfZW5jb2RlciAqZW5jb2Rlcik7CiB2b2lkIGludGVsX2RkaV9jbG9ja19nZXQoc3RydWN0 IGludGVsX2VuY29kZXIgKmVuY29kZXIsCiAJCQkgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKnBp cGVfY29uZmlnKTsKLXZvaWQgaW50ZWxfZGRpX3NldF92Y19wYXlsb2FkX2FsbG9jKHN0cnVjdCBp bnRlbF9jcnRjICpjcnRjLCBib29sIHN0YXRlKTsKK3ZvaWQgaW50ZWxfZGRpX3NldF92Y19wYXls b2FkX2FsbG9jKGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlLAorCQkJ CSAgICBib29sIHN0YXRlKTsKIHVpbnQzMl90IGRkaV9zaWduYWxfbGV2ZWxzKHN0cnVjdCBpbnRl bF9kcCAqaW50ZWxfZHApOwogdTggaW50ZWxfZGRpX2RwX3ZvbHRhZ2VfbWF4KHN0cnVjdCBpbnRl bF9lbmNvZGVyICplbmNvZGVyKTsKIAotLSAKMi45LjMKCl9fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4 QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWls bWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=