| Message ID | 20200916171855.129511-3-lyude@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915: Add support for Intel's eDP backlight controls | expand |
On Wed, 16 Sep 2020, Lyude Paul <lyude@redhat.com> wrote: > 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> > Cc: thaytan@noraisin.net > Cc: Vasily Khoruzhick <anarsoul@gmail.com> Reviewed-by: Jani Nikula <jani.nikula@intel.com> > --- > drivers/gpu/drm/i915/display/intel_panel.c | 24 +++++++++++----------- > 1 file changed, 12 insertions(+), 12 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_panel.c b/drivers/gpu/drm/i915/display/intel_panel.c > index 9f23bac0d7924..c0e36244bb07d 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); > @@ -2065,11 +2065,11 @@ intel_panel_init_backlight_funcs(struct intel_panel *panel) > panel->backlight.hz_to_pwm = pch_hz_to_pwm; > } else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) { > if (connector->base.connector_type == DRM_MODE_CONNECTOR_DSI) { > - panel->backlight.setup = pwm_setup_backlight; > - panel->backlight.enable = pwm_enable_backlight; > - panel->backlight.disable = pwm_disable_backlight; > - panel->backlight.set = pwm_set_backlight; > - panel->backlight.get = pwm_get_backlight; > + panel->backlight.setup = ext_pwm_setup_backlight; > + panel->backlight.enable = ext_pwm_enable_backlight; > + panel->backlight.disable = ext_pwm_disable_backlight; > + panel->backlight.set = ext_pwm_set_backlight; > + panel->backlight.get = ext_pwm_get_backlight; > } else { > panel->backlight.setup = vlv_setup_backlight; > panel->backlight.enable = vlv_enable_backlight;
diff --git a/drivers/gpu/drm/i915/display/intel_panel.c b/drivers/gpu/drm/i915/display/intel_panel.c index 9f23bac0d7924..c0e36244bb07d 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); @@ -2065,11 +2065,11 @@ intel_panel_init_backlight_funcs(struct intel_panel *panel) panel->backlight.hz_to_pwm = pch_hz_to_pwm; } else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) { if (connector->base.connector_type == DRM_MODE_CONNECTOR_DSI) { - panel->backlight.setup = pwm_setup_backlight; - panel->backlight.enable = pwm_enable_backlight; - panel->backlight.disable = pwm_disable_backlight; - panel->backlight.set = pwm_set_backlight; - panel->backlight.get = pwm_get_backlight; + panel->backlight.setup = ext_pwm_setup_backlight; + panel->backlight.enable = ext_pwm_enable_backlight; + panel->backlight.disable = ext_pwm_disable_backlight; + panel->backlight.set = ext_pwm_set_backlight; + panel->backlight.get = ext_pwm_get_backlight; } else { panel->backlight.setup = vlv_setup_backlight; panel->backlight.enable = vlv_enable_backlight;