drm/nouveau: fix fillrect color on nv50
Subsystems (3)
PATCH 1/1 drm/nouveau: fix fillrect color on nv50
struct fb_fillrect->color is not a color, but index into pseudo_palette array
Signed-off-by Marcin Slusarz <[email protected]>
--- drivers/gpu/drm/nouveau/nv50_fbcon.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
drivers/gpu/drm/nouveau/nv50_fbcon.c +2 -1
@@ -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);
Signature · 1 line
1.6.6.rc3
Ben Skeggs
AppliedQuoted 2 lines · Marcin Slusarz
struct
fb_fillrect->coloris not a color, but index intopseudo_palettearray
Thanks, applied to git.
Ben.
Quoted 26 lines
Signed-off-by Marcin Slusarz <[email protected]>--- drivers/gpu/drm/nouveau/nv50_fbcon.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)drivers/gpu/drm/nouveau/nv50_fbcon.c +2
-1@@ -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);