From 7ef1470703f056a5c0f19e5453cbd2f2b1b1d564 Mon Sep 17 00:00:00 2001 From: Florian Tobias Schandinat Date: Fri, 15 Jan 2010 17:01:03 -0800 Subject: [PATCH] --- yaml --- r: 179337 b: refs/heads/master c: 0b94190e1e60f96962b82d35729d7d44cf298ef8 h: refs/heads/master i: 179335: 3c4e05f5eecdfbe36797e8c03e34af6eb186d291 v: v3 --- [refs] | 2 +- trunk/drivers/video/via/viafbdev.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index dffedf11f01d..c82d7fec8e5a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7e105057a34c83cea542dacc55ff0528bce67afa +refs/heads/master: 0b94190e1e60f96962b82d35729d7d44cf298ef8 diff --git a/trunk/drivers/video/via/viafbdev.c b/trunk/drivers/video/via/viafbdev.c index d8df17a7d5fc..a0004c17af6c 100644 --- a/trunk/drivers/video/via/viafbdev.c +++ b/trunk/drivers/video/via/viafbdev.c @@ -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);