diff options
Diffstat (limited to '0003-drm-i915-Rename-pwm_-backlight-callbacks-to-ext_pwm_.patch')
| -rw-r--r-- | 0003-drm-i915-Rename-pwm_-backlight-callbacks-to-ext_pwm_.patch | 108 |
1 files changed, 108 insertions, 0 deletions
diff --git a/0003-drm-i915-Rename-pwm_-backlight-callbacks-to-ext_pwm_.patch b/0003-drm-i915-Rename-pwm_-backlight-callbacks-to-ext_pwm_.patch new file mode 100644 index 000000000000..c942fa33d760 --- /dev/null +++ b/0003-drm-i915-Rename-pwm_-backlight-callbacks-to-ext_pwm_.patch @@ -0,0 +1,108 @@ +From ae824addb9e71613dc03e3d947daf0dda0a0aaf2 Mon Sep 17 00:00:00 2001 +From: Lyude Paul <lyude@redhat.com> +Date: Fri, 4 Dec 2020 17:35:56 -0500 +Subject: [PATCH 03/10] drm/i915: Rename pwm_* backlight callbacks to ext_pwm_* + +Since we're going to need to add a set of lower-level PWM backlight +control hooks to be shared by normal backlight controls and HDR +backlight controls in SDR mode, let's add a prefix to the external PWM +backlight functions so that the difference between them and the high +level PWM-only backlight functions is a bit more obvious. + +This introduces no functional changes. + +Signed-off-by: Lyude Paul <lyude@redhat.com> +Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> +Reviewed-by: Jani Nikula <jani.nikula@intel.com> +Cc: thaytan@noraisin.net +Cc: Vasily Khoruzhick <anarsoul@gmail.com> +Signed-off-by: Jani Nikula <jani.nikula@intel.com> +Link: https://patchwork.freedesktop.org/patch/msgid/20201204223603.249878-3-lyude@redhat.com +--- + drivers/gpu/drm/i915/display/intel_panel.c | 28 +++++++++++----------- + 1 file changed, 14 insertions(+), 14 deletions(-) + +diff --git a/drivers/gpu/drm/i915/display/intel_panel.c b/drivers/gpu/drm/i915/display/intel_panel.c +index 36b7693453ae..da8f7c12ae22 100644 +--- a/drivers/gpu/drm/i915/display/intel_panel.c ++++ b/drivers/gpu/drm/i915/display/intel_panel.c +@@ -589,7 +589,7 @@ static u32 bxt_get_backlight(struct intel_connector *connector) + BXT_BLC_PWM_DUTY(panel->backlight.controller)); + } + +-static u32 pwm_get_backlight(struct intel_connector *connector) ++static u32 ext_pwm_get_backlight(struct intel_connector *connector) + { + struct intel_panel *panel = &connector->panel; + struct pwm_state state; +@@ -666,7 +666,7 @@ static void bxt_set_backlight(const struct drm_connector_state *conn_state, u32 + BXT_BLC_PWM_DUTY(panel->backlight.controller), level); + } + +-static void pwm_set_backlight(const struct drm_connector_state *conn_state, u32 level) ++static void ext_pwm_set_backlight(const struct drm_connector_state *conn_state, u32 level) + { + struct intel_panel *panel = &to_intel_connector(conn_state->connector)->panel; + +@@ -835,7 +835,7 @@ static void cnp_disable_backlight(const struct drm_connector_state *old_conn_sta + tmp & ~BXT_BLC_PWM_ENABLE); + } + +-static void pwm_disable_backlight(const struct drm_connector_state *old_conn_state) ++static void ext_pwm_disable_backlight(const struct drm_connector_state *old_conn_state) + { + struct intel_connector *connector = to_intel_connector(old_conn_state->connector); + struct intel_panel *panel = &connector->panel; +@@ -1168,8 +1168,8 @@ static void cnp_enable_backlight(const struct intel_crtc_state *crtc_state, + pwm_ctl | BXT_BLC_PWM_ENABLE); + } + +-static void pwm_enable_backlight(const struct intel_crtc_state *crtc_state, +- const struct drm_connector_state *conn_state) ++static void ext_pwm_enable_backlight(const struct intel_crtc_state *crtc_state, ++ const struct drm_connector_state *conn_state) + { + struct intel_connector *connector = to_intel_connector(conn_state->connector); + struct intel_panel *panel = &connector->panel; +@@ -1890,8 +1890,8 @@ cnp_setup_backlight(struct intel_connector *connector, enum pipe unused) + return 0; + } + +-static int pwm_setup_backlight(struct intel_connector *connector, +- enum pipe pipe) ++static int ext_pwm_setup_backlight(struct intel_connector *connector, ++ enum pipe pipe) + { + struct drm_device *dev = connector->base.dev; + struct drm_i915_private *dev_priv = to_i915(dev); +@@ -2061,12 +2061,12 @@ static const struct intel_panel_bl_funcs pch_funcs = { + .hz_to_pwm = pch_hz_to_pwm, + }; + +-static const struct intel_panel_bl_funcs pwm_funcs = { +- .setup = pwm_setup_backlight, +- .enable = pwm_enable_backlight, +- .disable = pwm_disable_backlight, +- .set = pwm_set_backlight, +- .get = pwm_get_backlight, ++static const struct intel_panel_bl_funcs ext_pwm_funcs = { ++ .setup = ext_pwm_setup_backlight, ++ .enable = ext_pwm_enable_backlight, ++ .disable = ext_pwm_disable_backlight, ++ .set = ext_pwm_set_backlight, ++ .get = ext_pwm_get_backlight, + }; + + static const struct intel_panel_bl_funcs vlv_funcs = { +@@ -2125,7 +2125,7 @@ intel_panel_init_backlight_funcs(struct intel_panel *panel) + panel->backlight.funcs = &pch_funcs; + } else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) { + if (connector->base.connector_type == DRM_MODE_CONNECTOR_DSI) { +- panel->backlight.funcs = &pwm_funcs; ++ panel->backlight.funcs = &ext_pwm_funcs; + } else { + panel->backlight.funcs = &vlv_funcs; + } +-- +2.29.2 + |