From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753988AbcGHCci (ORCPT ); Thu, 7 Jul 2016 22:32:38 -0400 Received: from lucky1.263xmail.com ([211.157.147.135]:34469 "EHLO lucky1.263xmail.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753528AbcGHCc2 (ORCPT ); Thu, 7 Jul 2016 22:32:28 -0400 X-263anti-spam: KSV:0; X-MAIL-GRAY: 1 X-MAIL-DELIVERY: 0 X-KSVirus-check: 0 X-ABS-CHECKED: 4 X-ADDR-CHECKED: 0 X-RL-SENDER: ykk@rock-chips.com X-FST-TO: linux-rockchip@lists.infradead.org X-SENDER-IP: 103.29.142.67 X-LOGIN-NAME: ykk@rock-chips.com X-UNIQUE-TAG: X-ATTACHMENT-NUM: 0 X-DNS-TYPE: 0 Subject: Re: [PATCH v3 4/4] drm/rockchip: analogix_dp: implement PSR function To: Sean Paul References: <1467364685-21390-1-git-send-email-ykk@rock-chips.com> <1467364776-21794-1-git-send-email-ykk@rock-chips.com> Cc: Mark Yao , Inki Dae , Jingoo Han , Heiko Stuebner , Daniel Vetter , =?UTF-8?Q?St=c3=a9phane_Marchesin?= , Tomasz Figa , Doug Anderson , Thierry Reding , Krzysztof Kozlowski , Javier Martinez Canillas , David Airlie , Emil Velikov , Linux Kernel Mailing List , dri-devel , linux-samsung-soc , linux-rockchip@lists.infradead.org From: Yakir Yang Message-ID: <577F10A6.6040206@rock-chips.com> Date: Fri, 8 Jul 2016 10:32:06 +0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.8.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Sean, On 07/02/2016 04:05 AM, Sean Paul wrote: > On Fri, Jul 1, 2016 at 5:19 AM, Yakir Yang wrote: >> Alway enable the PSR function for Rockchip analogix_dp driver. If panel >> don't support PSR, then the core analogix_dp would ignore this setting. >> >> Signed-off-by: Yakir Yang >> --- >> Changes in v3: >> - split the common psr logic into a seperate driver, make this to a >> simple sub-psr device driver. >> >> Changes in v2: >> - remove vblank notify out (Daniel) >> - create a psr_active() callback in vop data struct. >> >> drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 52 +++++++++++++++++++++++++ >> 1 file changed, 52 insertions(+) >> >> diff --git a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c >> index e81e19a..80a60a6 100644 >> --- a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c >> +++ b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c >> @@ -32,6 +32,7 @@ >> #include >> >> #include "rockchip_drm_drv.h" >> +#include "rockchip_drm_psr.h" >> #include "rockchip_drm_vop.h" >> >> #define RK3288_GRF_SOC_CON6 0x25c >> @@ -68,11 +69,53 @@ struct rockchip_dp_device { >> struct regmap *grf; >> struct reset_control *rst; >> >> + struct delayed_work psr_work; >> + unsigned int psr_state; >> + >> const struct rockchip_dp_chip_data *data; >> >> struct analogix_dp_plat_data plat_data; >> }; >> >> +static int analogix_dp_psr_set(struct drm_encoder *encoder, bool enabled) > Again, this function doesn't fail, but its return type is int. > Fortunately you don't check the return in rockchip_drm_psr.c, so this > also seems like a good void candidate. Okay, done. >> +{ >> + struct rockchip_dp_device *dp = to_dp(encoder); >> + >> + dev_dbg(dp->dev, "%s PSR...\n", enabled ? "Entry" : "Exit"); >> + >> + if (enabled) >> + dp->psr_state = EDP_VSC_PSR_STATE_ACTIVE; >> + else >> + dp->psr_state = ~EDP_VSC_PSR_STATE_ACTIVE; >> + >> + schedule_delayed_work(&dp->psr_work, msecs_to_jiffies(10)); > Pull 10 out into a #define Done >> + >> + return 0; >> +} >> + >> +static void analogix_dp_psr_work(struct work_struct *work) >> +{ >> + struct rockchip_dp_device *dp = >> + container_of(work, typeof(*dp), psr_work.work); >> + struct drm_crtc *crtc = dp->encoder.crtc; >> + int psr_state = dp->psr_state; >> + int vact_end; >> + int ret; >> + >> + if (!crtc) >> + return; >> + >> + vact_end = crtc->mode.vtotal - crtc->mode.vsync_start + crtc->mode.vdisplay; >> + >> + ret = rockchip_drm_wait_line_flag(dp->encoder.crtc, vact_end, 100); > > Pull 100 out into a #define > Done. >> + if (ret == 0) { > if (ret) { > dev_err(... "line flag interrupt did not arrive"); > return; > } Done. Thanks - Yakir >> + if (psr_state == EDP_VSC_PSR_STATE_ACTIVE) >> + analogix_dp_active_psr(dp->dev); >> + else >> + analogix_dp_inactive_psr(dp->dev); >> + } >> +} >> + >> static int rockchip_dp_pre_init(struct rockchip_dp_device *dp) >> { >> reset_control_assert(dp->rst); >> @@ -340,12 +383,21 @@ static int rockchip_dp_bind(struct device *dev, struct device *master, >> dp->plat_data.power_off = rockchip_dp_powerdown; >> dp->plat_data.get_modes = rockchip_dp_get_modes; >> >> + dp->psr_state = ~EDP_VSC_PSR_STATE_ACTIVE; >> + INIT_DELAYED_WORK(&dp->psr_work, analogix_dp_psr_work); >> + >> + rockchip_drm_psr_register(&dp->encoder, analogix_dp_psr_set); >> + >> return analogix_dp_bind(dev, dp->drm_dev, &dp->plat_data); >> } >> >> static void rockchip_dp_unbind(struct device *dev, struct device *master, >> void *data) >> { >> + struct rockchip_dp_device *dp = dev_get_drvdata(dev); >> + >> + rockchip_drm_psr_unregister(&dp->encoder); >> + >> return analogix_dp_unbind(dev, master, data); >> } >> >> -- >> 1.9.1 >> >> > >