diff options
| author | Ilia Mirkin <imirkin@alum.mit.edu> | 2015-06-29 20:49:48 -0400 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2015-07-27 18:56:10 +1000 |
| commit | b7eea2d7e67cd4b65f42c00624277dae780f7009 (patch) | |
| tree | f5bd0ea2fcbea3db0e688b0f0cf4f69c64c0aa6c /drivers/gpu | |
| parent | 4fd26cb1e4049c7a630d86d52864a5722c7453ac (diff) | |
| download | linux-b7eea2d7e67cd4b65f42c00624277dae780f7009.tar.gz linux-b7eea2d7e67cd4b65f42c00624277dae780f7009.tar.bz2 linux-b7eea2d7e67cd4b65f42c00624277dae780f7009.zip | |
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: Ilia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | 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 394c89abcc97..901130b06072 100644 --- a/drivers/gpu/drm/nouveau/nv50_fbcon.c +++ b/drivers/gpu/drm/nouveau/nv50_fbcon.c @@ -188,7 +188,7 @@ nv50_fbcon_accel_init(struct fb_info *info) if (ret) return ret; - ret = RING_SPACE(chan, 59); + ret = RING_SPACE(chan, 58); if (ret) { nouveau_fbcon_gpu_lockup(info); return ret; @@ -252,6 +252,7 @@ nv50_fbcon_accel_init(struct fb_info *info) OUT_RING(chan, info->var.yres_virtual); OUT_RING(chan, upper_32_bits(fb->vma.offset)); OUT_RING(chan, lower_32_bits(fb->vma.offset)); + FIRE_RING(chan); return 0; } |