From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1423234AbbD2OBb (ORCPT ); Wed, 29 Apr 2015 10:01:31 -0400 Received: from mga03.intel.com ([134.134.136.65]:39758 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966281AbbD2OBX (ORCPT ); Wed, 29 Apr 2015 10:01:23 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.11,671,1422950400"; d="scan'208";a="717791344" From: Shobhit Kumar To: intel-gfx , linux-kernel , linux-gpio , linux-pwm , dri-devel Cc: Linus Walleij , Alexandre Courbot , Daniel Vetter , David Airlie , Samuel Ortiz , Thierry Reding , Jani Nikula , Lee Jones , Povilas Staniulis , Chih-Wei Huang , Shobhit Kumar Subject: [PATCH 8/8] drm/i915: Backlight control using CRC PMIC based PWM driver Date: Wed, 29 Apr 2015 19:30:05 +0530 Message-Id: <1430316005-16480-9-git-send-email-shobhit.kumar@intel.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1430316005-16480-1-git-send-email-shobhit.kumar@intel.com> References: <1430316005-16480-1-git-send-email-shobhit.kumar@intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use the CRC PWM device in intel_panel.c and add new MIPI backlight specififc callbacks v2: Modify to use pwm_config callback CC: Samuel Ortiz Cc: Linus Walleij Cc: Alexandre Courbot Cc: Thierry Reding Signed-off-by: Shobhit Kumar --- drivers/gpu/drm/i915/intel_drv.h | 5 +++ drivers/gpu/drm/i915/intel_dsi.c | 6 +++ drivers/gpu/drm/i915/intel_panel.c | 92 +++++++++++++++++++++++++++++++++++--- 3 files changed, 98 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 897f17d..b4ebe3b 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -182,7 +182,12 @@ struct intel_panel { bool enabled; bool combination_mode; /* gen 2/4 only */ bool active_low_pwm; + + /* PWM chip */ + struct pwm_device *pwm; + struct backlight_device *device; + } backlight; void (*backlight_power)(struct intel_connector *, bool enable); diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/intel_dsi.c index be55ffa..83c4540 100644 --- a/drivers/gpu/drm/i915/intel_dsi.c +++ b/drivers/gpu/drm/i915/intel_dsi.c @@ -402,6 +402,8 @@ static void intel_dsi_enable(struct intel_encoder *encoder) intel_dsi_port_enable(encoder); } + + intel_panel_enable_backlight(intel_dsi->attached_connector); } static void intel_dsi_pre_enable(struct intel_encoder *encoder) @@ -466,6 +468,8 @@ static void intel_dsi_pre_disable(struct intel_encoder *encoder) DRM_DEBUG_KMS("\n"); + intel_panel_disable_backlight(intel_dsi->attached_connector); + if (is_vid_mode(intel_dsi)) { /* Send Shutdown command to the panel in LP mode */ for_each_dsi_port(port, intel_dsi->ports) @@ -1132,6 +1136,8 @@ void intel_dsi_init(struct drm_device *dev) } intel_panel_init(&intel_connector->panel, fixed_mode, NULL); + intel_panel_setup_backlight(connector, + (intel_encoder->crtc_mask = (1 << PIPE_A)) ? PIPE_A: PIPE_B); return; diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c index 08532d4..5700f6f 100644 --- a/drivers/gpu/drm/i915/intel_panel.c +++ b/drivers/gpu/drm/i915/intel_panel.c @@ -32,8 +32,12 @@ #include #include +#include #include "intel_drv.h" +#define CRC_PMIC_PWM_PERIOD_NS 21333 +#define CRC_PMIC_PWM_STEPS 255 + void intel_fixed_panel_mode(const struct drm_display_mode *fixed_mode, struct drm_display_mode *adjusted_mode) @@ -536,6 +540,15 @@ static u32 vlv_get_backlight(struct intel_connector *connector) return _vlv_get_backlight(dev, pipe); } +static u32 vlv_get_mipi_backlight(struct intel_connector *connector) +{ + struct intel_panel *panel = &connector->panel; + int duty_ns; + + duty_ns = pwm_get_duty_cycle(panel->backlight.pwm); + return DIV_ROUND_UP(duty_ns * 100, CRC_PMIC_PWM_PERIOD_NS); +} + static u32 intel_panel_get_backlight(struct intel_connector *connector) { struct drm_device *dev = connector->base.dev; @@ -616,6 +629,14 @@ static void vlv_set_backlight(struct intel_connector *connector, u32 level) I915_WRITE(VLV_BLC_PWM_CTL(pipe), tmp | level); } +static void vlv_set_mipi_backlight(struct intel_connector *connector, u32 level) +{ + struct intel_panel *panel = &connector->panel; + int duty_ns = DIV_ROUND_UP(level * CRC_PMIC_PWM_PERIOD_NS, 100); + + pwm_config(panel->backlight.pwm, duty_ns, CRC_PMIC_PWM_PERIOD_NS); +} + static void intel_panel_actually_set_backlight(struct intel_connector *connector, u32 level) { @@ -741,6 +762,16 @@ static void vlv_disable_backlight(struct intel_connector *connector) I915_WRITE(VLV_BLC_PWM_CTL2(pipe), tmp & ~BLM_PWM_ENABLE); } +static void vlv_disable_mipi_backlight(struct intel_connector *connector) +{ + struct intel_panel *panel = &connector->panel; + + /* Disable the backlight */ + pwm_config(panel->backlight.pwm, 0, CRC_PMIC_PWM_PERIOD_NS); + usleep_range(2000, 3000); + pwm_disable(panel->backlight.pwm); +} + void intel_panel_disable_backlight(struct intel_connector *connector) { struct drm_device *dev = connector->base.dev; @@ -947,6 +978,16 @@ static void vlv_enable_backlight(struct intel_connector *connector) I915_WRITE(VLV_BLC_PWM_CTL2(pipe), ctl2 | BLM_PWM_ENABLE); } +static void vlv_enable_mipi_backlight(struct intel_connector *connector) +{ + struct intel_panel *panel = &connector->panel; + int duty_ns = DIV_ROUND_UP( + panel->backlight.level * CRC_PMIC_PWM_PERIOD_NS, 100); + + pwm_enable(panel->backlight.pwm); + pwm_config(panel->backlight.pwm, duty_ns, CRC_PMIC_PWM_PERIOD_NS); +} + void intel_panel_enable_backlight(struct intel_connector *connector) { struct drm_device *dev = connector->base.dev; @@ -1299,6 +1340,34 @@ static int vlv_setup_backlight(struct intel_connector *connector, enum pipe pipe return 0; } +static int vlv_setup_mipi_backlight(struct intel_connector *connector, enum pipe pipe) +{ + struct drm_device *dev = connector->base.dev; + struct intel_panel *panel = &connector->panel; + + /* Get the PWM chip for backlight control */ + panel->backlight.pwm = pwm_get(dev->dev, "pwm_backlight"); + if (IS_ERR(panel->backlight.pwm)) { + DRM_ERROR("Faild to own the pwm chip\n"); + panel->backlight.pwm = NULL; + } else if (pwm_config(panel->backlight.pwm, CRC_PMIC_PWM_PERIOD_NS, + CRC_PMIC_PWM_PERIOD_NS) < 0) { + DRM_ERROR("Failed to configure the pwm chip\n"); + pwm_put(panel->backlight.pwm); + panel->backlight.pwm = NULL; + return -1; + } + + panel->backlight.min = 0; /* 0% */ + panel->backlight.max = 100; /* 100% */ + panel->backlight.level = DIV_ROUND_UP( + pwm_get_duty_cycle(panel->backlight.pwm) * 100, + CRC_PMIC_PWM_PERIOD_NS); + panel->backlight.enabled = panel->backlight.level ? true : false; + + return 0; +} + int intel_panel_setup_backlight(struct drm_connector *connector, enum pipe pipe) { struct drm_device *dev = connector->dev; @@ -1363,11 +1432,19 @@ void intel_panel_init_backlight_funcs(struct drm_device *dev) dev_priv->display.set_backlight = pch_set_backlight; dev_priv->display.get_backlight = pch_get_backlight; } else if (IS_VALLEYVIEW(dev)) { - dev_priv->display.setup_backlight = vlv_setup_backlight; - dev_priv->display.enable_backlight = vlv_enable_backlight; - dev_priv->display.disable_backlight = vlv_disable_backlight; - dev_priv->display.set_backlight = vlv_set_backlight; - dev_priv->display.get_backlight = vlv_get_backlight; + if (dev_priv->vbt.has_mipi) { + dev_priv->display.setup_backlight = vlv_setup_mipi_backlight; + dev_priv->display.enable_backlight = vlv_enable_mipi_backlight; + dev_priv->display.disable_backlight = vlv_disable_mipi_backlight; + dev_priv->display.set_backlight = vlv_set_mipi_backlight; + dev_priv->display.get_backlight = vlv_get_mipi_backlight; + } else { + dev_priv->display.setup_backlight = vlv_setup_backlight; + dev_priv->display.enable_backlight = vlv_enable_backlight; + dev_priv->display.disable_backlight = vlv_disable_backlight; + dev_priv->display.set_backlight = vlv_set_backlight; + dev_priv->display.get_backlight = vlv_get_backlight; + } } else if (IS_GEN4(dev)) { dev_priv->display.setup_backlight = i965_setup_backlight; dev_priv->display.enable_backlight = i965_enable_backlight; @@ -1404,6 +1481,11 @@ void intel_panel_fini(struct intel_panel *panel) if (panel->downclock_mode) drm_mode_destroy(intel_connector->base.dev, panel->downclock_mode); + + /* dispose of the pwm */ + if (panel->backlight.pwm) + pwm_put(panel->backlight.pwm); + } void intel_backlight_register(struct drm_device *dev) -- 2.1.0 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Shobhit Kumar Subject: [PATCH 8/8] drm/i915: Backlight control using CRC PMIC based PWM driver Date: Wed, 29 Apr 2015 19:30:05 +0530 Message-ID: <1430316005-16480-9-git-send-email-shobhit.kumar@intel.com> References: <1430316005-16480-1-git-send-email-shobhit.kumar@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1430316005-16480-1-git-send-email-shobhit.kumar@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 , linux-kernel , linux-gpio , linux-pwm , dri-devel Cc: Alexandre Courbot , Samuel Ortiz , Povilas Staniulis , David Airlie , Shobhit Kumar , Linus Walleij , Jani Nikula , Chih-Wei Huang , Thierry Reding , Daniel Vetter , Lee Jones List-Id: linux-gpio@vger.kernel.org VXNlIHRoZSBDUkMgUFdNIGRldmljZSBpbiBpbnRlbF9wYW5lbC5jIGFuZCBhZGQgbmV3IE1JUEkg YmFja2xpZ2h0CnNwZWNpZmlmYyBjYWxsYmFja3MKCnYyOiBNb2RpZnkgdG8gdXNlIHB3bV9jb25m aWcgY2FsbGJhY2sKCkNDOiBTYW11ZWwgT3J0aXogPHNhbWVvQGxpbnV4LmludGVsLmNvbT4KQ2M6 IExpbnVzIFdhbGxlaWogPGxpbnVzLndhbGxlaWpAbGluYXJvLm9yZz4KQ2M6IEFsZXhhbmRyZSBD b3VyYm90IDxnbnVyb3VAZ21haWwuY29tPgpDYzogVGhpZXJyeSBSZWRpbmcgPHRoaWVycnkucmVk aW5nQGdtYWlsLmNvbT4KU2lnbmVkLW9mZi1ieTogU2hvYmhpdCBLdW1hciA8c2hvYmhpdC5rdW1h ckBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggICB8ICA1 ICsrKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHNpLmMgICB8ICA2ICsrKwogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfcGFuZWwuYyB8IDkyICsrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrLS0tCiAzIGZpbGVzIGNoYW5nZWQsIDk4IGluc2VydGlvbnMoKyksIDUgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2Lmgg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAppbmRleCA4OTdmMTdkLi5iNGViZTNi IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAorKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaApAQCAtMTgyLDcgKzE4MiwxMiBAQCBzdHJ1Y3Qg aW50ZWxfcGFuZWwgewogCQlib29sIGVuYWJsZWQ7CiAJCWJvb2wgY29tYmluYXRpb25fbW9kZTsJ LyogZ2VuIDIvNCBvbmx5ICovCiAJCWJvb2wgYWN0aXZlX2xvd19wd207CisKKwkJLyogUFdNIGNo aXAgKi8KKwkJc3RydWN0IHB3bV9kZXZpY2UgKnB3bTsKKwogCQlzdHJ1Y3QgYmFja2xpZ2h0X2Rl dmljZSAqZGV2aWNlOworCiAJfSBiYWNrbGlnaHQ7CiAKIAl2b2lkICgqYmFja2xpZ2h0X3Bvd2Vy KShzdHJ1Y3QgaW50ZWxfY29ubmVjdG9yICosIGJvb2wgZW5hYmxlKTsKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RzaS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZHNpLmMKaW5kZXggYmU1NWZmYS4uODNjNDU0MCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZHNpLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHNp LmMKQEAgLTQwMiw2ICs0MDIsOCBAQCBzdGF0aWMgdm9pZCBpbnRlbF9kc2lfZW5hYmxlKHN0cnVj dCBpbnRlbF9lbmNvZGVyICplbmNvZGVyKQogCiAJCWludGVsX2RzaV9wb3J0X2VuYWJsZShlbmNv ZGVyKTsKIAl9CisKKwlpbnRlbF9wYW5lbF9lbmFibGVfYmFja2xpZ2h0KGludGVsX2RzaS0+YXR0 YWNoZWRfY29ubmVjdG9yKTsKIH0KIAogc3RhdGljIHZvaWQgaW50ZWxfZHNpX3ByZV9lbmFibGUo c3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIpCkBAIC00NjYsNiArNDY4LDggQEAgc3RhdGlj IHZvaWQgaW50ZWxfZHNpX3ByZV9kaXNhYmxlKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVy KQogCiAJRFJNX0RFQlVHX0tNUygiXG4iKTsKIAorCWludGVsX3BhbmVsX2Rpc2FibGVfYmFja2xp Z2h0KGludGVsX2RzaS0+YXR0YWNoZWRfY29ubmVjdG9yKTsKKwogCWlmIChpc192aWRfbW9kZShp bnRlbF9kc2kpKSB7CiAJCS8qIFNlbmQgU2h1dGRvd24gY29tbWFuZCB0byB0aGUgcGFuZWwgaW4g TFAgbW9kZSAqLwogCQlmb3JfZWFjaF9kc2lfcG9ydChwb3J0LCBpbnRlbF9kc2ktPnBvcnRzKQpA QCAtMTEzMiw2ICsxMTM2LDggQEAgdm9pZCBpbnRlbF9kc2lfaW5pdChzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2KQogCX0KIAogCWludGVsX3BhbmVsX2luaXQoJmludGVsX2Nvbm5lY3Rvci0+cGFuZWws IGZpeGVkX21vZGUsIE5VTEwpOworCWludGVsX3BhbmVsX3NldHVwX2JhY2tsaWdodChjb25uZWN0 b3IsCisJCShpbnRlbF9lbmNvZGVyLT5jcnRjX21hc2sgPSAoMSA8PCBQSVBFX0EpKSA/IFBJUEVf QTogUElQRV9CKTsKIAogCXJldHVybjsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfcGFuZWwuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BhbmVsLmMKaW5k ZXggMDg1MzJkNC4uNTcwMGY2ZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfcGFuZWwuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wYW5lbC5jCkBAIC0z Miw4ICszMiwxMiBAQAogCiAjaW5jbHVkZSA8bGludXgva2VybmVsLmg+CiAjaW5jbHVkZSA8bGlu dXgvbW9kdWxlcGFyYW0uaD4KKyNpbmNsdWRlIDxsaW51eC9wd20uaD4KICNpbmNsdWRlICJpbnRl bF9kcnYuaCIKIAorI2RlZmluZSBDUkNfUE1JQ19QV01fUEVSSU9EX05TCTIxMzMzCisjZGVmaW5l IENSQ19QTUlDX1BXTV9TVEVQUwkyNTUKKwogdm9pZAogaW50ZWxfZml4ZWRfcGFuZWxfbW9kZShj b25zdCBzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSAqZml4ZWRfbW9kZSwKIAkJICAgICAgIHN0cnVj dCBkcm1fZGlzcGxheV9tb2RlICphZGp1c3RlZF9tb2RlKQpAQCAtNTM2LDYgKzU0MCwxNSBAQCBz dGF0aWMgdTMyIHZsdl9nZXRfYmFja2xpZ2h0KHN0cnVjdCBpbnRlbF9jb25uZWN0b3IgKmNvbm5l Y3RvcikKIAlyZXR1cm4gX3Zsdl9nZXRfYmFja2xpZ2h0KGRldiwgcGlwZSk7CiB9CiAKK3N0YXRp YyB1MzIgdmx2X2dldF9taXBpX2JhY2tsaWdodChzdHJ1Y3QgaW50ZWxfY29ubmVjdG9yICpjb25u ZWN0b3IpCit7CisJc3RydWN0IGludGVsX3BhbmVsICpwYW5lbCA9ICZjb25uZWN0b3ItPnBhbmVs OworCWludCBkdXR5X25zOworCisJZHV0eV9ucyA9IHB3bV9nZXRfZHV0eV9jeWNsZShwYW5lbC0+ YmFja2xpZ2h0LnB3bSk7CisJcmV0dXJuIERJVl9ST1VORF9VUChkdXR5X25zICogMTAwLCBDUkNf UE1JQ19QV01fUEVSSU9EX05TKTsKK30KKwogc3RhdGljIHUzMiBpbnRlbF9wYW5lbF9nZXRfYmFj a2xpZ2h0KHN0cnVjdCBpbnRlbF9jb25uZWN0b3IgKmNvbm5lY3RvcikKIHsKIAlzdHJ1Y3QgZHJt X2RldmljZSAqZGV2ID0gY29ubmVjdG9yLT5iYXNlLmRldjsKQEAgLTYxNiw2ICs2MjksMTQgQEAg c3RhdGljIHZvaWQgdmx2X3NldF9iYWNrbGlnaHQoc3RydWN0IGludGVsX2Nvbm5lY3RvciAqY29u bmVjdG9yLCB1MzIgbGV2ZWwpCiAJSTkxNV9XUklURShWTFZfQkxDX1BXTV9DVEwocGlwZSksIHRt cCB8IGxldmVsKTsKIH0KIAorc3RhdGljIHZvaWQgdmx2X3NldF9taXBpX2JhY2tsaWdodChzdHJ1 Y3QgaW50ZWxfY29ubmVjdG9yICpjb25uZWN0b3IsIHUzMiBsZXZlbCkKK3sKKwlzdHJ1Y3QgaW50 ZWxfcGFuZWwgKnBhbmVsID0gJmNvbm5lY3Rvci0+cGFuZWw7CisJaW50IGR1dHlfbnMgPSBESVZf Uk9VTkRfVVAobGV2ZWwgKiBDUkNfUE1JQ19QV01fUEVSSU9EX05TLCAxMDApOworCisJcHdtX2Nv bmZpZyhwYW5lbC0+YmFja2xpZ2h0LnB3bSwgZHV0eV9ucywgQ1JDX1BNSUNfUFdNX1BFUklPRF9O Uyk7Cit9CisKIHN0YXRpYyB2b2lkCiBpbnRlbF9wYW5lbF9hY3R1YWxseV9zZXRfYmFja2xpZ2h0 KHN0cnVjdCBpbnRlbF9jb25uZWN0b3IgKmNvbm5lY3RvciwgdTMyIGxldmVsKQogewpAQCAtNzQx LDYgKzc2MiwxNiBAQCBzdGF0aWMgdm9pZCB2bHZfZGlzYWJsZV9iYWNrbGlnaHQoc3RydWN0IGlu dGVsX2Nvbm5lY3RvciAqY29ubmVjdG9yKQogCUk5MTVfV1JJVEUoVkxWX0JMQ19QV01fQ1RMMihw aXBlKSwgdG1wICYgfkJMTV9QV01fRU5BQkxFKTsKIH0KIAorc3RhdGljIHZvaWQgdmx2X2Rpc2Fi bGVfbWlwaV9iYWNrbGlnaHQoc3RydWN0IGludGVsX2Nvbm5lY3RvciAqY29ubmVjdG9yKQorewor CXN0cnVjdCBpbnRlbF9wYW5lbCAqcGFuZWwgPSAmY29ubmVjdG9yLT5wYW5lbDsKKworCS8qIERp c2FibGUgdGhlIGJhY2tsaWdodCAqLworCXB3bV9jb25maWcocGFuZWwtPmJhY2tsaWdodC5wd20s IDAsIENSQ19QTUlDX1BXTV9QRVJJT0RfTlMpOworCXVzbGVlcF9yYW5nZSgyMDAwLCAzMDAwKTsK Kwlwd21fZGlzYWJsZShwYW5lbC0+YmFja2xpZ2h0LnB3bSk7Cit9CisKIHZvaWQgaW50ZWxfcGFu ZWxfZGlzYWJsZV9iYWNrbGlnaHQoc3RydWN0IGludGVsX2Nvbm5lY3RvciAqY29ubmVjdG9yKQog ewogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBjb25uZWN0b3ItPmJhc2UuZGV2OwpAQCAtOTQ3 LDYgKzk3OCwxNiBAQCBzdGF0aWMgdm9pZCB2bHZfZW5hYmxlX2JhY2tsaWdodChzdHJ1Y3QgaW50 ZWxfY29ubmVjdG9yICpjb25uZWN0b3IpCiAJSTkxNV9XUklURShWTFZfQkxDX1BXTV9DVEwyKHBp cGUpLCBjdGwyIHwgQkxNX1BXTV9FTkFCTEUpOwogfQogCitzdGF0aWMgdm9pZCB2bHZfZW5hYmxl X21pcGlfYmFja2xpZ2h0KHN0cnVjdCBpbnRlbF9jb25uZWN0b3IgKmNvbm5lY3RvcikKK3sKKwlz dHJ1Y3QgaW50ZWxfcGFuZWwgKnBhbmVsID0gJmNvbm5lY3Rvci0+cGFuZWw7CisJaW50IGR1dHlf bnMgPSBESVZfUk9VTkRfVVAoCisJCQlwYW5lbC0+YmFja2xpZ2h0LmxldmVsICogQ1JDX1BNSUNf UFdNX1BFUklPRF9OUywgMTAwKTsKKworCXB3bV9lbmFibGUocGFuZWwtPmJhY2tsaWdodC5wd20p OworCXB3bV9jb25maWcocGFuZWwtPmJhY2tsaWdodC5wd20sIGR1dHlfbnMsIENSQ19QTUlDX1BX TV9QRVJJT0RfTlMpOworfQorCiB2b2lkIGludGVsX3BhbmVsX2VuYWJsZV9iYWNrbGlnaHQoc3Ry dWN0IGludGVsX2Nvbm5lY3RvciAqY29ubmVjdG9yKQogewogCXN0cnVjdCBkcm1fZGV2aWNlICpk ZXYgPSBjb25uZWN0b3ItPmJhc2UuZGV2OwpAQCAtMTI5OSw2ICsxMzQwLDM0IEBAIHN0YXRpYyBp bnQgdmx2X3NldHVwX2JhY2tsaWdodChzdHJ1Y3QgaW50ZWxfY29ubmVjdG9yICpjb25uZWN0b3Is IGVudW0gcGlwZSBwaXBlCiAJcmV0dXJuIDA7CiB9CiAKK3N0YXRpYyBpbnQgdmx2X3NldHVwX21p cGlfYmFja2xpZ2h0KHN0cnVjdCBpbnRlbF9jb25uZWN0b3IgKmNvbm5lY3RvciwgZW51bSBwaXBl IHBpcGUpCit7CisJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNvbm5lY3Rvci0+YmFzZS5kZXY7 CisJc3RydWN0IGludGVsX3BhbmVsICpwYW5lbCA9ICZjb25uZWN0b3ItPnBhbmVsOworCisJLyog R2V0IHRoZSBQV00gY2hpcCBmb3IgYmFja2xpZ2h0IGNvbnRyb2wgKi8KKwlwYW5lbC0+YmFja2xp Z2h0LnB3bSA9IHB3bV9nZXQoZGV2LT5kZXYsICJwd21fYmFja2xpZ2h0Iik7CisJaWYgKElTX0VS UihwYW5lbC0+YmFja2xpZ2h0LnB3bSkpIHsKKwkJRFJNX0VSUk9SKCJGYWlsZCB0byBvd24gdGhl IHB3bSBjaGlwXG4iKTsKKwkJcGFuZWwtPmJhY2tsaWdodC5wd20gPSBOVUxMOworCX0gZWxzZSBp ZiAocHdtX2NvbmZpZyhwYW5lbC0+YmFja2xpZ2h0LnB3bSwgQ1JDX1BNSUNfUFdNX1BFUklPRF9O UywKKwkJCQkJCUNSQ19QTUlDX1BXTV9QRVJJT0RfTlMpIDwgMCkgeworCQlEUk1fRVJST1IoIkZh aWxlZCB0byBjb25maWd1cmUgdGhlIHB3bSBjaGlwXG4iKTsKKwkJcHdtX3B1dChwYW5lbC0+YmFj a2xpZ2h0LnB3bSk7CisJCXBhbmVsLT5iYWNrbGlnaHQucHdtID0gTlVMTDsKKwkJcmV0dXJuIC0x OworCX0KKworCXBhbmVsLT5iYWNrbGlnaHQubWluID0gMDsgLyogMCUgKi8KKwlwYW5lbC0+YmFj a2xpZ2h0Lm1heCA9IDEwMDsgLyogMTAwJSAqLworCXBhbmVsLT5iYWNrbGlnaHQubGV2ZWwgPSBE SVZfUk9VTkRfVVAoCisJCQkJIHB3bV9nZXRfZHV0eV9jeWNsZShwYW5lbC0+YmFja2xpZ2h0LnB3 bSkgKiAxMDAsCisJCQkJIENSQ19QTUlDX1BXTV9QRVJJT0RfTlMpOworCXBhbmVsLT5iYWNrbGln aHQuZW5hYmxlZCA9IHBhbmVsLT5iYWNrbGlnaHQubGV2ZWwgPyB0cnVlIDogZmFsc2U7CisKKwly ZXR1cm4gMDsKK30KKwogaW50IGludGVsX3BhbmVsX3NldHVwX2JhY2tsaWdodChzdHJ1Y3QgZHJt X2Nvbm5lY3RvciAqY29ubmVjdG9yLCBlbnVtIHBpcGUgcGlwZSkKIHsKIAlzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2ID0gY29ubmVjdG9yLT5kZXY7CkBAIC0xMzYzLDExICsxNDMyLDE5IEBAIHZvaWQg aW50ZWxfcGFuZWxfaW5pdF9iYWNrbGlnaHRfZnVuY3Moc3RydWN0IGRybV9kZXZpY2UgKmRldikK IAkJZGV2X3ByaXYtPmRpc3BsYXkuc2V0X2JhY2tsaWdodCA9IHBjaF9zZXRfYmFja2xpZ2h0Owog CQlkZXZfcHJpdi0+ZGlzcGxheS5nZXRfYmFja2xpZ2h0ID0gcGNoX2dldF9iYWNrbGlnaHQ7CiAJ fSBlbHNlIGlmIChJU19WQUxMRVlWSUVXKGRldikpIHsKLQkJZGV2X3ByaXYtPmRpc3BsYXkuc2V0 dXBfYmFja2xpZ2h0ID0gdmx2X3NldHVwX2JhY2tsaWdodDsKLQkJZGV2X3ByaXYtPmRpc3BsYXku ZW5hYmxlX2JhY2tsaWdodCA9IHZsdl9lbmFibGVfYmFja2xpZ2h0OwotCQlkZXZfcHJpdi0+ZGlz cGxheS5kaXNhYmxlX2JhY2tsaWdodCA9IHZsdl9kaXNhYmxlX2JhY2tsaWdodDsKLQkJZGV2X3By aXYtPmRpc3BsYXkuc2V0X2JhY2tsaWdodCA9IHZsdl9zZXRfYmFja2xpZ2h0OwotCQlkZXZfcHJp di0+ZGlzcGxheS5nZXRfYmFja2xpZ2h0ID0gdmx2X2dldF9iYWNrbGlnaHQ7CisJCWlmIChkZXZf cHJpdi0+dmJ0Lmhhc19taXBpKSB7CisJCQlkZXZfcHJpdi0+ZGlzcGxheS5zZXR1cF9iYWNrbGln aHQgPSB2bHZfc2V0dXBfbWlwaV9iYWNrbGlnaHQ7CisJCQlkZXZfcHJpdi0+ZGlzcGxheS5lbmFi bGVfYmFja2xpZ2h0ID0gdmx2X2VuYWJsZV9taXBpX2JhY2tsaWdodDsKKwkJCWRldl9wcml2LT5k aXNwbGF5LmRpc2FibGVfYmFja2xpZ2h0ID0gdmx2X2Rpc2FibGVfbWlwaV9iYWNrbGlnaHQ7CisJ CQlkZXZfcHJpdi0+ZGlzcGxheS5zZXRfYmFja2xpZ2h0ID0gdmx2X3NldF9taXBpX2JhY2tsaWdo dDsKKwkJCWRldl9wcml2LT5kaXNwbGF5LmdldF9iYWNrbGlnaHQgPSB2bHZfZ2V0X21pcGlfYmFj a2xpZ2h0OworCQl9IGVsc2UgeworCQkJZGV2X3ByaXYtPmRpc3BsYXkuc2V0dXBfYmFja2xpZ2h0 ID0gdmx2X3NldHVwX2JhY2tsaWdodDsKKwkJCWRldl9wcml2LT5kaXNwbGF5LmVuYWJsZV9iYWNr bGlnaHQgPSB2bHZfZW5hYmxlX2JhY2tsaWdodDsKKwkJCWRldl9wcml2LT5kaXNwbGF5LmRpc2Fi bGVfYmFja2xpZ2h0ID0gdmx2X2Rpc2FibGVfYmFja2xpZ2h0OworCQkJZGV2X3ByaXYtPmRpc3Bs YXkuc2V0X2JhY2tsaWdodCA9IHZsdl9zZXRfYmFja2xpZ2h0OworCQkJZGV2X3ByaXYtPmRpc3Bs YXkuZ2V0X2JhY2tsaWdodCA9IHZsdl9nZXRfYmFja2xpZ2h0OworCQl9CiAJfSBlbHNlIGlmIChJ U19HRU40KGRldikpIHsKIAkJZGV2X3ByaXYtPmRpc3BsYXkuc2V0dXBfYmFja2xpZ2h0ID0gaTk2 NV9zZXR1cF9iYWNrbGlnaHQ7CiAJCWRldl9wcml2LT5kaXNwbGF5LmVuYWJsZV9iYWNrbGlnaHQg PSBpOTY1X2VuYWJsZV9iYWNrbGlnaHQ7CkBAIC0xNDA0LDYgKzE0ODEsMTEgQEAgdm9pZCBpbnRl bF9wYW5lbF9maW5pKHN0cnVjdCBpbnRlbF9wYW5lbCAqcGFuZWwpCiAJaWYgKHBhbmVsLT5kb3du Y2xvY2tfbW9kZSkKIAkJZHJtX21vZGVfZGVzdHJveShpbnRlbF9jb25uZWN0b3ItPmJhc2UuZGV2 LAogCQkJCXBhbmVsLT5kb3duY2xvY2tfbW9kZSk7CisKKwkvKiBkaXNwb3NlIG9mIHRoZSBwd20g Ki8KKwlpZiAocGFuZWwtPmJhY2tsaWdodC5wd20pCisJCXB3bV9wdXQocGFuZWwtPmJhY2tsaWdo dC5wd20pOworCiB9CiAKIHZvaWQgaW50ZWxfYmFja2xpZ2h0X3JlZ2lzdGVyKHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYpCi0tIAoyLjEuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJl ZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m by9pbnRlbC1nZngK