shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-10 04:48:04 +09:00
Code Issues Packages Projects Releases Wiki Activity

vpp: don't overwrite on_pending state when enable vd layer [1/1]

Browse Source 
PD#OTT-3244

Problem:
When vd layer state is on_pending, calling enable videolayer
function will overwrite the state. Then it will not enable video
layer really.

Solution:
Add the judgement to check if the state is on_pending.

Verify:
verified on W400

Change-Id: I0513a6610fdb108bec05858c7f6c7976be5e7edb
Signed-off-by: Brian Zhu <brian.zhu@amlogic.com>
This commit is contained in:
Brian Zhu
2019-04-17 02:35:27 +08:00
committed by Dongjin Kim
parent 4602afe4f4
commit 634cd20ebf
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/amlogic/media/video_sink/video.c
View File

@@ -322,7 +322,8 @@ static u32 frame_detect_drop_count;
do { \
unsigned long flags; \
spin_lock_irqsave(&video_onoff_lock, flags); \
video_onoff_state = VIDEO_ENABLE_STATE_ON_REQ; \
if (video_onoff_state != VIDEO_ENABLE_STATE_ON_PENDING) \
video_onoff_state = VIDEO_ENABLE_STATE_ON_REQ; \
video_enabled = 1; \
video_status_saved = 1; \
spin_unlock_irqrestore(&video_onoff_lock, flags); \
@@ -342,7 +343,8 @@ static u32 frame_detect_drop_count;
do { \
unsigned long flags; \
spin_lock_irqsave(&video2_onoff_lock, flags); \
video2_onoff_state = VIDEO_ENABLE_STATE_ON_REQ; \
if (video2_onoff_state != VIDEO_ENABLE_STATE_ON_PENDING) \
video2_onoff_state = VIDEO_ENABLE_STATE_ON_REQ; \
video2_enabled = 1; \
video2_status_saved = 1; \
spin_unlock_irqrestore(&video2_onoff_lock, flags); \