summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nv50_fbcon.c
diff options
context:
space:
mode:
authorMarcin Koƛcielnicki2010-02-27 19:13:35 +0100
committerBen Skeggs2010-03-10 07:06:44 +0100
commitc82b88d578847909797945824851a6a9a84f9c20 (patch)
treedee4a902c6c7e013590410e48a4b54aae213b6e3 /drivers/gpu/drm/nouveau/nv50_fbcon.c
parentdrm/nv50: Remove redundant/incorrect ctxvals initialisation. (diff)
downloadkernel-qcow2-linux-c82b88d578847909797945824851a6a9a84f9c20.tar.gz
kernel-qcow2-linux-c82b88d578847909797945824851a6a9a84f9c20.tar.xz
kernel-qcow2-linux-c82b88d578847909797945824851a6a9a84f9c20.zip
drm/nouveau: Fix fbcon corruption with font width not divisible by 8
NV50 is nice and has a switch that autoaligns stuff for us. Pre-NV50, we need to align input bitmap width manually. Signed-off-by: Marcin Koƛcielnicki <koriakin@0x04.net> Signed-off-by: Francisco Jerez <currojerez@riseup.net> Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nv50_fbcon.c')
-rw-r--r--drivers/gpu/drm/nouveau/nv50_fbcon.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_fbcon.c b/drivers/gpu/drm/nouveau/nv50_fbcon.c
index 993c7126fbde..25a3cd8794f9 100644
--- a/drivers/gpu/drm/nouveau/nv50_fbcon.c
+++ b/drivers/gpu/drm/nouveau/nv50_fbcon.c
@@ -233,7 +233,7 @@ nv50_fbcon_accel_init(struct fb_info *info)
BEGIN_RING(chan, NvSub2D, 0x0808, 3);
OUT_RING(chan, 0);
OUT_RING(chan, 0);
- OUT_RING(chan, 0);
+ OUT_RING(chan, 1);
BEGIN_RING(chan, NvSub2D, 0x081c, 1);
OUT_RING(chan, 1);
BEGIN_RING(chan, NvSub2D, 0x0840, 4);