diff options
| author | Thomas Hellstrom <thomas@tungstengraphics.com> | 2006-06-06 14:19:00 +0000 |
|---|---|---|
| committer | Thomas Hellstrom <thomas@tungstengraphics.com> | 2006-06-06 14:19:00 +0000 |
| commit | 6bacb180cef00573fc41a1e79bdd5b89d6f1c1f5 (patch) | |
| tree | e11dc34c7c318a1ce901b932ac53d95012e5c871 /shared-core/via_drv.c | |
| parent | 838b03f7aad579bcb593c06e44ade02a0583d3ce (diff) | |
Merge in the drm-sman-branch
Diffstat (limited to 'shared-core/via_drv.c')
| -rw-r--r-- | shared-core/via_drv.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/shared-core/via_drv.c b/shared-core/via_drv.c index 2dc72ec1..a7509cff 100644 --- a/shared-core/via_drv.c +++ b/shared-core/via_drv.c @@ -46,7 +46,9 @@ static struct drm_driver driver = { DRIVER_IRQ_SHARED | DRIVER_IRQ_VBL, .load = via_driver_load, .unload = via_driver_unload, +#ifndef VIA_HAVE_CORE_MM .context_ctor = via_init_context, +#endif .context_dtor = via_final_context, .vblank_wait = via_driver_vblank_wait, .irq_preinstall = via_driver_irq_preinstall, @@ -56,6 +58,9 @@ static struct drm_driver driver = { .dma_quiescent = via_driver_dma_quiescent, .dri_library_name = dri_library_name, .reclaim_buffers = drm_core_reclaim_buffers, +#ifdef VIA_HAVE_CORE_MM + .reclaim_buffers_locked = via_reclaim_buffers_locked, +#endif .get_map_ofs = drm_core_get_map_ofs, .get_reg_ofs = drm_core_get_reg_ofs, .ioctls = via_ioctls, |