From: Matt Roper Subject: [PATCH 1/2] drm/i915: Use enabled value from crtc_state rather than crtc Date: Wed, 25 Feb 2015 11:43:25 -0800 Message-ID: <1424893406-14634-1-git-send-email-matthew.d.roper@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 ESMTP id 8281E89CF4 for ; Wed, 25 Feb 2015 11:44:05 -0800 (PST) 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 QXMgdmVuZG9ycyB0cmFuc2l0aW9uIHRoZWlyIGRyaXZlcnMgZnJvbSBsZWdhY3kgdG8gYXRvbWlj IHRoZXJlJ3Mgc29tZQpkdXBsaWNhdGlvbiBvZiBkYXRhIGJldHdlZW4gZHJtX2NydGMgYW5kIGRy bV9jcnRjX3N0YXRlIChzaW5jZQp1bmNvbnZlcnRlZCBkcml2ZXJzIGxpa2VseSB3b24ndCBoYXZl IGEgc3RhdGUgc3RydWN0dXJlKS4KCmk5MTUgaXMgcGFydGlhbGx5IGNvbnZlcnRlZCBhbmQgZG9l cyBoYXZlIGhhdmUgYSBjcnRjLT5zdGF0ZSBzdHJ1Y3R1cmUsCmJ1dCBzdGlsbCB1c2VzIGRpcmVj dCBjcnRjIGZpZWxkcyBpbnRlcm5hbGx5IGluIG1hbnkgcGxhY2VzLCB3aGljaApjYXVzZXMgdGhl IHR3byBzZXRzIG9mIGRhdGEgdG8gZ2V0IG91dCBvZiBzeW5jLiAgQXMgb2YgY29tbWl0CgogICAg ICAgIGNvbW1pdCAzMWM5NDZlODVjZTZiNDhjZTBmMjVlM2NkY2E4MzYyZTRmZThiMzAwCiAgICAg ICAgQXV0aG9yOiBEYW5pZWwgVmV0dGVyIDxkYW5pZWwudmV0dGVyQGZmd2xsLmNoPgogICAgICAg IERhdGU6ICAgU3VuIEZlYiAyMiAxMjoyNDoxNyAyMDE1ICswMTAwCgogICAgICAgICAgICBkcm06 IElmIGF2YWlsYWJsZSB1c2UgYXRvbWljIHN0YXRlIGluIGdldGNydGMgaW9jdGwKCiAgICAgICAg ICAgIFRoaXMgd2F5IGRyaXZlcnMgZnVsbHkgY29udmVydGVkIHRvIGF0b21pYyBkb24ndCBuZWVk IHRvIHVwZGF0ZSB0aGVzZQogICAgICAgICAgICBsZWdhY3kgc3RhdGUgdmFyaWFibGVzIGluIHRo ZWlyIG1vZGVzZXQgY29kZSBhbnkgbW9yZS4KCiAgICAgICAgICAgIFJldmlld2VkLWJ5OiBSb2Ig Q2xhcmsgPHJvYmRjbGFya0BnbWFpbC5jb20+CiAgICAgICAgICAgIFNpZ25lZC1vZmYtYnk6IERh bmllbCBWZXR0ZXIgPGRhbmllbC52ZXR0ZXJAaW50ZWwuY29tPgoKdGhlIERSTSBjb3JlIHN0YXJ0 cyBhc3N1bWluZyB0aGF0IHRoZSBwcmVzZW5jZSBvZiBhIC0+c3RhdGUgc3RydWN0dXJlCmltcGxp ZXMgdGhhdCBpdCBzaG91bGQgbWFrZSB1c2Ugb2YgdGhlIHZhbHVlcyBzdG9yZWQgdGhlcmUgd2hp Y2gsIG9uCmk5MTUsIGxlYWRzIHRvIHRoZSBjb3JlIGNvZGUgdXNpbmcgc3RhbGUgdmFsdWVzIGZv ciBDUlRDICdlbmFibGVkJwpzdGF0dXMuCgpMZXQncyBzd2l0Y2ggb3ZlciB0byB1c2luZyB0aGUg c3RhdGUgdmFsdWUgb2YgJ2VuYWJsZScgaW50ZXJuYWxseSByYXRoZXIKdGhhbiB1c2luZyB0aGUg ZHJtX2NydGMgZmllbGQuICBUaGlzIGVuc3VyZXMgdGhhdCBvdXIgZHJpdmVyIGludGVybmFscwph cmUgd29ya2luZyBmcm9tIHRoZSBzYW1lIGRhdGEgdGhhdCB0aGUgRFJNIGNvcmUgaXMsIGF2b2lk aW5nCm1pc21hdGNoZXMuCgpUaGlzIHBhdGNoIHdhcyBnZW5lcmF0ZWQgd2l0aCBDb2NjaW5lbGxl IHVzaW5nIHRoZSBmb2xsb3dpbmcgc2VtYW50aWMKcGF0Y2g6CgogICAgICAgIDxzbXBsPgogICAg ICAgIEBACiAgICAgICAgc3RydWN0IGRybV9jcnRjIEM7CiAgICAgICAgc3RydWN0IGRybV9jcnRj ICpDUDsKICAgICAgICBAQAogICAgICAgICgKICAgICAgICAtIEMuZW5hYmxlZAogICAgICAgICsg Qy5zdGF0ZS0+ZW5hYmxlCiAgICAgICAgfAogICAgICAgIC0gQ1AtPmVuYWJsZWQKICAgICAgICAr IENQLT5zdGF0ZS0+ZW5hYmxlCiAgICAgICAgKQogICAgICAgIDwvc21wbD4KClRoZSBjcnRjLT5t b2RlIGFuZCBjcnRjLT5od21vZGUgZmllbGRzIHNob3VsZCBwcm9iYWJseSBiZSB0cmFuc2l0aW9u ZWQKb3ZlciBhcyB3ZWxsIGV2ZW50dWFsbHksIGJ1dCB3ZSBzZWVtIHRvIGRvIGFuIG9rYXkgam9i IG9mIGtlZXBpbmcgdGhvc2UKdXAtdG8tZGF0ZSBhbHJlYWR5IHNvIEkgd2FudCB0byBtaW5pbWl6 ZSB0aGUgY2hhbmdlcyB0aGF0IHdpbGwgY2xhc2gKd2l0aCBBbmRlcidzIGluLXByb2dyZXNzIGF0 b21pYyB3b3JrLgoKQXMgaXMsIHRoaXMgcGF0Y2ggc2hvdWxkIGZpeCBhIGJ1bmNoIG9mIGktZy10 IHJlZ3Jlc3Npb25zIHRoYXQgd2VyZSBpbnRyb2R1Y2VkCmJ5IERhbmllbCdzIHBhdGNoIGFib3Zl LgoKQ2M6IERhbmllbCBWZXR0ZXIgPGRhbmllbEBmZndsbC5jaD4KQ2M6IEFuZGVyIENvbnNlbHZh biBkZSBPbGl2ZWlyYSA8YW5kZXIuY29uc2VsdmFuLmRlLm9saXZlaXJhQGludGVsLmNvbT4KU2ln bmVkLW9mZi1ieTogTWF0dCBSb3BlciA8bWF0dGhldy5kLnJvcGVyQGludGVsLmNvbT4KLS0tCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jICAgICAgfCAgMiArLQogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgNjIgKysrKysrKysrKysrKysrKysrKy0tLS0tLS0t LS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9sdmRzLmMgICAgfCAgMiArLQog MyBmaWxlcyBjaGFuZ2VkLCAzNCBpbnNlcnRpb25zKCspLCAzMiBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9pcnEuYwppbmRleCAwN2UyNTdjLi45YmFlY2I3IDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfaXJxLmMKQEAgLTc5MSw3ICs3OTEsNyBAQCBzdGF0aWMgaW50IGk5MTVfZ2V0X3ZibGFua190 aW1lc3RhbXAoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgaW50IHBpcGUsCiAJCXJldHVybiAtRUlO VkFMOwogCX0KIAotCWlmICghY3J0Yy0+ZW5hYmxlZCkgeworCWlmICghY3J0Yy0+c3RhdGUtPmVu YWJsZSkgewogCQlEUk1fREVCVUdfS01TKCJjcnRjICVkIGlzIGRpc2FibGVkXG4iLCBwaXBlKTsK IAkJcmV0dXJuIC1FQlVTWTsKIAl9CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5k ZXggOWJjNTRjYy4uNTJmM2FhNCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpA QCAtMzA3Nyw3ICszMDc3LDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfZmRpX25vcm1hbF90cmFpbihz dHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAKIHN0YXRpYyBib29sIHBpcGVfaGFzX2VuYWJsZWRfcGNo KHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQogewotCXJldHVybiBjcnRjLT5iYXNlLmVuYWJsZWQg JiYgY3J0Yy0+YWN0aXZlICYmCisJcmV0dXJuIGNydGMtPmJhc2Uuc3RhdGUtPmVuYWJsZSAmJiBj cnRjLT5hY3RpdmUgJiYKIAkJY3J0Yy0+Y29uZmlnLT5oYXNfcGNoX2VuY29kZXI7CiB9CiAKQEAg LTQyMTUsNyArNDIxNSw3IEBAIHN0YXRpYyB2b2lkIGludGVsX2NydGNfbG9hZF9sdXQoc3RydWN0 IGRybV9jcnRjICpjcnRjKQogCWJvb2wgcmVlbmFibGVfaXBzID0gZmFsc2U7CiAKIAkvKiBUaGUg Y2xvY2tzIGhhdmUgdG8gYmUgb24gdG8gbG9hZCB0aGUgcGFsZXR0ZS4gKi8KLQlpZiAoIWNydGMt PmVuYWJsZWQgfHwgIWludGVsX2NydGMtPmFjdGl2ZSkKKwlpZiAoIWNydGMtPnN0YXRlLT5lbmFi bGUgfHwgIWludGVsX2NydGMtPmFjdGl2ZSkKIAkJcmV0dXJuOwogCiAJaWYgKCFIQVNfUENIX1NQ TElUKGRldl9wcml2LT5kZXYpKSB7CkBAIC00MzI4LDcgKzQzMjgsNyBAQCBzdGF0aWMgdm9pZCBp cm9ubGFrZV9jcnRjX2VuYWJsZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAJc3RydWN0IGludGVs X2VuY29kZXIgKmVuY29kZXI7CiAJaW50IHBpcGUgPSBpbnRlbF9jcnRjLT5waXBlOwogCi0JV0FS Tl9PTighY3J0Yy0+ZW5hYmxlZCk7CisJV0FSTl9PTighY3J0Yy0+c3RhdGUtPmVuYWJsZSk7CiAK IAlpZiAoaW50ZWxfY3J0Yy0+YWN0aXZlKQogCQlyZXR1cm47CkBAIC00NDM2LDcgKzQ0MzYsNyBA QCBzdGF0aWMgdm9pZCBoYXN3ZWxsX2NydGNfZW5hYmxlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykK IAlzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlcjsKIAlpbnQgcGlwZSA9IGludGVsX2NydGMt PnBpcGU7CiAKLQlXQVJOX09OKCFjcnRjLT5lbmFibGVkKTsKKwlXQVJOX09OKCFjcnRjLT5zdGF0 ZS0+ZW5hYmxlKTsKIAogCWlmIChpbnRlbF9jcnRjLT5hY3RpdmUpCiAJCXJldHVybjsKQEAgLTQ3 ODMsNyArNDc4Myw3IEBAIHN0YXRpYyB2b2lkIG1vZGVzZXRfdXBkYXRlX2NydGNfcG93ZXJfZG9t YWlucyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCWZvcl9lYWNoX2ludGVsX2NydGMoZGV2LCBj cnRjKSB7CiAJCWVudW0gaW50ZWxfZGlzcGxheV9wb3dlcl9kb21haW4gZG9tYWluOwogCi0JCWlm ICghY3J0Yy0+YmFzZS5lbmFibGVkKQorCQlpZiAoIWNydGMtPmJhc2Uuc3RhdGUtPmVuYWJsZSkK IAkJCWNvbnRpbnVlOwogCiAJCXBpcGVfZG9tYWluc1tjcnRjLT5waXBlXSA9IGdldF9jcnRjX3Bv d2VyX2RvbWFpbnMoJmNydGMtPmJhc2UpOwpAQCAtNTAwNCw3ICs1MDA0LDcgQEAgc3RhdGljIHZv aWQgdmFsbGV5dmlld19tb2Rlc2V0X2dsb2JhbF9waXBlcyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 LAogCiAJLyogZGlzYWJsZS9lbmFibGUgYWxsIGN1cnJlbnRseSBhY3RpdmUgcGlwZXMgd2hpbGUg d2UgY2hhbmdlIGNkY2xrICovCiAJZm9yX2VhY2hfaW50ZWxfY3J0YyhkZXYsIGludGVsX2NydGMp Ci0JCWlmIChpbnRlbF9jcnRjLT5iYXNlLmVuYWJsZWQpCisJCWlmIChpbnRlbF9jcnRjLT5iYXNl LnN0YXRlLT5lbmFibGUpCiAJCQkqcHJlcGFyZV9waXBlcyB8PSAoMSA8PCBpbnRlbF9jcnRjLT5w aXBlKTsKIH0KIApAQCAtNTA0NCw3ICs1MDQ0LDcgQEAgc3RhdGljIHZvaWQgdmFsbGV5dmlld19j cnRjX2VuYWJsZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAJaW50IHBpcGUgPSBpbnRlbF9jcnRj LT5waXBlOwogCWJvb2wgaXNfZHNpOwogCi0JV0FSTl9PTighY3J0Yy0+ZW5hYmxlZCk7CisJV0FS Tl9PTighY3J0Yy0+c3RhdGUtPmVuYWJsZSk7CiAKIAlpZiAoaW50ZWxfY3J0Yy0+YWN0aXZlKQog CQlyZXR1cm47CkBAIC01MTI3LDcgKzUxMjcsNyBAQCBzdGF0aWMgdm9pZCBpOXh4X2NydGNfZW5h YmxlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAlzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2Rl cjsKIAlpbnQgcGlwZSA9IGludGVsX2NydGMtPnBpcGU7CiAKLQlXQVJOX09OKCFjcnRjLT5lbmFi bGVkKTsKKwlXQVJOX09OKCFjcnRjLT5zdGF0ZS0+ZW5hYmxlKTsKIAogCWlmIChpbnRlbF9jcnRj LT5hY3RpdmUpCiAJCXJldHVybjsKQEAgLTUzMjYsNyArNTMyNiw3IEBAIHN0YXRpYyB2b2lkIGlu dGVsX2NydGNfZGlzYWJsZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAJc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAogCS8qIGNydGMgc2hvdWxk IHN0aWxsIGJlIGVuYWJsZWQgd2hlbiB3ZSBkaXNhYmxlIGl0LiAqLwotCVdBUk5fT04oIWNydGMt PmVuYWJsZWQpOworCVdBUk5fT04oIWNydGMtPnN0YXRlLT5lbmFibGUpOwogCiAJZGV2X3ByaXYt PmRpc3BsYXkuY3J0Y19kaXNhYmxlKGNydGMpOwogCWRldl9wcml2LT5kaXNwbGF5Lm9mZihjcnRj KTsKQEAgLTU0MDQsNyArNTQwNCw4IEBAIHN0YXRpYyB2b2lkIGludGVsX2Nvbm5lY3Rvcl9jaGVj a19zdGF0ZShzdHJ1Y3QgaW50ZWxfY29ubmVjdG9yICpjb25uZWN0b3IpCiAKIAkJCWNydGMgPSBl bmNvZGVyLT5iYXNlLmNydGM7CiAKLQkJCUk5MTVfU1RBVEVfV0FSTighY3J0Yy0+ZW5hYmxlZCwg ImNydGMgbm90IGVuYWJsZWRcbiIpOworCQkJSTkxNV9TVEFURV9XQVJOKCFjcnRjLT5zdGF0ZS0+ ZW5hYmxlLAorCQkJCQkiY3J0YyBub3QgZW5hYmxlZFxuIik7CiAJCQlJOTE1X1NUQVRFX1dBUk4o IXRvX2ludGVsX2NydGMoY3J0YyktPmFjdGl2ZSwgImNydGMgbm90IGFjdGl2ZVxuIik7CiAJCQlJ OTE1X1NUQVRFX1dBUk4ocGlwZSAhPSB0b19pbnRlbF9jcnRjKGNydGMpLT5waXBlLAogCQkJICAg ICAiZW5jb2RlciBhY3RpdmUgb24gdGhlIHdyb25nIHBpcGVcbiIpOwpAQCAtODcxNyw3ICs4NzE4 LDcgQEAgcmV0cnk6CiAJCWkrKzsKIAkJaWYgKCEoZW5jb2Rlci0+cG9zc2libGVfY3J0Y3MgJiAo MSA8PCBpKSkpCiAJCQljb250aW51ZTsKLQkJaWYgKHBvc3NpYmxlX2NydGMtPmVuYWJsZWQpCisJ CWlmIChwb3NzaWJsZV9jcnRjLT5zdGF0ZS0+ZW5hYmxlKQogCQkJY29udGludWU7CiAJCS8qIFRo aXMgY2FuIG9jY3VyIHdoZW4gYXBwbHlpbmcgdGhlIHBpcGUgQSBxdWlyayBvbiByZXN1bWUuICov CiAJCWlmICh0b19pbnRlbF9jcnRjKHBvc3NpYmxlX2NydGMpLT5uZXdfZW5hYmxlZCkKQEAgLTg3 ODUsNyArODc4Niw3IEBAIHJldHJ5OgogCXJldHVybiB0cnVlOwogCiAgZmFpbDoKLQlpbnRlbF9j cnRjLT5uZXdfZW5hYmxlZCA9IGNydGMtPmVuYWJsZWQ7CisJaW50ZWxfY3J0Yy0+bmV3X2VuYWJs ZWQgPSBjcnRjLT5zdGF0ZS0+ZW5hYmxlOwogCWlmIChpbnRlbF9jcnRjLT5uZXdfZW5hYmxlZCkK IAkJaW50ZWxfY3J0Yy0+bmV3X2NvbmZpZyA9IGludGVsX2NydGMtPmNvbmZpZzsKIAllbHNlCkBA IC05OTQ1LDcgKzk5NDYsNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9tb2Rlc2V0X3VwZGF0ZV9zdGFn ZWRfb3V0cHV0X3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJfQogCiAJZm9yX2VhY2hf aW50ZWxfY3J0YyhkZXYsIGNydGMpIHsKLQkJY3J0Yy0+bmV3X2VuYWJsZWQgPSBjcnRjLT5iYXNl LmVuYWJsZWQ7CisJCWNydGMtPm5ld19lbmFibGVkID0gY3J0Yy0+YmFzZS5zdGF0ZS0+ZW5hYmxl OwogCiAJCWlmIChjcnRjLT5uZXdfZW5hYmxlZCkKIAkJCWNydGMtPm5ld19jb25maWcgPSBjcnRj LT5jb25maWc7CkBAIC05OTc1LDcgKzk5NzYsNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9tb2Rlc2V0 X2NvbW1pdF9vdXRwdXRfc3RhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAl9CiAKIAlmb3Jf ZWFjaF9pbnRlbF9jcnRjKGRldiwgY3J0YykgewotCQljcnRjLT5iYXNlLmVuYWJsZWQgPSBjcnRj LT5uZXdfZW5hYmxlZDsKKwkJY3J0Yy0+YmFzZS5zdGF0ZS0+ZW5hYmxlID0gY3J0Yy0+bmV3X2Vu YWJsZWQ7CiAJfQogfQogCkBAIC0xMDM4Niw3ICsxMDM4Nyw3IEBAIGludGVsX21vZGVzZXRfYWZm ZWN0ZWRfcGlwZXMoc3RydWN0IGRybV9jcnRjICpjcnRjLCB1bnNpZ25lZCAqbW9kZXNldF9waXBl cywKIAogCS8qIENoZWNrIGZvciBwaXBlcyB0aGF0IHdpbGwgYmUgZW5hYmxlZC9kaXNhYmxlZCAu Li4gKi8KIAlmb3JfZWFjaF9pbnRlbF9jcnRjKGRldiwgaW50ZWxfY3J0YykgewotCQlpZiAoaW50 ZWxfY3J0Yy0+YmFzZS5lbmFibGVkID09IGludGVsX2NydGMtPm5ld19lbmFibGVkKQorCQlpZiAo aW50ZWxfY3J0Yy0+YmFzZS5zdGF0ZS0+ZW5hYmxlID09IGludGVsX2NydGMtPm5ld19lbmFibGVk KQogCQkJY29udGludWU7CiAKIAkJaWYgKCFpbnRlbF9jcnRjLT5uZXdfZW5hYmxlZCkKQEAgLTEw NDYxLDEwICsxMDQ2MiwxMCBAQCBpbnRlbF9tb2Rlc2V0X3VwZGF0ZV9zdGF0ZShzdHJ1Y3QgZHJt X2RldmljZSAqZGV2LCB1bnNpZ25lZCBwcmVwYXJlX3BpcGVzKQogCiAJLyogRG91YmxlIGNoZWNr IHN0YXRlLiAqLwogCWZvcl9lYWNoX2ludGVsX2NydGMoZGV2LCBpbnRlbF9jcnRjKSB7Ci0JCVdB Uk5fT04oaW50ZWxfY3J0Yy0+YmFzZS5lbmFibGVkICE9IGludGVsX2NydGNfaW5fdXNlKCZpbnRl bF9jcnRjLT5iYXNlKSk7CisJCVdBUk5fT04oaW50ZWxfY3J0Yy0+YmFzZS5zdGF0ZS0+ZW5hYmxl ICE9IGludGVsX2NydGNfaW5fdXNlKCZpbnRlbF9jcnRjLT5iYXNlKSk7CiAJCVdBUk5fT04oaW50 ZWxfY3J0Yy0+bmV3X2NvbmZpZyAmJgogCQkJaW50ZWxfY3J0Yy0+bmV3X2NvbmZpZyAhPSBpbnRl bF9jcnRjLT5jb25maWcpOwotCQlXQVJOX09OKGludGVsX2NydGMtPmJhc2UuZW5hYmxlZCAhPSAh IWludGVsX2NydGMtPm5ld19jb25maWcpOworCQlXQVJOX09OKGludGVsX2NydGMtPmJhc2Uuc3Rh dGUtPmVuYWJsZSAhPSAhIWludGVsX2NydGMtPm5ld19jb25maWcpOwogCX0KIAogCWxpc3RfZm9y X2VhY2hfZW50cnkoY29ubmVjdG9yLCAmZGV2LT5tb2RlX2NvbmZpZy5jb25uZWN0b3JfbGlzdCwg aGVhZCkgewpAQCAtMTA4NTEsNyArMTA4NTIsNyBAQCBjaGVja19jcnRjX3N0YXRlKHN0cnVjdCBk cm1fZGV2aWNlICpkZXYpCiAJCURSTV9ERUJVR19LTVMoIltDUlRDOiVkXVxuIiwKIAkJCSAgICAg IGNydGMtPmJhc2UuYmFzZS5pZCk7CiAKLQkJSTkxNV9TVEFURV9XQVJOKGNydGMtPmFjdGl2ZSAm JiAhY3J0Yy0+YmFzZS5lbmFibGVkLAorCQlJOTE1X1NUQVRFX1dBUk4oY3J0Yy0+YWN0aXZlICYm ICFjcnRjLT5iYXNlLnN0YXRlLT5lbmFibGUsCiAJCSAgICAgImFjdGl2ZSBjcnRjLCBidXQgbm90 IGVuYWJsZWQgaW4gc3cgdHJhY2tpbmdcbiIpOwogCiAJCWZvcl9lYWNoX2ludGVsX2VuY29kZXIo ZGV2LCBlbmNvZGVyKSB7CkBAIC0xMDg2NSw5ICsxMDg2NiwxMCBAQCBjaGVja19jcnRjX3N0YXRl KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCUk5MTVfU1RBVEVfV0FSTihhY3RpdmUgIT0gY3J0 Yy0+YWN0aXZlLAogCQkgICAgICJjcnRjJ3MgY29tcHV0ZWQgYWN0aXZlIHN0YXRlIGRvZXNuJ3Qg bWF0Y2ggdHJhY2tlZCBhY3RpdmUgc3RhdGUgIgogCQkgICAgICIoZXhwZWN0ZWQgJWksIGZvdW5k ICVpKVxuIiwgYWN0aXZlLCBjcnRjLT5hY3RpdmUpOwotCQlJOTE1X1NUQVRFX1dBUk4oZW5hYmxl ZCAhPSBjcnRjLT5iYXNlLmVuYWJsZWQsCisJCUk5MTVfU1RBVEVfV0FSTihlbmFibGVkICE9IGNy dGMtPmJhc2Uuc3RhdGUtPmVuYWJsZSwKIAkJICAgICAiY3J0YydzIGNvbXB1dGVkIGVuYWJsZWQg c3RhdGUgZG9lc24ndCBtYXRjaCB0cmFja2VkIGVuYWJsZWQgc3RhdGUgIgotCQkgICAgICIoZXhw ZWN0ZWQgJWksIGZvdW5kICVpKVxuIiwgZW5hYmxlZCwgY3J0Yy0+YmFzZS5lbmFibGVkKTsKKwkJ ICAgICAiKGV4cGVjdGVkICVpLCBmb3VuZCAlaSlcbiIsIGVuYWJsZWQsCisJCQkJY3J0Yy0+YmFz ZS5zdGF0ZS0+ZW5hYmxlKTsKIAogCQlhY3RpdmUgPSBkZXZfcHJpdi0+ZGlzcGxheS5nZXRfcGlw ZV9jb25maWcoY3J0YywKIAkJCQkJCQkgICAmcGlwZV9jb25maWcpOwpAQCAtMTA5MzEsNyArMTA5 MzMsNyBAQCBjaGVja19zaGFyZWRfZHBsbF9zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQog CQkgICAgIHBsbC0+b24sIGFjdGl2ZSk7CiAKIAkJZm9yX2VhY2hfaW50ZWxfY3J0YyhkZXYsIGNy dGMpIHsKLQkJCWlmIChjcnRjLT5iYXNlLmVuYWJsZWQgJiYgaW50ZWxfY3J0Y190b19zaGFyZWRf ZHBsbChjcnRjKSA9PSBwbGwpCisJCQlpZiAoY3J0Yy0+YmFzZS5zdGF0ZS0+ZW5hYmxlICYmIGlu dGVsX2NydGNfdG9fc2hhcmVkX2RwbGwoY3J0YykgPT0gcGxsKQogCQkJCWVuYWJsZWRfY3J0Y3Mr KzsKIAkJCWlmIChjcnRjLT5hY3RpdmUgJiYgaW50ZWxfY3J0Y190b19zaGFyZWRfZHBsbChjcnRj KSA9PSBwbGwpCiAJCQkJYWN0aXZlX2NydGNzKys7CkBAIC0xMTExNyw3ICsxMTExOSw3IEBAIHN0 YXRpYyBpbnQgX19pbnRlbF9zZXRfbW9kZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJCWludGVs X2NydGNfZGlzYWJsZSgmaW50ZWxfY3J0Yy0+YmFzZSk7CiAKIAlmb3JfZWFjaF9pbnRlbF9jcnRj X21hc2tlZChkZXYsIHByZXBhcmVfcGlwZXMsIGludGVsX2NydGMpIHsKLQkJaWYgKGludGVsX2Ny dGMtPmJhc2UuZW5hYmxlZCkKKwkJaWYgKGludGVsX2NydGMtPmJhc2Uuc3RhdGUtPmVuYWJsZSkK IAkJCWRldl9wcml2LT5kaXNwbGF5LmNydGNfZGlzYWJsZSgmaW50ZWxfY3J0Yy0+YmFzZSk7CiAJ fQogCkBAIC0xMTE3Myw3ICsxMTE3NSw3IEBAIHN0YXRpYyBpbnQgX19pbnRlbF9zZXRfbW9kZShz dHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAKIAkvKiBGSVhNRTogYWRkIHN1YnBpeGVsIG9yZGVyICov CiBkb25lOgotCWlmIChyZXQgJiYgY3J0Yy0+ZW5hYmxlZCkKKwlpZiAocmV0ICYmIGNydGMtPnN0 YXRlLT5lbmFibGUpCiAJCWNydGMtPm1vZGUgPSAqc2F2ZWRfbW9kZTsKIAogCWtmcmVlKHNhdmVk X21vZGUpOwpAQCAtMTEyNjksNyArMTEyNzEsNyBAQCBzdGF0aWMgaW50IGludGVsX3NldF9jb25m aWdfc2F2ZV9zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCSAqLwogCWNvdW50ID0gMDsK IAlmb3JfZWFjaF9jcnRjKGRldiwgY3J0YykgewotCQljb25maWctPnNhdmVfY3J0Y19lbmFibGVk W2NvdW50KytdID0gY3J0Yy0+ZW5hYmxlZDsKKwkJY29uZmlnLT5zYXZlX2NydGNfZW5hYmxlZFtj b3VudCsrXSA9IGNydGMtPnN0YXRlLT5lbmFibGU7CiAJfQogCiAJY291bnQgPSAwOwpAQCAtMTE1 MDMsNyArMTE1MDUsNyBAQCBpbnRlbF9tb2Rlc2V0X3N0YWdlX291dHB1dF9zdGF0ZShzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2LAogCQkJfQogCQl9CiAKLQkJaWYgKGNydGMtPm5ld19lbmFibGVkICE9 IGNydGMtPmJhc2UuZW5hYmxlZCkgeworCQlpZiAoY3J0Yy0+bmV3X2VuYWJsZWQgIT0gY3J0Yy0+ YmFzZS5zdGF0ZS0+ZW5hYmxlKSB7CiAJCQlEUk1fREVCVUdfS01TKCJjcnRjICVzYWJsZWQsIGZ1 bGwgbW9kZSBzd2l0Y2hcbiIsCiAJCQkJICAgICAgY3J0Yy0+bmV3X2VuYWJsZWQgPyAiZW4iIDog ImRpcyIpOwogCQkJY29uZmlnLT5tb2RlX2NoYW5nZWQgPSB0cnVlOwpAQCAtMTMzOTIsNyArMTMz OTQsNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9zYW5pdGl6ZV9jcnRjKHN0cnVjdCBpbnRlbF9jcnRj ICpjcnRjKQogCQkJfQogCiAJCVdBUk5fT04oY3J0Yy0+YWN0aXZlKTsKLQkJY3J0Yy0+YmFzZS5l bmFibGVkID0gZmFsc2U7CisJCWNydGMtPmJhc2Uuc3RhdGUtPmVuYWJsZSA9IGZhbHNlOwogCX0K IAogCWlmIChkZXZfcHJpdi0+cXVpcmtzICYgUVVJUktfUElQRUFfRk9SQ0UgJiYKQEAgLTEzNDA4 LDcgKzEzNDEwLDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfc2FuaXRpemVfY3J0YyhzdHJ1Y3QgaW50 ZWxfY3J0YyAqY3J0YykKIAkgKiBoYXZlIGFjdGl2ZSBjb25uZWN0b3JzL2VuY29kZXJzLiAqLwog CWludGVsX2NydGNfdXBkYXRlX2RwbXMoJmNydGMtPmJhc2UpOwogCi0JaWYgKGNydGMtPmFjdGl2 ZSAhPSBjcnRjLT5iYXNlLmVuYWJsZWQpIHsKKwlpZiAoY3J0Yy0+YWN0aXZlICE9IGNydGMtPmJh c2Uuc3RhdGUtPmVuYWJsZSkgewogCQlzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlcjsKIAog CQkvKiBUaGlzIGNhbiBoYXBwZW4gZWl0aGVyIGR1ZSB0byBidWdzIGluIHRoZSBnZXRfaHdfc3Rh dGUKQEAgLTEzNDE2LDEwICsxMzQxOCwxMCBAQCBzdGF0aWMgdm9pZCBpbnRlbF9zYW5pdGl6ZV9j cnRjKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQogCQkgKiBwaXBlIEEgcXVpcmsuICovCiAJCURS TV9ERUJVR19LTVMoIltDUlRDOiVkXSBodyBzdGF0ZSBhZGp1c3RlZCwgd2FzICVzLCBub3cgJXNc biIsCiAJCQkgICAgICBjcnRjLT5iYXNlLmJhc2UuaWQsCi0JCQkgICAgICBjcnRjLT5iYXNlLmVu YWJsZWQgPyAiZW5hYmxlZCIgOiAiZGlzYWJsZWQiLAorCQkJICAgICAgY3J0Yy0+YmFzZS5zdGF0 ZS0+ZW5hYmxlID8gImVuYWJsZWQiIDogImRpc2FibGVkIiwKIAkJCSAgICAgIGNydGMtPmFjdGl2 ZSA/ICJlbmFibGVkIiA6ICJkaXNhYmxlZCIpOwogCi0JCWNydGMtPmJhc2UuZW5hYmxlZCA9IGNy dGMtPmFjdGl2ZTsKKwkJY3J0Yy0+YmFzZS5zdGF0ZS0+ZW5hYmxlID0gY3J0Yy0+YWN0aXZlOwog CiAJCS8qIEJlY2F1c2Ugd2Ugb25seSBlc3RhYmxpc2ggdGhlIGNvbm5lY3RvciAtPiBlbmNvZGVy IC0+CiAJCSAqIGNydGMgbGlua3MgaWYgc29tZXRoaW5nIGlzIGFjdGl2ZSwgdGhpcyBtZWFucyB0 aGUKQEAgLTEzNTU1LDcgKzEzNTU3LDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfbW9kZXNldF9yZWFk b3V0X2h3X3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCWNydGMtPmFjdGl2ZSA9IGRl dl9wcml2LT5kaXNwbGF5LmdldF9waXBlX2NvbmZpZyhjcnRjLAogCQkJCQkJCQkgY3J0Yy0+Y29u ZmlnKTsKIAotCQljcnRjLT5iYXNlLmVuYWJsZWQgPSBjcnRjLT5hY3RpdmU7CisJCWNydGMtPmJh c2Uuc3RhdGUtPmVuYWJsZSA9IGNydGMtPmFjdGl2ZTsKIAkJY3J0Yy0+cHJpbWFyeV9lbmFibGVk ID0gcHJpbWFyeV9nZXRfaHdfc3RhdGUoY3J0Yyk7CiAKIAkJRFJNX0RFQlVHX0tNUygiW0NSVEM6 JWRdIGh3IHN0YXRlIHJlYWRvdXQ6ICVzXG4iLApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfbHZkcy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHZkcy5jCmlu ZGV4IDA3MWI5NmQuLjI0ZTg3MzAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2x2ZHMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9sdmRzLmMKQEAgLTUw OSw3ICs1MDksNyBAQCBzdGF0aWMgaW50IGludGVsX2x2ZHNfc2V0X3Byb3BlcnR5KHN0cnVjdCBk cm1fY29ubmVjdG9yICpjb25uZWN0b3IsCiAJCWludGVsX2Nvbm5lY3Rvci0+cGFuZWwuZml0dGlu Z19tb2RlID0gdmFsdWU7CiAKIAkJY3J0YyA9IGludGVsX2F0dGFjaGVkX2VuY29kZXIoY29ubmVj dG9yKS0+YmFzZS5jcnRjOwotCQlpZiAoY3J0YyAmJiBjcnRjLT5lbmFibGVkKSB7CisJCWlmIChj cnRjICYmIGNydGMtPnN0YXRlLT5lbmFibGUpIHsKIAkJCS8qCiAJCQkgKiBJZiB0aGUgQ1JUQyBp cyBlbmFibGVkLCB0aGUgZGlzcGxheSB3aWxsIGJlIGNoYW5nZWQKIAkJCSAqIGFjY29yZGluZyB0 byB0aGUgbmV3IHBhbmVsIGZpdHRpbmcgbW9kZS4KLS0gCjEuOC41LjEKCl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QK SW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Au b3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==