diff options
| author |   Eric Anholt <eric@anholt.net> | 2017-10-31 12:32:57 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2018-04-30 13:57:13 -0700 |
| commit | 1825067e2b49c984d4b1a77f3720a7ae2576d226 (patch) | |
| tree | 069bb98c31282403b009f4e286d2897ab64ebc32 | |
| parent | drm/vc4: make function vc4_allocate_bin_bo static (diff) | |
| download | wireguard-linux-1825067e2b49c984d4b1a77f3720a7ae2576d226.tar.xz wireguard-linux-1825067e2b49c984d4b1a77f3720a7ae2576d226.zip | |
drm/vc4: Skip ULPS latching when we're in that ULPS state already.
It seems that trying to go from unlatched to unlatched will time out
waiting for STOP, and we can just skip that.
Signed-off-by: Eric Anholt <eric@anholt.net>
Link: https://patchwork.freedesktop.org/patch/msgid/20171031193258.17373-1-eric@anholt.net
Reviewed-by: Boris Brezillon <boris.brezillon@bootlin.com>
| -rw-r--r-- | drivers/gpu/drm/vc4/vc4_dsi.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpu/drm/vc4/vc4_dsi.c b/drivers/gpu/drm/vc4/vc4_dsi.c index 94085f8bcd68..8aa897835118 100644 --- a/drivers/gpu/drm/vc4/vc4_dsi.c +++ b/drivers/gpu/drm/vc4/vc4_dsi.c @@ -753,6 +753,11 @@ static void vc4_dsi_ulps(struct vc4_dsi *dsi, bool ulps) (dsi->lanes > 2 ? DSI1_STAT_PHY_D2_STOP : 0) | (dsi->lanes > 3 ? DSI1_STAT_PHY_D3_STOP : 0)); int ret; + bool ulps_currently_enabled = (DSI_PORT_READ(PHY_AFEC0) & + DSI_PORT_BIT(PHY_AFEC0_LATCH_ULPS)); + + if (ulps == ulps_currently_enabled) + return; DSI_PORT_WRITE(STAT, stat_ulps); DSI_PORT_WRITE(PHYC, DSI_PORT_READ(PHYC) | phyc_ulps); |