Commit b7eea2d7 authored by Ilia Mirkin's avatar Ilia Mirkin Committed by Ben Skeggs

drm/nouveau/fbcon/g80: reduce PUSH_SPACE alloc, fire ring on accel init

Only 58 words get written to the ring, not 59. Also, normalize the accel
init wrt nvc0 and nv04 fbcon impls by firing the ring at accel init time
rather than waiting until "later".
Signed-off-by: default avatarIlia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 4fd26cb1
...@@ -188,7 +188,7 @@ nv50_fbcon_accel_init(struct fb_info *info) ...@@ -188,7 +188,7 @@ nv50_fbcon_accel_init(struct fb_info *info)
if (ret) if (ret)
return ret; return ret;
ret = RING_SPACE(chan, 59); ret = RING_SPACE(chan, 58);
if (ret) { if (ret) {
nouveau_fbcon_gpu_lockup(info); nouveau_fbcon_gpu_lockup(info);
return ret; return ret;
...@@ -252,6 +252,7 @@ nv50_fbcon_accel_init(struct fb_info *info) ...@@ -252,6 +252,7 @@ nv50_fbcon_accel_init(struct fb_info *info)
OUT_RING(chan, info->var.yres_virtual); OUT_RING(chan, info->var.yres_virtual);
OUT_RING(chan, upper_32_bits(fb->vma.offset)); OUT_RING(chan, upper_32_bits(fb->vma.offset));
OUT_RING(chan, lower_32_bits(fb->vma.offset)); OUT_RING(chan, lower_32_bits(fb->vma.offset));
FIRE_RING(chan);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment