diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2012-04-30 11:34:10 -0500 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2012-05-24 16:55:43 +1000 |
| commit | 35bcf5d55540e47091a67e5962f12b88d51d7131 (patch) | |
| tree | 162d17e735b85817c8c6c881093995a2e6eef336 /drivers/gpu/drm/nouveau/nv50_display.c | |
| parent | 20abd1634a6e2eedb84ca977adea56b8aa06cc3e (diff) | |
| download | linux-35bcf5d55540e47091a67e5962f12b88d51d7131.tar.gz linux-35bcf5d55540e47091a67e5962f12b88d51d7131.tar.bz2 linux-35bcf5d55540e47091a67e5962f12b88d51d7131.zip | |
drm/nouveau: move flip-related channel setup to software engine
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nv50_display.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nv50_display.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c index 362a4d7cd566..5c41612723b4 100644 --- a/drivers/gpu/drm/nouveau/nv50_display.c +++ b/drivers/gpu/drm/nouveau/nv50_display.c @@ -32,6 +32,7 @@ #include "nouveau_fb.h" #include "nouveau_fbcon.h" #include "nouveau_ramht.h" +#include "nouveau_software.h" #include "drm_crtc_helper.h" static void nv50_display_isr(struct drm_device *); @@ -491,7 +492,7 @@ nv50_display_flip_next(struct drm_crtc *crtc, struct drm_framebuffer *fb, else OUT_RING (chan, chan->vram_handle); } else { - u64 offset = chan->dispc_vma[nv_crtc->index].offset; + u64 offset = nvc0_software_crtc(chan, nv_crtc->index); offset += dispc->sem.offset; BEGIN_NVC0(chan, 0, 0x0010, 4); OUT_RING (chan, upper_32_bits(offset)); |