[Nouveau] [PATCH] drm/nouveau: fix fillrect color on nv50

[Ben Skeggs]

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 at gmail.com>
> ---
>  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);