From cfd12f86e295389eb052d4d72051fafdcaa7aa2f Mon Sep 17 00:00:00 2001 From: Giovanni Ricca Date: Wed, 11 Dec 2024 11:41:32 +0100 Subject: [PATCH] Revert "disp: msm: dp: disable pluggable eDP display backlight config" This reverts commit bd47e3e63b26936876524406bf4172f051f2c949. Change-Id: I45fc13b3195d8d2b87a00e632e78c79a33c2c31c --- techpack/display/msm/dp/dp_display.c | 12 ++++-------- techpack/display/msm/dp/dp_display.h | 1 - techpack/display/msm/dp/dp_parser.c | 2 -- techpack/display/msm/dp/dp_parser.h | 2 -- techpack/display/msm/dp/dp_power.c | 8 +------- 5 files changed, 5 insertions(+), 20 deletions(-) diff --git a/techpack/display/msm/dp/dp_display.c b/techpack/display/msm/dp/dp_display.c index 875998fcb1dc..6586e55d8b04 100644 --- a/techpack/display/msm/dp/dp_display.c +++ b/techpack/display/msm/dp/dp_display.c @@ -2128,7 +2128,6 @@ static int dp_init_sub_modules(struct dp_display_private *dp) dp->dp_display.is_mst_supported = dp->parser->has_mst; dp->dp_display.dsc_cont_pps = dp->parser->dsc_continuous_pps; - dp->dp_display.no_backlight_support = dp->parser->no_backlight_support; dp->catalog = dp_catalog_get(dev, dp->parser); if (IS_ERR(dp->catalog)) { rc = PTR_ERR(dp->catalog); @@ -2633,7 +2632,7 @@ static int dp_display_enable(struct dp_display *dp_display, void *panel) goto end; /*edp backlight enable and edp pwm enable*/ - if ((dp_display->is_edp) && (!dp_display->no_backlight_support)) { + if (dp_display->is_edp) { rc = dp->power->edp_panel_set_gpio(dp->power, DP_GPIO_EDP_BACKLIGHT_PWR, true); if (rc) { DP_ERR("Cannot turn edp backlight power on"); @@ -2733,7 +2732,7 @@ static int dp_display_post_enable(struct dp_display *dp_display, void *panel) dp_display_stream_post_enable(dp, dp_panel); - if ((dp_display->is_edp) && (!dp_display->no_backlight_support)) { + if (dp_display->is_edp) { rc = dp->power->edp_panel_set_gpio(dp->power, DP_GPIO_EDP_BACKLIGHT_EN, true); if (rc) { DP_ERR("Cannot turn edp backlight power on"); @@ -2803,7 +2802,7 @@ static int dp_display_pre_disable(struct dp_display *dp_display, void *panel) goto end; } - if ((dp_display->is_edp) && (!dp_display->no_backlight_support)) { + if (dp_display->is_edp) { rc = dp->power->edp_panel_set_gpio(dp->power, DP_GPIO_EDP_BACKLIGHT_EN, false); if (rc) { DP_ERR("Cannot turn edp backlight power off"); @@ -2886,7 +2885,7 @@ static int dp_display_disable(struct dp_display *dp_display, void *panel) goto end; } - if ((dp_display->is_edp) && (!dp_display->no_backlight_support)) { + if (dp_display->is_edp) { rc = dp->power->edp_panel_set_gpio(dp->power, DP_GPIO_EDP_BACKLIGHT_PWR, false); if (rc) DP_ERR("Cannot turn edp backlight power off\n"); @@ -3425,9 +3424,6 @@ static int dp_display_set_backlight(struct dp_display *dp_display, return -EINVAL; } - if(dp_display->no_backlight_support) - return 0; - dp = container_of(dp_display, struct dp_display_private, dp_display); dp_panel = panel; diff --git a/techpack/display/msm/dp/dp_display.h b/techpack/display/msm/dp/dp_display.h index 63fdce47d6df..7e75e2f5a7df 100644 --- a/techpack/display/msm/dp/dp_display.h +++ b/techpack/display/msm/dp/dp_display.h @@ -97,7 +97,6 @@ struct dp_display { u32 max_mixer_count; u32 max_dsc_count; bool cont_splash_enabled; - bool no_backlight_support; int (*enable)(struct dp_display *dp_display, void *panel); int (*post_enable)(struct dp_display *dp_display, void *panel); diff --git a/techpack/display/msm/dp/dp_parser.c b/techpack/display/msm/dp/dp_parser.c index d1907079aacc..7b91f8443339 100644 --- a/techpack/display/msm/dp/dp_parser.c +++ b/techpack/display/msm/dp/dp_parser.c @@ -300,8 +300,6 @@ static void dp_parser_bl_config(struct dp_parser *parser) } else { parser->pwm_period_usecs = val; } - parser->no_backlight_support = of_property_read_bool(of_node, - "qcom,no-backlight-support"); } static int dp_parser_gpio(struct dp_parser *parser) diff --git a/techpack/display/msm/dp/dp_parser.h b/techpack/display/msm/dp/dp_parser.h index 29f098d39953..d697470fc811 100644 --- a/techpack/display/msm/dp/dp_parser.h +++ b/techpack/display/msm/dp/dp_parser.h @@ -232,7 +232,6 @@ static inline char *dp_phy_aux_config_type_to_string(u32 cfg_type) * @has_mst_sideband: MST sideband feature enable status * @no_aux_switch: presence AUX switch status * @gpio_aux_switch: presence GPIO AUX switch status - * @no_backlight_support: For some display type that no support backlight * @dsc_feature_enable: DSC feature enable status * @fec_feature_enable: FEC feature enable status * @dsc_continuous_pps: PPS sent every frame by HW @@ -274,7 +273,6 @@ struct dp_parser { bool gpio_aux_switch; bool lphw_hpd; bool panel_notifier_support; - bool no_backlight_support; u32 bl_min_level; u32 bl_max_level; u32 brightness_max_level; diff --git a/techpack/display/msm/dp/dp_power.c b/techpack/display/msm/dp/dp_power.c index c373de28ae69..254f32c36b53 100644 --- a/techpack/display/msm/dp/dp_power.c +++ b/techpack/display/msm/dp/dp_power.c @@ -746,13 +746,7 @@ static int dp_power_edp_panel_set_gpio(struct dp_power *dp_power, return -EINVAL; if ((pin_state >= DP_GPIO_EDP_MIN) && (pin_state < DP_GPIO_EDP_MAX)) { - if (gpio_is_valid(config[pin_state].gpio)) { - rc = gpio_direction_output(config[pin_state].gpio, enable); - if (rc) - DP_ERR("unable to set gpio rc=%d\n", rc); - } else { - DP_ERR("gpio invalid for %d pin\n", pin_state); - } + gpio_direction_output(config[pin_state].gpio, enable); } else { pr_err(" Invalid GPIO call\n"); return -EINVAL;