projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
75c722d
)
drm/nv50: fix fillrect color
author
Marcin Slusarz
<marcin.slusarz@gmail.com>
Mon, 21 Dec 2009 22:00:41 +0000
(23:00 +0100)
committer
Ben Skeggs
<bskeggs@redhat.com>
Sun, 10 Jan 2010 23:06:33 +0000
(09:06 +1000)
struct fb_fillrect->color is not a color, but index into pseudo_palette
array
Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/nv50_fbcon.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/nouveau/nv50_fbcon.c
b/drivers/gpu/drm/nouveau/nv50_fbcon.c
index 6bcc6d39e9b0bac9560b2e424c73f884bcb4b5c7..c966ef834853527f3e03c37e35b460c2a19828cc 100644
(file)
--- a/
drivers/gpu/drm/nouveau/nv50_fbcon.c
+++ b/
drivers/gpu/drm/nouveau/nv50_fbcon.c
@@
-10,6
+10,7
@@
nv50_fbcon_fillrect(struct fb_info *info, const struct fb_fillrect *rect)
struct drm_device *dev = par->dev;
struct drm_nouveau_private *dev_priv = dev->dev_private;
struct nouveau_channel *chan = dev_priv->channel;
+ uint32_t color = ((uint32_t *) info->pseudo_palette)[rect->color];
if (info->state != FBINFO_STATE_RUNNING)
return;
@@
-31,7
+32,7
@@
nv50_fbcon_fillrect(struct fb_info *info, const struct fb_fillrect *rect)
OUT_RING(chan, 1);
}
BEGIN_RING(chan, NvSub2D, 0x0588, 1);
- OUT_RING(chan,
rect->
color);
+ OUT_RING(chan, color);
BEGIN_RING(chan, NvSub2D, 0x0600, 4);
OUT_RING(chan, rect->dx);
OUT_RING(chan, rect->dy);