nouveau: install libdrm_nouveau with libdrm

[android-x86/external-libdrm.git] / shared-core / via_drv.c

diff --git a/shared-core/via_drv.c b/shared-core/via_drv.c
index 0a478fe..dd632c3 100644 (file)
--- a/shared-core/via_drv.c
+++ b/shared-core/via_drv.c
@@ -40,17 +40,9 @@ static struct pci_device_id pciidlist[] = {
 
 
 #ifdef VIA_HAVE_FENCE
-static drm_fence_driver_t via_fence_driver = {
-       .num_classes = 1,
-       .wrap_diff = (1 << 30),
-       .flush_diff = (1 << 20),
-       .sequence_mask = 0xffffffffU,
-       .lazy_capable = 1,
-       .emit = via_fence_emit_sequence,
-       .poke_flush = via_poke_flush,
-       .has_irq = via_fence_has_irq,
-};
+extern struct drm_fence_driver via_fence_driver;
 #endif
+
 #ifdef VIA_HAVE_BUFFER
 
 /**
@@ -65,7 +57,7 @@ static uint32_t via_mem_prios[] = {DRM_BO_MEM_PRIV0, DRM_BO_MEM_VRAM, DRM_BO_MEM
 static uint32_t via_busy_prios[] = {DRM_BO_MEM_TT, DRM_BO_MEM_PRIV0, DRM_BO_MEM_VRAM, DRM_BO_MEM_LOCAL};
 
 
-static drm_bo_driver_t via_bo_driver = {
+static struct drm_bo_driver via_bo_driver = {
        .mem_type_prio = via_mem_prios,
        .mem_busy_prio = via_busy_prios,
        .num_mem_type_prio = ARRAY_SIZE(via_mem_prios),
@@ -74,8 +66,10 @@ static drm_bo_driver_t via_bo_driver = {
        .fence_type = via_fence_types,
        .invalidate_caches = via_invalidate_caches,
        .init_mem_type = via_init_mem_type,
-       .evict_mask = via_evict_mask,
+       .evict_flags = via_evict_flags,
        .move = NULL,
+       .ttm_cache_flush = NULL,
+       .command_stream_barrier = NULL
 };
 #endif
 
@@ -83,14 +77,16 @@ static int probe(struct pci_dev *pdev, const struct pci_device_id *ent);
 static struct drm_driver driver = {
        .driver_features =
            DRIVER_USE_AGP | DRIVER_USE_MTRR | DRIVER_HAVE_IRQ |
-           DRIVER_IRQ_SHARED | DRIVER_IRQ_VBL,
+           DRIVER_IRQ_SHARED,
        .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,
+       .get_vblank_counter = via_get_vblank_counter,
+       .enable_vblank = via_enable_vblank,
+       .disable_vblank = via_disable_vblank,
        .irq_preinstall = via_driver_irq_preinstall,
        .irq_postinstall = via_driver_irq_postinstall,
        .irq_uninstall = via_driver_irq_uninstall,