media: aspeed: Update signal status immediately to ensure sane hw state

[ Upstream commit af6d1bde395cac174ee71adcd3fa43f6435c7206 ]

If res-chg, VE_INTERRUPT_MODE_DETECT_WD irq will be raised. But
v4l2_input_status won't be updated to no-signal immediately until
aspeed_video_get_resolution() in aspeed_video_resolution_work().

During the period of time, aspeed_video_start_frame() could be called
because it doesn't know signal becomes unstable now. If it goes with
aspeed_video_init_regs() of aspeed_video_irq_res_change()
simultaneously, it will mess up hw state.

To fix this problem, v4l2_input_status is updated to no-signal
immediately for VE_INTERRUPT_MODE_DETECT_WD irq.

Fixes: d2b4387f3bdf ("media: platform: Add Aspeed Video Engine driver")
Signed-off-by: Jammy Huang <jammy_huang@aspeedtech.com>
Acked-by: Paul Menzel <pmenzel@molgen.mpg.de>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c
index 23c41c5..debc750 100644 (file)
--- a/drivers/media/platform/aspeed-video.c
+++ b/drivers/media/platform/aspeed-video.c
@@ -556,6 +556,8 @@ static void aspeed_video_irq_res_change(struct aspeed_video *video, ulong delay)
        set_bit(VIDEO_RES_CHANGE, &video->flags);
        clear_bit(VIDEO_FRAME_INPRG, &video->flags);
 
+       video->v4l2_input_status = V4L2_IN_ST_NO_SIGNAL;
+
        aspeed_video_off(video);
        aspeed_video_bufs_done(video, VB2_BUF_STATE_ERROR);
 
@@ -1337,7 +1339,6 @@ static void aspeed_video_resolution_work(struct work_struct *work)
        struct delayed_work *dwork = to_delayed_work(work);
        struct aspeed_video *video = container_of(dwork, struct aspeed_video,
                                                  res_work);
-       u32 input_status = video->v4l2_input_status;
 
        aspeed_video_on(video);
 
@@ -1350,8 +1351,7 @@ static void aspeed_video_resolution_work(struct work_struct *work)
        aspeed_video_get_resolution(video);
 
        if (video->detected_timings.width != video->active_timings.width ||
-           video->detected_timings.height != video->active_timings.height ||
-           input_status != video->v4l2_input_status) {
+           video->detected_timings.height != video->active_timings.height) {
                static const struct v4l2_event ev = {
                        .type = V4L2_EVENT_SOURCE_CHANGE,
                        .u.src_change.changes = V4L2_EVENT_SRC_CH_RESOLUTION,