[PATCH] nvidiafb: Fix bug in nvidiafb_pan_display

From: Antonino A. Daplas (adaplas_at_gmail.com)
Date: 11/12/05

  • Next message: Sam Ravnborg: "Re: [2.6 patch] add -Werror-implicit-function-declaration to CFLAGS" 
    Date:	Sat, 12 Nov 2005 07:28:31 +0800
To: Andrew Morton <akpm@osdl.org>

    nvidiafb_pan_display() is incorrectly using the fields in
    info->var instead of var passed to the function.

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

    ---
Andrew Morton wrote:
> Michal Piotrowski <michal.k.k.piotrowski@gmail.com> wrote:
>> Hi,
>>
>> On 11/11/05, Andrew Morton <akpm@osdl.org> wrote:
>>> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.14/2.6.14-mm2/
>>>
>> Something is broken with nvidia framebuffer. When I try to login on
>> tty1 "Password: " doesn't appear. It appear when I switch Alt+F2 to
>> tty2 and then back to tty1.
>>
> 
> Yup, thanks.  Yesterday Ben reported:
> 
>> not 100% sure what's up, but current -git has funny breakage with
>> nvidiafb on an iMac G5 I have here. The mode seems correct but the
>> console uses one line too much of text.
>>
>> That is, the total height of the screen isn't a multiple of the height
>> of a line of text. It seems that fbcon is rounding up instead of down,
>> thus the "last" line is basically going offscreen (about 2 or 3 pixels
>> visible, the rest is offscreen).
>>
> 
Looks like a bug in nvidiafb_pan_display() which was revealed when I
changed the semantics of update_var/update_start.
Try this patch.
Tony
 nvidia.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/video/nvidia/nvidia.c b/drivers/video/nvidia/nvidia.c
index 0b40a2a..bee09c6 100644
--- a/drivers/video/nvidia/nvidia.c
+++ b/drivers/video/nvidia/nvidia.c
@@ -1301,7 +1301,7 @@ static int nvidiafb_pan_display(struct f
 	struct nvidia_par *par = info->par;
 	u32 total;
 
-	total = info->var.yoffset * info->fix.line_length + info->var.xoffset;
+	total = var->yoffset * info->fix.line_length + var->xoffset;
 
 	NVSetStartAddress(par, total);
 
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/
  • Next message: Sam Ravnborg: "Re: [2.6 patch] add -Werror-implicit-function-declaration to CFLAGS"

    Relevant Pages

    • Re: 2.6.14-mm2
      ... Michal Piotrowski wrote: ... > Something is broken with nvidia framebuffer. ... When I try to login on ... send the line "unsubscribe linux-kernel" in ...
      (Linux-Kernel)
    • Re: Timer allocates too many ports
      ... | Linus' kernel I need to have this changed. ... (Andrew Morton). ... but that's up to Andrew and/or Linus. ... send the line "unsubscribe linux-kernel" in ...
      (Linux-Kernel)
    • Re: [Patch] invalidate range of pages after direct IO write
      ... > Andrew Morton wrote: ... >> I'd be inclined to hold off on the macro until we actually get the ... > function pointer from the caller will turn people's stomachs. ... send the line "unsubscribe linux-kernel" in ...
      (Linux-Kernel)
    • [git patches] 2.6.x libata updates
      ... Alan Cox: ... Andrew Morton: ... Jeff Garzik: ... send the line "unsubscribe linux-kernel" in ...
      (Linux-Kernel)
    • Re: System state too high for too long...
      ... On Tuesday 07 June 2005 23:13, Andrew Morton wrote: ... Switched to vanilla-sources 2.6.12-rc6 just to rule out ... > (with hdparm) ... send the line "unsubscribe linux-kernel" in ...
      (Linux-Kernel)