On Thu, Jul 14, 2016 at 12:15:58PM +0800, 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 <y...@rock-chips.com>
Reviewed-by: Sean Paul <seanp...@chromium.org> > --- > Changes in v4: > - Return 'void' instead of 'int' in analogix_dp_psr_set(). (Sean) > - Pull the 10ms delay time out into a #define. (Sean) > - Improved the code of analogix_dp_psr_work(). (Sean) > - Indented with spaces for new numbers in rockchip_dp_device struct. > (Stéphane, reviewed at Google gerrit) > > [https://chromium-review.googlesource.com/#/c/349085/33/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c@83] > > 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 | 57 > +++++++++++++++++++++++++ > 1 file changed, 57 insertions(+) > > diff --git a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c > b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c > index e81e19a..aa916f4 100644 > --- a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c > +++ b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c > @@ -32,6 +32,7 @@ > #include <drm/bridge/analogix_dp.h> > > #include "rockchip_drm_drv.h" > +#include "rockchip_drm_psr.h" > #include "rockchip_drm_vop.h" > > #define RK3288_GRF_SOC_CON6 0x25c > @@ -41,6 +42,9 @@ > > #define HIWORD_UPDATE(val, mask) (val | (mask) << 16) > > +#define PSR_SET_DELAY_TIME msecs_to_jiffies(10) > +#define PSR_WAIT_LINE_FLAG_TIMEOUT_MS 100 > + > #define to_dp(nm) container_of(nm, struct rockchip_dp_device, nm) > > /** > @@ -68,11 +72,55 @@ 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 void analogix_dp_psr_set(struct drm_encoder *encoder, bool enabled) > +{ > + 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, PSR_SET_DELAY_TIME); > +} > + > +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, > + PSR_WAIT_LINE_FLAG_TIMEOUT_MS); > + if (ret) { > + dev_err(dp->dev, "line flag interrupt did not arrive\n"); > + return; > + } > + > + if (psr_state == EDP_VSC_PSR_STATE_ACTIVE) > + analogix_dp_enable_psr(dp->dev); > + else > + analogix_dp_disable_psr(dp->dev); > +} > + > static int rockchip_dp_pre_init(struct rockchip_dp_device *dp) > { > reset_control_assert(dp->rst); > @@ -340,12 +388,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 > > > _______________________________________________ > dri-devel mailing list > dri-de...@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
