Re: no cursor on nvidiafb console in 2.6.14-rc1-mm1

["Antonino A. Daplas" <adaplas@gmail.com>]

Jan Dittmer wrote:
> Antonino A. Daplas wrote:
>> Jan Dittmer wrote:
>>
>>> jurriaan wrote:
>>>
>>>> After updating from 2.6.13-rc4-mm1 to 2.6.14-rc1-mm1 I see no cursor on
>>>> my console.
>>> Me too, 2.6.14-rc1-git4. Didn't try any kernel before with framebuffer,
>>> sorry. No fb options on the kernel command line.
>>>
>>
>> Can you try reversing this particular diff?
>>
>> http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blobdiff_plain;h=af99ea96012ec72ef57fd36655a6d8aaa22e809e;hp=30f80c23f934bb0a76719232f492153fc7cca00a
>>
>> Tony
>>
> 
> --- 30f80c23f934bb0a76719232f492153fc7cca00a
> +++ af99ea96012ec72ef57fd36655a6d8aaa22e809e
> 
> ^^^ Which file??
> 

Heh, didn't realize that. drivers/video/nvidia/nvidia.c, actually.
But just apply this patch instead, as a Kconfig change is also
needed.

Signed-off-by: Antonino Daplas <adaplas@pol.net>

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -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
diff --git a/drivers/video/nvidia/nvidia.c b/drivers/video/nvidia/nvidia.c
--- a/drivers/video/nvidia/nvidia.c
+++ b/drivers/video/nvidia/nvidia.c
@@ -893,7 +893,7 @@ static int nvidiafb_cursor(struct fb_inf
 	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(s
 	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) {