diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2013-11-11 04:59:40 +0100 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2013-11-14 05:56:56 +0100 |
| commit | b9d9dcdaae4a9284ba3484c528f44a9db18faabf (patch) | |
| tree | 43127a01e6ff791ea6b659ae9193751d708222e6 /drivers/gpu/drm/nouveau/nv04_fbcon.c | |
| parent | drm/nvc0-: remove nasty fifo swmthd hack for flip completion method (diff) | |
| download | linux-b9d9dcdaae4a9284ba3484c528f44a9db18faabf.tar.xz linux-b9d9dcdaae4a9284ba3484c528f44a9db18faabf.zip | |
drm/nv11-: synchronise flips to vblank, unless async flip requested
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nv04_fbcon.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nv04_fbcon.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nv04_fbcon.c b/drivers/gpu/drm/nouveau/nv04_fbcon.c index 77dcc9c50777..8fe32bbed99a 100644 --- a/drivers/gpu/drm/nouveau/nv04_fbcon.c +++ b/drivers/gpu/drm/nouveau/nv04_fbcon.c @@ -255,6 +255,12 @@ nv04_fbcon_accel_init(struct fb_info *info) OUT_RING(chan, NvCtxSurf2D); BEGIN_NV04(chan, NvSubImageBlit, 0x02fc, 1); OUT_RING(chan, 3); + if (device->chipset >= 0x11 /*XXX: oclass == 0x009f*/) { + BEGIN_NV04(chan, NvSubImageBlit, 0x0120, 3); + OUT_RING(chan, 0); + OUT_RING(chan, 1); + OUT_RING(chan, 2); + } BEGIN_NV04(chan, NvSubGdiRect, 0x0000, 1); OUT_RING(chan, NvGdiRect); |