From a10ff1b209a153e49ac4ae182a60db3ffb1d55d9 Mon Sep 17 00:00:00 2001 From: zhangzhaopeng Date: Sat, 18 Jan 2025 11:01:42 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BC=98=E5=8C=96=E5=B9=B6=E5=8F=91?= =?UTF-8?q?=E6=B8=85=E9=99=A4logo=E7=9A=84=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../linux-4.9/drivers/video/fbdev/sunxi/disp2/disp/dev_fb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lichee/linux-4.9/drivers/video/fbdev/sunxi/disp2/disp/dev_fb.c b/lichee/linux-4.9/drivers/video/fbdev/sunxi/disp2/disp/dev_fb.c index df2d4fba7..b7e81cbad 100644 --- a/lichee/linux-4.9/drivers/video/fbdev/sunxi/disp2/disp/dev_fb.c +++ b/lichee/linux-4.9/drivers/video/fbdev/sunxi/disp2/disp/dev_fb.c @@ -2079,17 +2079,17 @@ static int sunxi_fb_ioctl(struct fb_info *info, unsigned int cmd, { #if defined(CONFIG_ION_SUNXI) unsigned long flags; + spin_lock_irqsave(&(logo_timer_info.logo_lock), flags); if(logo_timer_info.init_flag == TIMER_START) { - spin_lock_irqsave(&(logo_timer_info.logo_lock), flags); del_timer(&(logo_timer_info.timer)); flush_pic(H_LOGO_START_POS_X, H_LOGO_START_POS_Y, H_LOGO_WIDTH_PIX, H_LOGO_HEIGH_PIX, (int *)fb_dst, H_logo, 0); flush_pic(A_LOGO_START_POS_X, A_LOGO_START_POS_Y, A_LOGO_WIDTH_PIX, A_LOGO_HEIGH_PIX, (int *)fb_dst, A_logo, 0); flush_pic(S_LOGO_START_POS_X, S_LOGO_START_POS_Y, S_LOGO_WIDTH_PIX, S_LOGO_HEIGH_PIX, (int *)fb_dst, S_logo, 0); disp_ion_flush_cache((void *)pic_info.vaddr, pic_info.size); logo_timer_info.init_flag = TIMER_STOP; - spin_unlock_irqrestore(&(logo_timer_info.logo_lock), flags); } + spin_unlock_irqrestore(&(logo_timer_info.logo_lock), flags); #endif break; }