diff options
| author |   Heiko Stuebner <heiko@sntech.de> | 2018-09-23 14:37:30 +0200 |
|---|---|---|
| committer | Heiko Stuebner <heiko@sntech.de> | 2018-09-27 11:39:32 +0200 |
| commit | 4f297df89d29b531fa834ff4958456ecd82ee753 (patch) | |
| tree | f3e7b0e2a673d9ccf53259c318e191df9f40bea7 /drivers/gpu/drm/rockchip/rockchip_vop_reg.c | |
| parent | drm/atmel-hlcdc: Replace drm_dev_unref with drm_dev_put (diff) | |
| download | linux-dev-4f297df89d29b531fa834ff4958456ecd82ee753.tar.xz linux-dev-4f297df89d29b531fa834ff4958456ecd82ee753.zip | |
drm/rockchip: vop: add rk3188 hs_start interrupt as dsp_hold equivalent
The hs_start interrupt on rk3188 fires at the start of a new frame, so
serves essentially the same purpose as the dsp_hold_valid irq in checking
when the last frame got delivered when going to standby. So define it
to fix a hang on atomic_disable of the vop because the completion never
really completed before.
Fixes: 428e15cc41e3 ("drm/rockchip: vop: add rk3188 vop definitions")
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Reviewed-by: Sandy Huang <hjc@rock-chips.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180923123730.14706-1-heiko@sntech.de
Diffstat (limited to 'drivers/gpu/drm/rockchip/rockchip_vop_reg.c')
| -rw-r--r-- | drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c index a6db3cd5544b..047a8867af90 100644 --- a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c +++ b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c @@ -361,7 +361,11 @@ static const struct vop_win_data rk3188_vop_win_data[] = { }; static const int rk3188_vop_intrs[] = { - 0, + /* + * hs_start interrupt fires at frame-start, so serves + * the same purpose as dsp_hold in the driver. + */ + DSP_HOLD_VALID_INTR, FS_INTR, LINE_FLAG_INTR, BUS_ERROR_INTR, |