git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspe...
[safe/jmp/linux-2.6]
/
drivers
/
gpu
/
drm
/
nouveau
/
nv04_fbcon.c
diff --git
a/drivers/gpu/drm/nouveau/nv04_fbcon.c
b/drivers/gpu/drm/nouveau/nv04_fbcon.c
index
fd01caa
..
813b25c
100644
(file)
--- a/
drivers/gpu/drm/nouveau/nv04_fbcon.c
+++ b/
drivers/gpu/drm/nouveau/nv04_fbcon.c
@@
-118,8
+118,8
@@
nv04_fbcon_imageblit(struct fb_info *info, const struct fb_image *image)
return;
}
return;
}
- width =
(image->width + 31) & ~31
;
- dsize =
(width * image->height
) >> 5;
+ width =
ALIGN(image->width, 8)
;
+ dsize =
ALIGN(width * image->height, 32
) >> 5;
if (info->fix.visual == FB_VISUAL_TRUECOLOR ||
info->fix.visual == FB_VISUAL_DIRECTCOLOR) {
if (info->fix.visual == FB_VISUAL_TRUECOLOR ||
info->fix.visual == FB_VISUAL_DIRECTCOLOR) {
@@
-136,8
+136,8
@@
nv04_fbcon_imageblit(struct fb_info *info, const struct fb_image *image)
((image->dx + image->width) & 0xffff));
OUT_RING(chan, bg);
OUT_RING(chan, fg);
((image->dx + image->width) & 0xffff));
OUT_RING(chan, bg);
OUT_RING(chan, fg);
- OUT_RING(chan, (image->height << 16) | image->width);
OUT_RING(chan, (image->height << 16) | width);
OUT_RING(chan, (image->height << 16) | width);
+ OUT_RING(chan, (image->height << 16) | image->width);
OUT_RING(chan, (image->dy << 16) | (image->dx & 0xffff));
while (dsize) {
OUT_RING(chan, (image->dy << 16) | (image->dx & 0xffff));
while (dsize) {