[Nouveau] [PATCH] nouveau: nv50: fix ->pseudo_palette usage

[Maarten Maathuis]

This is the patch
http://cgit.freedesktop.org/nouveau/linux-2.6/commit/?id=aac125bb84c73a7637de5e85a6cc23ab81357552

Maybe a rebased patch went upstream (no idea if this happened already)?

Maarten.

On Sat, Jan 9, 2010 at 5:05 PM, Alexey Dobriyan <adobriyan at gmail.com> wrote:
> On Mon, Jan 04, 2010 at 08:17:36AM +1000, Ben Skeggs wrote:
>> On Sun, 2010-01-03 at 11:17 +0200, Alexey Dobriyan wrote:
>> > Sometimes struct fb_fillrect::color is color, sometimes palette index.
>> This doesn't apply on current git, which already has a similar (though,
>> not quite the same) patch applied.  We may yet need some additional
>> fixes from your patch, I'll look at testing that soon.
>
> Ehh?
> They're the same except I haven't changed nv04, because of no hardware.
>
>> > --- 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;
>> >
>> >     if (info->state != FBINFO_STATE_RUNNING)
>> >             return;
>> > @@ -31,7 +32,12 @@ 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);
>> > +   if (info->fix.visual == FB_VISUAL_TRUECOLOR ||
>> > +       info->fix.visual == FB_VISUAL_DIRECTCOLOR) {
>> > +           color = ((uint32_t *)info->pseudo_palette)[rect->color];
>> > +   } else
>> > +           color = rect->color;
>> > +   OUT_RING(chan, color);
>> >     BEGIN_RING(chan, NvSub2D, 0x0600, 4);
> _______________________________________________
> Nouveau mailing list
> Nouveau at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/nouveau
>