From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Hans de Goede <hdegoede@redhat.com>
Cc: linux-pwm@vger.kernel.org,
intel-gfx <intel-gfx@lists.freedesktop.org>,
"Rafael J . Wysocki" <rjw@rjwysocki.net>,
linux-acpi@vger.kernel.org,
"Thierry Reding" <thierry.reding@gmail.com>,
dri-devel@lists.freedesktop.org,
"Rodrigo Vivi" <rodrigo.vivi@intel.com>,
"Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>,
"Mika Westerberg" <mika.westerberg@linux.intel.com>,
"Len Brown" <lenb@kernel.org>
Subject: Re: [PATCH v5 11/16] pwm: crc: Implement apply() method to support the new atomic PWM API
Date: Wed, 29 Jul 2020 13:51:29 +0300 [thread overview]
Message-ID: <20200729105129.GS3703480@smile.fi.intel.com> (raw)
In-Reply-To: <20200717133753.127282-12-hdegoede@redhat.com>
On Fri, Jul 17, 2020 at 03:37:48PM +0200, Hans de Goede wrote:
> Replace the enable, disable and config pwm_ops with an apply op,
> to support the new atomic PWM API.
I didn't notice any visible issue, so
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Perhaps you may consider reusing existing _enable() / _disable(), but I don't
see if there will be nice improvement (maybe if in on of the previous patches
you also add an error handling to them first).
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
> ---
> Changes in v3:
> - Keep crc_pwm_calc_clk_div() helper to avoid needless churn
> ---
> drivers/pwm/pwm-crc.c | 89 ++++++++++++++++++++++++++-----------------
> 1 file changed, 53 insertions(+), 36 deletions(-)
>
> diff --git a/drivers/pwm/pwm-crc.c b/drivers/pwm/pwm-crc.c
> index b72008c9b072..8a7f4707279c 100644
> --- a/drivers/pwm/pwm-crc.c
> +++ b/drivers/pwm/pwm-crc.c
> @@ -51,59 +51,76 @@ static int crc_pwm_calc_clk_div(int period_ns)
> return clk_div;
> }
>
> -static int crc_pwm_enable(struct pwm_chip *c, struct pwm_device *pwm)
> +static int crc_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,
> + const struct pwm_state *state)
> {
> - struct crystalcove_pwm *crc_pwm = to_crc_pwm(c);
> - int div = crc_pwm_calc_clk_div(pwm_get_period(pwm));
> -
> - regmap_write(crc_pwm->regmap, PWM0_CLK_DIV, div | PWM_OUTPUT_ENABLE);
> - regmap_write(crc_pwm->regmap, BACKLIGHT_EN, 1);
> -
> - return 0;
> -}
> -
> -static void crc_pwm_disable(struct pwm_chip *c, struct pwm_device *pwm)
> -{
> - struct crystalcove_pwm *crc_pwm = to_crc_pwm(c);
> - int div = crc_pwm_calc_clk_div(pwm_get_period(pwm));
> -
> - regmap_write(crc_pwm->regmap, BACKLIGHT_EN, 0);
> - regmap_write(crc_pwm->regmap, PWM0_CLK_DIV, div);
> -}
> -
> -static int crc_pwm_config(struct pwm_chip *c, struct pwm_device *pwm,
> - int duty_ns, int period_ns)
> -{
> - struct crystalcove_pwm *crc_pwm = to_crc_pwm(c);
> + struct crystalcove_pwm *crc_pwm = to_crc_pwm(chip);
> struct device *dev = crc_pwm->chip.dev;
> - int level;
> + int err;
>
> - if (period_ns > PWM_MAX_PERIOD_NS) {
> + if (state->period > PWM_MAX_PERIOD_NS) {
> dev_err(dev, "un-supported period_ns\n");
> return -EINVAL;
> }
>
> - if (pwm_get_period(pwm) != period_ns) {
> - int clk_div = crc_pwm_calc_clk_div(period_ns);
> + if (state->polarity != PWM_POLARITY_NORMAL)
> + return -EOPNOTSUPP;
> +
> + if (pwm_is_enabled(pwm) && !state->enabled) {
> + err = regmap_write(crc_pwm->regmap, BACKLIGHT_EN, 0);
> + if (err) {
> + dev_err(dev, "Error writing BACKLIGHT_EN %d\n", err);
> + return err;
> + }
> + }
> +
> + if (pwm_get_duty_cycle(pwm) != state->duty_cycle ||
> + pwm_get_period(pwm) != state->period) {
> + int level = state->duty_cycle * PWM_MAX_LEVEL / state->period;
>
> + err = regmap_write(crc_pwm->regmap, PWM0_DUTY_CYCLE, level);
> + if (err) {
> + dev_err(dev, "Error writing PWM0_DUTY_CYCLE %d\n", err);
> + return err;
> + }
> + }
> +
> + if (pwm_is_enabled(pwm) && state->enabled &&
> + pwm_get_period(pwm) != state->period) {
> /* changing the clk divisor, clear PWM_OUTPUT_ENABLE first */
> - regmap_write(crc_pwm->regmap, PWM0_CLK_DIV, 0);
> + err = regmap_write(crc_pwm->regmap, PWM0_CLK_DIV, 0);
> + if (err) {
> + dev_err(dev, "Error writing PWM0_CLK_DIV %d\n", err);
> + return err;
> + }
> + }
>
> - regmap_write(crc_pwm->regmap, PWM0_CLK_DIV,
> - clk_div | PWM_OUTPUT_ENABLE);
> + if (pwm_get_period(pwm) != state->period ||
> + pwm_is_enabled(pwm) != state->enabled) {
> + int clk_div = crc_pwm_calc_clk_div(state->period);
> + int pwm_output_enable = state->enabled ? PWM_OUTPUT_ENABLE : 0;
> +
> + err = regmap_write(crc_pwm->regmap, PWM0_CLK_DIV,
> + clk_div | pwm_output_enable);
> + if (err) {
> + dev_err(dev, "Error writing PWM0_CLK_DIV %d\n", err);
> + return err;
> + }
> }
>
> - /* change the pwm duty cycle */
> - level = duty_ns * PWM_MAX_LEVEL / period_ns;
> - regmap_write(crc_pwm->regmap, PWM0_DUTY_CYCLE, level);
> + if (!pwm_is_enabled(pwm) && state->enabled) {
> + err = regmap_write(crc_pwm->regmap, BACKLIGHT_EN, 1);
> + if (err) {
> + dev_err(dev, "Error writing BACKLIGHT_EN %d\n", err);
> + return err;
> + }
> + }
>
> return 0;
> }
>
> static const struct pwm_ops crc_pwm_ops = {
> - .config = crc_pwm_config,
> - .enable = crc_pwm_enable,
> - .disable = crc_pwm_disable,
> + .apply = crc_pwm_apply,
> };
>
> static int crystalcove_pwm_probe(struct platform_device *pdev)
> --
> 2.26.2
>
--
With Best Regards,
Andy Shevchenko
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2020-07-30 7:17 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-17 13:37 [PATCH v5 00/16] acpi/pwm/i915: Convert pwm-crc and i915 driver's PWM code to use the atomic PWM API Hans de Goede
2020-07-17 13:37 ` [PATCH v5 01/16] ACPI / LPSS: Resume Cherry Trail PWM controller in no-irq phase Hans de Goede
2020-07-17 13:37 ` [PATCH v5 02/16] ACPI / LPSS: Save Cherry Trail PWM ctx registers only once (at activation) Hans de Goede
2020-07-17 13:37 ` [PATCH v5 03/16] pwm: lpss: Fix off by one error in base_unit math in pwm_lpss_prepare() Hans de Goede
2020-07-17 13:37 ` [PATCH v5 04/16] pwm: lpss: Add range limit check for the base_unit register value Hans de Goede
2020-07-17 13:37 ` [PATCH v5 05/16] pwm: lpss: Add pwm_lpss_prepare_enable() helper Hans de Goede
2020-07-28 18:45 ` Andy Shevchenko
2020-07-28 19:49 ` Hans de Goede
2020-07-17 13:37 ` [PATCH v5 06/16] pwm: lpss: Use pwm_lpss_apply() when restoring state on resume Hans de Goede
2020-07-28 18:57 ` Andy Shevchenko
2020-07-28 19:55 ` Hans de Goede
2020-07-29 8:12 ` Andy Shevchenko
2020-08-02 20:51 ` Hans de Goede
2020-08-03 8:41 ` Andy Shevchenko
2020-07-17 13:37 ` [PATCH v5 07/16] pwm: crc: Fix period / duty_cycle times being off by a factor of 256 Hans de Goede
2020-07-28 19:36 ` Andy Shevchenko
2020-07-28 20:00 ` Hans de Goede
2020-07-29 8:13 ` Andy Shevchenko
2020-07-17 13:37 ` [PATCH v5 08/16] pwm: crc: Fix off-by-one error in the clock-divider calculations Hans de Goede
2020-07-29 10:28 ` Andy Shevchenko
2020-07-17 13:37 ` [PATCH v5 09/16] pwm: crc: Fix period changes not having any effect Hans de Goede
2020-07-29 10:30 ` Andy Shevchenko
2020-07-17 13:37 ` [PATCH v5 10/16] pwm: crc: Enable/disable PWM output on enable/disable Hans de Goede
2020-07-29 10:32 ` Andy Shevchenko
2020-07-17 13:37 ` [PATCH v5 11/16] pwm: crc: Implement apply() method to support the new atomic PWM API Hans de Goede
2020-07-29 10:51 ` Andy Shevchenko [this message]
2020-07-17 13:37 ` [PATCH v5 12/16] pwm: crc: Implement get_state() method Hans de Goede
2020-07-17 13:37 ` [PATCH v5 13/16] drm/i915: panel: Add get_vbt_pwm_freq() helper Hans de Goede
2020-07-17 13:37 ` [PATCH v5 14/16] drm/i915: panel: Honor the VBT PWM frequency for devs with an external PWM controller Hans de Goede
2020-07-17 13:44 ` [PATCH v5 15/16] drm/i915: panel: Honor the VBT PWM min setting " Hans de Goede
2020-07-17 13:44 ` [PATCH v5 16/16] drm/i915: panel: Use atomic PWM API " Hans de Goede
2020-07-27 7:41 ` [PATCH v5 00/16] acpi/pwm/i915: Convert pwm-crc and i915 driver's PWM code to use the atomic PWM API Thierry Reding
2020-07-29 8:23 ` Andy Shevchenko
2020-07-29 9:32 ` Hans de Goede
2020-07-30 9:26 ` Thierry Reding
2020-08-01 14:33 ` Hans de Goede
2020-07-29 10:54 ` Andy Shevchenko
2020-08-01 14:38 ` Hans de Goede
2020-08-02 11:25 ` Andy Shevchenko
2020-08-02 19:43 ` Hans de Goede
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200729105129.GS3703480@smile.fi.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=hdegoede@redhat.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-pwm@vger.kernel.org \
--cc=mika.westerberg@linux.intel.com \
--cc=rjw@rjwysocki.net \
--cc=rodrigo.vivi@intel.com \
--cc=thierry.reding@gmail.com \
--cc=u.kleine-koenig@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).