[aggressively trimmed the recipient list, can't seem to be able to send
this otherwise]
On Wed, 30 Mar 2016, Boris Brezillon <boris.brezillon@xxxxxxxxxxxxxxxxxx> wrote:
> pwm_config/enable/disable() have been deprecated and should be replaced
> by pwm_apply_state().
>
> Signed-off-by: Boris Brezillon <boris.brezillon@xxxxxxxxxxxxxxxxxx>
Reviewed-by: Jani Nikula <jani.nikula@xxxxxxxxx>
Cc: Shobhit, any additional comments?
> ---
> drivers/gpu/drm/i915/intel_panel.c | 39 +++++++++++++++++++++++++-------------
> 1 file changed, 26 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
> index 21ee647..b86bd20 100644
> --- a/drivers/gpu/drm/i915/intel_panel.c
> +++ b/drivers/gpu/drm/i915/intel_panel.c
> @@ -538,10 +538,10 @@ static u32 bxt_get_backlight(struct intel_connector *connector)
> static u32 pwm_get_backlight(struct intel_connector *connector)
> {
> struct intel_panel *panel = &connector->panel;
> - int duty_ns;
> + struct pwm_state pstate;
>
> - duty_ns = pwm_get_duty_cycle(panel->backlight.pwm);
> - return DIV_ROUND_UP(duty_ns * 100, CRC_PMIC_PWM_PERIOD_NS);
> + pwm_get_state(panel->backlight.pwm, &pstate);
> + return DIV_ROUND_UP(pstate.duty_cycle * 100, CRC_PMIC_PWM_PERIOD_NS);
> }
>
> static u32 intel_panel_get_backlight(struct intel_connector *connector)
> @@ -630,9 +630,12 @@ static void bxt_set_backlight(struct intel_connector *connector, u32 level)
> static void pwm_set_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);
> + struct pwm_state pstate;
>
> - pwm_config(panel->backlight.pwm, duty_ns, CRC_PMIC_PWM_PERIOD_NS);
> + pwm_get_state(panel->backlight.pwm, &pstate);
> + pstate.duty_cycle = DIV_ROUND_UP(level * CRC_PMIC_PWM_PERIOD_NS, 100);
> + pstate.period = CRC_PMIC_PWM_PERIOD_NS;
> + pwm_apply_state(panel->backlight.pwm, &pstate);
> }
>
> static void
> @@ -801,11 +804,15 @@ static void bxt_disable_backlight(struct intel_connector *connector)
> static void pwm_disable_backlight(struct intel_connector *connector)
> {
> struct intel_panel *panel = &connector->panel;
> + struct pwm_state pstate;
>
> /* Disable the backlight */
> - pwm_config(panel->backlight.pwm, 0, CRC_PMIC_PWM_PERIOD_NS);
> + pwm_get_state(panel->backlight.pwm, &pstate);
> + pstate.duty_cycle = 0;
> + pwm_apply_state(panel->backlight.pwm, &pstate);
> usleep_range(2000, 3000);
> - pwm_disable(panel->backlight.pwm);
> + pstate.enabled = false;
> + pwm_apply_state(panel->backlight.pwm, &pstate);
> }
>
> void intel_panel_disable_backlight(struct intel_connector *connector)
> @@ -1068,8 +1075,11 @@ static void bxt_enable_backlight(struct intel_connector *connector)
> static void pwm_enable_backlight(struct intel_connector *connector)
> {
> struct intel_panel *panel = &connector->panel;
> + struct pwm_state pstate;
>
> - pwm_enable(panel->backlight.pwm);
> + pwm_get_state(panel->backlight.pwm, &pstate);
> + pstate.enabled = true;
> + pwm_apply_state(panel->backlight.pwm, &pstate);
> intel_panel_actually_set_backlight(connector, panel->backlight.level);
> }
>
> @@ -1630,6 +1640,7 @@ static int pwm_setup_backlight(struct intel_connector *connector,
> {
> struct drm_device *dev = connector->base.dev;
> struct intel_panel *panel = &connector->panel;
> + struct pwm_state pstate;
> int retval;
>
> /* Get the PWM chip for backlight control */
> @@ -1640,8 +1651,10 @@ static int pwm_setup_backlight(struct intel_connector *connector,
> return -ENODEV;
> }
>
> - retval = pwm_config(panel->backlight.pwm, CRC_PMIC_PWM_PERIOD_NS,
> - CRC_PMIC_PWM_PERIOD_NS);
> + pwm_get_state(panel->backlight.pwm, &pstate);
> + pstate.period = CRC_PMIC_PWM_PERIOD_NS;
> + pstate.duty_cycle = CRC_PMIC_PWM_PERIOD_NS;
> + retval = pwm_apply_state(panel->backlight.pwm, &pstate);
> if (retval < 0) {
> DRM_ERROR("Failed to configure the pwm chip\n");
> pwm_put(panel->backlight.pwm);
> @@ -1651,9 +1664,9 @@ static int pwm_setup_backlight(struct intel_connector *connector,
>
> 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);
> + pwm_get_state(panel->backlight.pwm, &pstate);
> + panel->backlight.level = DIV_ROUND_UP(pstate.duty_cycle * 100,
> + pstate.period);
> panel->backlight.enabled = panel->backlight.level != 0;
>
> return 0;
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
