summaryrefslogtreecommitdiff
path: root/linux-core
AgeCommit message (Expand)Author
2007-07-26Replace NO_MOVE/NO_EVICT flags to buffer objects with an ioctl to set pinning.Eric Anholt
2007-07-26drm/bo: set the req pointer for each buffer to validateDave Airlie
2007-07-26drm: fix size argument for copy to/from userDave Airlie
2007-07-24Fix typo on previous commit. Sigh...Ian Romanick
2007-07-24Pass correct offset to xgi_find_pcie_virt.Ian Romanick
2007-07-24Fix license formatting.Ian Romanick
2007-07-24Fix flags for serveral ioctls.Ian Romanick
2007-07-24Fix bug preventing X server from restarting.Ian Romanick
2007-07-23Minor log message clean up.Ian Romanick
2007-07-23Minor log message clean up.Ian Romanick
2007-07-23linux: Make DRM_IOCTL_GET_CLIENT return EINVAL when it can't find client #idx.Eric Anholt
2007-07-23Eliminate XGI_CHECK_PCI_CONFIG.Ian Romanick
2007-07-23drm_rmmap_ioctl(): remove dead codeAdrian Bunk
2007-07-21Bump version.Ian Romanick
2007-07-21Remove some extraneous debug messages.Ian Romanick
2007-07-21Rename and document fields of xgi_cmdring_info.Ian Romanick
2007-07-21Make s_cmdring a field in the xgi_info structure instead of a global.Ian Romanick
2007-07-21Clean up xgi_cmd_info and associated code.Ian Romanick
2007-07-21Fix misc ioctl issues, makes Nouveau run.Pekka Paalanen
2007-07-21fix missing brace placement for IOC_INDave Airlie
2007-07-21fix drm no-compile due to BSD :-)Dave Airlie
2007-07-20Replace DRM_IOCTL_ARGS with (dev, data, file_priv) and remove DRM_DEVICE.Eric Anholt
2007-07-20Replace filp in ioctl arguments with drm_file *file_priv.Eric Anholt
2007-07-20Remove DRM_ERR OS macro.Eric Anholt
2007-07-20Fix linux spinlock macros after the last commit.Eric Anholt
2007-07-20Clean up flush command generation in addFlush2D.Ian Romanick
2007-07-20Clean up generation of begin commands in xgi_submit_cmdlistIan Romanick
2007-07-20Change handling of begin types slightly.Ian Romanick
2007-07-20Changed mode config spinlock to mutexJakob Bornecrantz
2007-07-19Delete unused variable in xgi_driver_load.Ian Romanick
2007-07-19Fix error handing related to xgi_cmdlist_initialize.Ian Romanick
2007-07-19Debug message and comment clean up in xgi_submit_cmdlist.Ian Romanick
2007-07-19Rework xgi_(pcie|fb)_free_all to prevent deadlock.Ian Romanick
2007-07-19Move MMIO drm_addmap (and code that depends on it) to xgi_bootstrap.Ian Romanick
2007-07-19Initial pass at converting driver to DRM infrastructure.Ian Romanick
2007-07-19Fix unlocking of spinlock when we should notJakob Bornecrantz
2007-07-19Merge branch 'origin'Eric Anholt
2007-07-18Add dry-coded DRM drawable private information storage for FreeBSD.Eric Anholt
2007-07-18Fix via dmablit when blit queue is full.Thomas Hellstrom
2007-07-18fix some missing whitespace/tabDave Airlie
2007-07-18drm: idr stuff is upstream for 2.6.23Dave Airlie
2007-07-18drm: remove drm_u64_t, replace with uint64_t everwhereDave Airlie
2007-07-18drm_context: fix brainoDave Airlie
2007-07-16Make drm_sg_free callable in-kernel.Ian Romanick
2007-07-16Log message clean up in WriteRegDWord. Remove unused inline functions.Ian Romanick
2007-07-16Clean ups (primarilly log messages) in xgi_test_rwinkernel.Ian Romanick
2007-07-16Eliminate several useless ioctls and associated cruft.Ian Romanick
2007-07-16Massive log message clean up in xgi_submit_cmdlist.Ian Romanick
2007-07-17nouveau: G8x PCIEGARTBen Skeggs
2007-07-16drm/radeon/ttm: more VRAM fixesDave Airlie
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-07 00:33:25 +0000
" static struct drm_ttm_backend * nouveau_bo_create_ttm_backend_entry(struct drm_device * dev) { struct drm_nouveau_private *dev_priv = dev->dev_private; switch (dev_priv->gart_info.type) { case NOUVEAU_GART_AGP: return drm_agp_init_ttm(dev); case NOUVEAU_GART_SGDMA: return nouveau_sgdma_init_ttm(dev); default: DRM_ERROR("Unknown GART type %d\n", dev_priv->gart_info.type); break; } return NULL; } static int nouveau_bo_fence_type(struct drm_buffer_object *bo, uint32_t *fclass, uint32_t *type) { /* When we get called, *fclass is set to the requested fence class */ if (bo->mem.proposed_flags & (DRM_BO_FLAG_READ | DRM_BO_FLAG_WRITE)) *type = 3; else *type = 1; return 0; } static int nouveau_bo_invalidate_caches(struct drm_device *dev, uint64_t buffer_flags) { /* We'll do this from user space. */ return 0; } static int nouveau_bo_init_mem_type(struct drm_device *dev, uint32_t type, struct drm_mem_type_manager *man) { struct drm_nouveau_private *dev_priv = dev->dev_private; switch (type) { case DRM_BO_MEM_LOCAL: man->flags = _DRM_FLAG_MEMTYPE_MAPPABLE | _DRM_FLAG_MEMTYPE_CACHED; man->drm_bus_maptype = 0; break; case DRM_BO_MEM_VRAM: man->flags = _DRM_FLAG_MEMTYPE_FIXED | _DRM_FLAG_MEMTYPE_MAPPABLE | _DRM_FLAG_NEEDS_IOREMAP; man->io_addr = NULL; man->drm_bus_maptype = _DRM_FRAME_BUFFER; man->io_offset = drm_get_resource_start(dev, 1); man->io_size = drm_get_resource_len(dev, 1); if (man->io_size > nouveau_mem_fb_amount(dev)) man->io_size = nouveau_mem_fb_amount(dev); break; case DRM_BO_MEM_PRIV0: /* Unmappable VRAM */ man->flags = _DRM_FLAG_MEMTYPE_CMA; man->drm_bus_maptype = 0; break; case DRM_BO_MEM_TT: switch (dev_priv->gart_info.type) { case NOUVEAU_GART_AGP: man->flags = _DRM_FLAG_MEMTYPE_MAPPABLE | _DRM_FLAG_MEMTYPE_CSELECT | _DRM_FLAG_NEEDS_IOREMAP; man->drm_bus_maptype = _DRM_AGP; break; case NOUVEAU_GART_SGDMA: man->flags = _DRM_FLAG_MEMTYPE_MAPPABLE | _DRM_FLAG_MEMTYPE_CSELECT | _DRM_FLAG_MEMTYPE_CMA; man->drm_bus_maptype = _DRM_SCATTER_GATHER; break; default: DRM_ERROR("Unknown GART type: %d\n", dev_priv->gart_info.type); return -EINVAL; } man->io_offset = dev_priv->gart_info.aper_base; man->io_size = dev_priv->gart_info.aper_size; man->io_addr = NULL; break; default: DRM_ERROR("Unsupported memory type %u\n", (unsigned)type); return -EINVAL; } return 0; } static uint64_t nouveau_bo_evict_flags(struct drm_buffer_object *bo) { switch (bo->mem.mem_type) { case DRM_BO_MEM_LOCAL: case DRM_BO_MEM_TT: return DRM_BO_FLAG_MEM_LOCAL; default: return DRM_BO_FLAG_MEM_TT | DRM_BO_FLAG_CACHED; } return 0; } /* GPU-assisted copy using NV_MEMORY_TO_MEMORY_FORMAT, can access * DRM_BO_MEM_{VRAM,PRIV0,TT} directly. */ static int nouveau_bo_move_m2mf(struct drm_buffer_object *bo, int evict, int no_wait, struct drm_bo_mem_reg *new_mem) { struct drm_device *dev = bo->dev; struct drm_nouveau_private *dev_priv = dev->dev_private; struct nouveau_drm_channel *dchan = &dev_priv->channel; struct drm_bo_mem_reg *old_mem = &bo->mem; uint32_t srch, dsth, page_count; /* Can happen during init/takedown */ if (!dchan->chan) return -EINVAL; srch = old_mem->mem_type == DRM_BO_MEM_TT ? NvDmaTT : NvDmaFB; dsth = new_mem->mem_type == DRM_BO_MEM_TT ? NvDmaTT : NvDmaFB; if (srch != dchan->m2mf_dma_source || dsth != dchan->m2mf_dma_destin) { dchan->m2mf_dma_source = srch; dchan->m2mf_dma_destin = dsth; BEGIN_RING(NvSubM2MF, NV_MEMORY_TO_MEMORY_FORMAT_SET_DMA_SOURCE, 2); OUT_RING (dchan->m2mf_dma_source); OUT_RING (dchan->m2mf_dma_destin); } page_count = new_mem->num_pages; while (page_count) { int line_count = (page_count > 2047) ? 2047 : page_count; BEGIN_RING(NvSubM2MF, NV_MEMORY_TO_MEMORY_FORMAT_OFFSET_IN, 8); OUT_RING (old_mem->mm_node->start << PAGE_SHIFT); OUT_RING (new_mem->mm_node->start << PAGE_SHIFT); OUT_RING (PAGE_SIZE); /* src_pitch */ OUT_RING (PAGE_SIZE); /* dst_pitch */ OUT_RING (PAGE_SIZE); /* line_length */ OUT_RING (line_count); OUT_RING ((1<<8)|(1<<0)); OUT_RING (0); BEGIN_RING(NvSubM2MF, NV_MEMORY_TO_MEMORY_FORMAT_NOP, 1); OUT_RING (0); page_count -= line_count; } return drm_bo_move_accel_cleanup(bo, evict, no_wait, dchan->chan->id, DRM_FENCE_TYPE_EXE, 0, new_mem); } /* Flip pages into the GART and move if we can. */ static int nouveau_bo_move_flipd(struct drm_buffer_object *bo, int evict, int no_wait, struct drm_bo_mem_reg *new_mem) { struct drm_device *dev = bo->dev; struct drm_bo_mem_reg tmp_mem; int ret; tmp_mem = *new_mem; tmp_mem.mm_node = NULL; tmp_mem.proposed_flags = (DRM_BO_FLAG_MEM_TT | DRM_BO_FLAG_CACHED | DRM_BO_FLAG_FORCE_CACHING); ret = drm_bo_mem_space(bo, &tmp_mem, no_wait); if (ret) return ret; ret = drm_ttm_bind(bo->ttm, &tmp_mem); if (ret) goto out_cleanup; ret = nouveau_bo_move_m2mf(bo, 1, no_wait, &tmp_mem); if (ret) goto out_cleanup; ret = drm_bo_move_ttm(bo, evict, no_wait, new_mem); out_cleanup: if (tmp_mem.mm_node) { mutex_lock(&dev->struct_mutex); if (tmp_mem.mm_node != bo->pinned_node) drm_mm_put_block(tmp_mem.mm_node); tmp_mem.mm_node = NULL; mutex_unlock(&dev->struct_mutex); } return ret; } static int nouveau_bo_move(struct drm_buffer_object *bo, int evict, int no_wait, struct drm_bo_mem_reg *new_mem) { struct drm_bo_mem_reg *old_mem = &bo->mem; if (new_mem->mem_type == DRM_BO_MEM_LOCAL) { if (old_mem->mem_type == DRM_BO_MEM_LOCAL) return drm_bo_move_memcpy(bo, evict, no_wait, new_mem); if (nouveau_bo_move_flipd(bo, evict, no_wait, new_mem)) return drm_bo_move_memcpy(bo, evict, no_wait, new_mem); } else if (old_mem->mem_type == DRM_BO_MEM_LOCAL) { if (1 /*nouveau_bo_move_flips(bo, evict, no_wait, new_mem)*/) return drm_bo_move_memcpy(bo, evict, no_wait, new_mem); } else { if (nouveau_bo_move_m2mf(bo, evict, no_wait, new_mem)) return drm_bo_move_memcpy(bo, evict, no_wait, new_mem); } return 0; } static void nouveau_bo_flush_ttm(struct drm_ttm *ttm) { } static uint32_t nouveau_mem_prios[] = { DRM_BO_MEM_PRIV0, DRM_BO_MEM_VRAM, DRM_BO_MEM_TT, DRM_BO_MEM_LOCAL }; static uint32_t nouveau_busy_prios[] = { DRM_BO_MEM_TT, DRM_BO_MEM_PRIV0, DRM_BO_MEM_VRAM, DRM_BO_MEM_LOCAL }; struct drm_bo_driver nouveau_bo_driver = { .mem_type_prio = nouveau_mem_prios, .mem_busy_prio = nouveau_busy_prios, .num_mem_type_prio = sizeof(nouveau_mem_prios)/sizeof(uint32_t), .num_mem_busy_prio = sizeof(nouveau_busy_prios)/sizeof(uint32_t), .create_ttm_backend_entry = nouveau_bo_create_ttm_backend_entry, .fence_type = nouveau_bo_fence_type, .invalidate_caches = nouveau_bo_invalidate_caches, .init_mem_type = nouveau_bo_init_mem_type, .evict_flags = nouveau_bo_evict_flags, .move = nouveau_bo_move, .ttm_cache_flush= nouveau_bo_flush_ttm, .command_stream_barrier = NULL };
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-07 00:33:25 +0000