lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Wed, 30 Mar 2016 22:04:08 +0200 From: Boris Brezillon <boris.brezillon@...e-electrons.com> To: Thierry Reding <thierry.reding@...il.com>, linux-pwm@...r.kernel.org Cc: Mike Turquette <mturquette@...libre.com>, Stephen Boyd <sboyd@...eaurora.org>, linux-clk@...r.kernel.org, Mark Brown <broonie@...nel.org>, Liam Girdwood <lgirdwood@...il.com>, Kamil Debski <k.debski@...sung.com>, lm-sensors@...sensors.org, Jean Delvare <jdelvare@...e.com>, Guenter Roeck <linux@...ck-us.net>, Dmitry Torokhov <dmitry.torokhov@...il.com>, linux-input@...r.kernel.org, Bryan Wu <cooloney@...il.com>, Richard Purdie <rpurdie@...ys.net>, Jacek Anaszewski <j.anaszewski@...sung.com>, linux-leds@...r.kernel.org, Maxime Ripard <maxime.ripard@...e-electrons.com>, Chen-Yu Tsai <wens@...e.org>, linux-sunxi@...glegroups.com, Joachim Eastwood <manabian@...il.com>, Thomas Petazzoni <thomas.petazzoni@...e-electrons.com>, Heiko Stuebner <heiko@...ech.de>, linux-rockchip@...ts.infradead.org, Jingoo Han <jingoohan1@...il.com>, Lee Jones <lee.jones@...aro.org>, linux-fbdev@...r.kernel.org, Jean-Christophe Plagniol-Villard <plagnioj@...osoft.com>, Tomi Valkeinen <tomi.valkeinen@...com>, Robert Jarzmik <robert.jarzmik@...e.fr>, Alexandre Belloni <alexandre.belloni@...e-electrons.com>, Kukjin Kim <kgene@...nel.org>, Krzysztof Kozlowski <k.kozlowski@...sung.com>, linux-samsung-soc@...r.kernel.org, intel-gfx@...ts.freedesktop.org, Daniel Vetter <daniel.vetter@...el.com>, Jani Nikula <jani.nikula@...ux.intel.com>, Jonathan Corbet <corbet@....net>, linux-doc@...r.kernel.org, David Airlie <airlied@...ux.ie>, Daniel Vetter <daniel@...ll.ch>, dri-devel@...ts.freedesktop.org, linux-arm-kernel@...ts.infradead.org, linux-kernel@...r.kernel.org, Hartley Sweeten <hsweeten@...ionengravers.com>, Ryan Mallon <rmallon@...il.com>, Alexander Shiyan <shc_work@...l.ru>, Milo Kim <milo.kim@...com>, Boris Brezillon <boris.brezillon@...e-electrons.com> Subject: [PATCH v5 45/46] drm: i915: switch to the atomic PWM API pwm_config/enable/disable() have been deprecated and should be replaced by pwm_apply_state(). Signed-off-by: Boris Brezillon <boris.brezillon@...e-electrons.com> --- 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; -- 2.5.0
Powered by blists - more mailing lists