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/nvd0_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/nvd0_display.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvd0_display.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nvd0_display.c b/drivers/gpu/drm/nouveau/nvd0_display.c index 7307d3fe992f..c486d3ce3c2c 100644 --- a/drivers/gpu/drm/nouveau/nvd0_display.c +++ b/drivers/gpu/drm/nouveau/nvd0_display.c @@ -33,6 +33,7 @@ #include "nouveau_crtc.h" #include "nouveau_dma.h" #include "nouveau_fb.h" +#include "nouveau_software.h" #include "nv50_display.h" #define EVO_DMA_NR 9 @@ -298,7 +299,8 @@ nvd0_display_flip_next(struct drm_crtc *crtc, struct drm_framebuffer *fb, if (ret) return ret; - offset = chan->dispc_vma[nv_crtc->index].offset; + + offset = nvc0_software_crtc(chan, nv_crtc->index); offset += evo->sem.offset; BEGIN_NVC0(chan, 0, NV84_SUBCHAN_SEMAPHORE_ADDRESS_HIGH, 4); |