diff options
| author | Dave Airlie | 2014-01-30 01:46:06 +0100 |
|---|---|---|
| committer | Dave Airlie | 2014-01-30 01:46:06 +0100 |
| commit | ef64cf9d06049e4e9df661f3be60b217e476bee1 (patch) | |
| tree | 6c375f94bb68dc9f5e273dd85ce76d3f88cbbb50 /drivers/gpu/drm/nouveau/core/engine/disp/nve0.c | |
| parent | Merge branch 'drm-next-3.14' of git://people.freedesktop.org/~agd5f/linux int... (diff) | |
| parent | drm/nouveau: resume display if any later suspend bits fail (diff) | |
| download | kernel-qcow2-linux-ef64cf9d06049e4e9df661f3be60b217e476bee1.tar.gz kernel-qcow2-linux-ef64cf9d06049e4e9df661f3be60b217e476bee1.tar.xz kernel-qcow2-linux-ef64cf9d06049e4e9df661f3be60b217e476bee1.zip | |
Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-next
more fixes for nouveau.
* 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
drm/nouveau: resume display if any later suspend bits fail
drm/nouveau: fix lock unbalance in nouveau_crtc_page_flip
drm/nouveau: implement hooks for needed for drm vblank timestamping support
drm/nouveau/disp: add a method to fetch info needed by drm vblank timestamping
drm/nv50: fill in crtc mode struct members from crtc_mode_fixup
Diffstat (limited to 'drivers/gpu/drm/nouveau/core/engine/disp/nve0.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/core/engine/disp/nve0.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/core/engine/disp/nve0.c b/drivers/gpu/drm/nouveau/core/engine/disp/nve0.c index 20725b363d58..ab63f32c00b2 100644 --- a/drivers/gpu/drm/nouveau/core/engine/disp/nve0.c +++ b/drivers/gpu/drm/nouveau/core/engine/disp/nve0.c @@ -41,7 +41,7 @@ nve0_disp_sclass[] = { static struct nouveau_oclass nve0_disp_base_oclass[] = { - { NVE0_DISP_CLASS, &nvd0_disp_base_ofuncs, nva3_disp_base_omthds }, + { NVE0_DISP_CLASS, &nvd0_disp_base_ofuncs, nvd0_disp_base_omthds }, {} }; |