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 33b0a42..dd632c3 100644 (file)
--- a/shared-core/via_drv.c
+++ b/shared-core/via_drv.c
@@ -38,18 +38,55 @@ static struct pci_device_id pciidlist[] = {
        viadrv_PCI_IDS
 };
 
+
+#ifdef VIA_HAVE_FENCE
+extern struct drm_fence_driver via_fence_driver;
+#endif
+
+#ifdef VIA_HAVE_BUFFER
+
+/**
+ * If there's no thrashing. This is the preferred memory type order.
+ */
+static uint32_t via_mem_prios[] = {DRM_BO_MEM_PRIV0, DRM_BO_MEM_VRAM, DRM_BO_MEM_TT, DRM_BO_MEM_LOCAL};
+
+/**
+ * If we have thrashing, most memory will be evicted to TT anyway, so we might as well
+ * just move the new buffer into TT from the start.
+ */
+static uint32_t via_busy_prios[] = {DRM_BO_MEM_TT, DRM_BO_MEM_PRIV0, DRM_BO_MEM_VRAM, DRM_BO_MEM_LOCAL};
+
+
+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),
+       .num_mem_busy_prio = ARRAY_SIZE(via_busy_prios),
+       .create_ttm_backend_entry = via_create_ttm_backend_entry,
+       .fence_type = via_fence_types,
+       .invalidate_caches = via_invalidate_caches,
+       .init_mem_type = via_init_mem_type,
+       .evict_flags = via_evict_flags,
+       .move = NULL,
+       .ttm_cache_flush = NULL,
+       .command_stream_barrier = NULL
+};
+#endif
+
 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,
@@ -57,8 +94,9 @@ static struct drm_driver driver = {
        .dma_quiescent = via_driver_dma_quiescent,
        .dri_library_name = dri_library_name,
        .reclaim_buffers = drm_core_reclaim_buffers,
+       .reclaim_buffers_locked = NULL,
 #ifdef VIA_HAVE_CORE_MM
-       .reclaim_buffers_locked = via_reclaim_buffers_locked,
+       .reclaim_buffers_idlelocked = via_reclaim_buffers_locked,
        .lastclose = via_lastclose,
 #endif
        .get_map_ofs = drm_core_get_map_ofs,
@@ -79,7 +117,12 @@ static struct drm_driver driver = {
                .probe = probe,
                .remove = __devexit_p(drm_cleanup_pci),
        },
-
+#ifdef VIA_HAVE_FENCE
+       .fence_driver = &via_fence_driver,
+#endif
+#ifdef VIA_HAVE_BUFFER
+       .bo_driver = &via_bo_driver,
+#endif
        .name = DRIVER_NAME,
        .desc = DRIVER_DESC,
        .date = VIA_DRM_DRIVER_DATE,