* [PATCH] drm/nouveau: fix fillrect color on nv50
@ 2009-12-21 22:00 Marcin Slusarz
[not found] ` <20091221220041.GA2656-OI9uyE9O0yo@public.gmane.org>
0 siblings, 1 reply; 2+ messages in thread
From: Marcin Slusarz @ 2009-12-21 22:00 UTC (permalink / raw)
To: nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
struct fb_fillrect->color is not a color, but index into pseudo_palette array
Signed-off-by: Marcin Slusarz <marcin.slusarz-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
---
drivers/gpu/drm/nouveau/nv50_fbcon.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/drivers/gpu/drm/nouveau/nv50_fbcon.c b/drivers/gpu/drm/nouveau/nv50_fbcon.c
index 6bcc6d3..c966ef8 100644
--- 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);
--
1.6.6.rc3
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] drm/nouveau: fix fillrect color on nv50
[not found] ` <20091221220041.GA2656-OI9uyE9O0yo@public.gmane.org>
@ 2009-12-21 22:49 ` Ben Skeggs
0 siblings, 0 replies; 2+ messages in thread
From: Ben Skeggs @ 2009-12-21 22:49 UTC (permalink / raw)
To: Marcin Slusarz; +Cc: nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
On Mon, 2009-12-21 at 23:00 +0100, Marcin Slusarz wrote:
> struct fb_fillrect->color is not a color, but index into pseudo_palette array
>
Thanks, applied to git.
Ben.
> Signed-off-by: Marcin Slusarz <marcin.slusarz-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> ---
> drivers/gpu/drm/nouveau/nv50_fbcon.c | 3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/gpu/drm/nouveau/nv50_fbcon.c b/drivers/gpu/drm/nouveau/nv50_fbcon.c
> index 6bcc6d3..c966ef8 100644
> --- 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);
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-12-21 22:49 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-12-21 22:00 [PATCH] drm/nouveau: fix fillrect color on nv50 Marcin Slusarz
[not found] ` <20091221220041.GA2656-OI9uyE9O0yo@public.gmane.org>
2009-12-21 22:49 ` Ben Skeggs
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.