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

Commit 7a482425 authored by Antonino A. Daplas's avatar Antonino A. Daplas Committed by Linus Torvalds
Browse files

[PATCH] nvidiafb: Fix absence of cursor in nvidiafb 



A recent change in nvidiafb caused nvidiafb_cursor to always return -ENXIO
instead of using the soft_cursor.  This will happen if the parameter "hwcur"
is not set, which happens to be the default.

Signed-off-by: default avatarAntonino Daplas <adaplas@pol.net>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent c90eef84

drivers/video/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -650,6 +650,7 @@ config FB_NVIDIA 
	select FB_CFB_FILLRECT

	select FB_CFB_COPYAREA

	select FB_CFB_IMAGEBLIT

	select FB_SOFT_CURSOR

	help

	  This driver supports graphics boards with the nVidia chips, TNT

	  and newer. For very old chipsets, such as the RIVA128, then use

drivers/video/nvidia/nvidia.c

+4 −1
Original line number Diff line number Diff line
@@ -893,7 +893,7 @@ static int nvidiafb_cursor(struct fb_info *info, struct fb_cursor *cursor) 
	int i, set = cursor->set;

	u16 fg, bg;



	if (!hwcur || cursor->image.width > MAX_CURS || cursor->image.height > MAX_CURS)

	if (cursor->image.width > MAX_CURS || cursor->image.height > MAX_CURS)

		return -ENXIO;



	NVShowHideCursor(par, 0);
@@ -1356,6 +1356,9 @@ static int __devinit nvidia_set_fbinfo(struct fb_info *info) 
	info->pixmap.size = 8 * 1024;

	info->pixmap.flags = FB_PIXMAP_SYSTEM;



	if (!hwcur)

	    info->fbops->fb_cursor = soft_cursor;



	info->var.accel_flags = (!noaccel);



	switch (par->Architecture) {