Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1221b3ad authored by Jammy Huang's avatar Jammy Huang Committed by Greg Kroah-Hartman
Browse files

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: d2b4387f ("media: platform: Add Aspeed Video Engine driver")
Signed-off-by: default avatarJammy Huang <jammy_huang@aspeedtech.com>
Acked-by: default avatarPaul Menzel <pmenzel@molgen.mpg.de>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 15df887c

drivers/media/platform/aspeed-video.c

+3 −3
Original line number Diff line number Diff line
@@ -533,6 +533,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);
@@ -1315,7 +1317,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);
@@ -1328,8 +1329,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,