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

Commit 0b94190e authored by Florian Tobias Schandinat's avatar Florian Tobias Schandinat Committed by Linus Torvalds
Browse files

viafb: fix LCD hardware cursor regression 



Although I'd consider this a hardware bug, as there is hardware out that
for whatever reason does not support hardware cursors on LCD output we
have to care about it in the driver.  This fixes a regression (invisible
cursor) introduced by:

    viafb: cleanup viafb_cursor

Signed-off-by: default avatarFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Reported-by: default avatarJulian Wollrath <jwollrath@web.de>
Tested-by: default avatarJulian Wollrath <jwollrath@web.de>
Cc: Scott Fang <ScottFang@viatech.com.cn>
Cc: Joseph Chan <JosephChan@via.com.tw>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 7e105057

drivers/video/via/viafbdev.c

+3 −1
Original line number Diff line number Diff line
@@ -872,7 +872,9 @@ static int viafb_cursor(struct fb_info *info, struct fb_cursor *cursor) 
	if (info->flags & FBINFO_HWACCEL_DISABLED || info != viafbinfo)

		return -ENODEV;



	if (chip_name == UNICHROME_CLE266 && viapar->iga_path == IGA2)

	/* LCD ouput does not support hw cursors (at least on VN896) */

	if ((chip_name == UNICHROME_CLE266 && viapar->iga_path == IGA2) ||

		viafb_LCD_ON)

		return -ENODEV;



	viafb_show_hw_cursor(info, HW_Cursor_OFF);