diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2012-07-22 05:55:54 +0400 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2012-10-03 07:12:55 +0400 |
| commit | f589be88caf32501a734e531180d5df5d6089ef3 (patch) | |
| tree | c6653b5d6aa47aade8abc79c0bb73462f82eef01 /drivers/gpu/drm/nouveau/nv50_display.c | |
| parent | bc9e7b9a61e9e92ddb58920cb2cb5c2e2825ca8a (diff) | |
| download | linux-f589be88caf32501a734e531180d5df5d6089ef3.tar.xz | |
drm/nouveau/pageflip: kick flip handling out of engsw and into fence
This is all very much a policy thing, and hence will not belong in SW
after the rework.
engsw now only handles receiving the event to say "can flip now" and makes
a callback to perform the actual work.
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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c index 9c0bb20b0dc3..83419a2daa0b 100644 --- a/drivers/gpu/drm/nouveau/nv50_display.c +++ b/drivers/gpu/drm/nouveau/nv50_display.c @@ -32,8 +32,8 @@ #include "nouveau_fb.h" #include "nouveau_fbcon.h" #include <core/ramht.h> -#include "nouveau_software.h" #include "drm_crtc_helper.h" +#include "nouveau_fence.h" static void nv50_display_isr(struct drm_device *); static void nv50_display_bh(unsigned long); @@ -446,7 +446,7 @@ nv50_display_flip_next(struct drm_crtc *crtc, struct drm_framebuffer *fb, else OUT_RING (chan, chan->vram_handle); } else { - u64 offset = nvc0_software_crtc(chan, nv_crtc->index); + u64 offset = nvc0_fence_crtc(chan, nv_crtc->index); offset += dispc->sem.offset; BEGIN_NVC0(chan, 0, 0x0010, 4); OUT_RING (chan, upper_32_bits(offset)); |