summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2009-10-03libdrm_radeon: Update RADEON_TILING_* flags to what's in current kernels.Michel Dänzer
2009-10-03libdrm_radeon: Zero-initialize structures to silence valgrind warningsNicolai Hähnle
2009-10-02intel: Use atomic refcountersChris Wilson
2009-10-02intel: Mark cached bo as purgeableChris Wilson
2009-10-02intel: Don't free the reloc list when putting a freed BO in the cache.Eric Anholt
2009-10-01intel: Add a new function to check if a BO's reloc tree references some BO.Eric Anholt
2009-09-21Bump to 2.4.14 for release.Eric Anholt
2009-09-21intel: Remove the max_entries stuff that complicated bo reuse.Eric Anholt
2009-09-21intel: Remove the old swrast flag for reducing cache flushing.Eric Anholt
2009-09-17drmModeFreeConnector: free encoders and propertiesKeith Packard
2009-09-15radeon: fix 32/64 bit issue with sign extensionDave Airlie
2009-09-07libdrm_intel: include B43 chipset checkZhenyu Wang
2009-09-04libdrm_intel: add new pci idsZhenyu Wang
2009-08-28Bump to version 2.4.13 for release.Eric Anholt
2009-08-28Add drm_intel_bo_busy to query whether mapping a BO would block.Eric Anholt
2009-08-28Revert "libdrm_radeon: Always wait for BO idle in bo_map."Michel Dänzer
2009-08-27libdrm_radeon: Always wait for BO idle in bo_map.Michel Dänzer
2009-08-25Kill last remnant of replacefb ioctlJakob Bornecrantz
2009-08-24radeon: pull in z pipe changes from kernelAlex Deucher
2009-08-22radeon: add support for busy/domain check interface.Pauli Nieminen
2009-08-19nouveau: fix a thinko in copyless pushbuf ioctlBen Skeggs
2009-08-18libdrm_radeon: Optimize copy of table to cs buffer with specialized call.Pauli Nieminen
2009-08-18libdrm_radeon: Fix loops so that compiler can optimize them.Pauli Nieminen
2009-08-18libdrm/radeon: Update head of linked list not to point freed memory.Pauli Nieminen
2009-08-18nouveau: support for copy-less pushbuf ioctlBen Skeggs
2009-08-18nouveau: for the moment, assert if we exceed some reloc limitsBen Skeggs
2009-08-17radeon: fix bo wait at map time.Dave Airlie
2009-08-16Filter radeon pkgconfig file as do intel and nouveauChristoph Brill
2009-08-15radeon: fix GTT writing space checkDave Airlie
2009-08-05link libdrm_intel with -lrt for new use of clock_gettime().Anssi Hannula
2009-08-01libdrm_radeon: add tiling supportDave Airlie
2009-08-01radeon: don't map/unmap explicitly.Dave Airlie
2009-07-28nouveau: don't overwrite user-specified bo size needlesslyBen Skeggs
2009-07-28nouveau: user buffers need to be mappableBen Skeggs
2009-07-28nouveau: drm api 0.0.15, update object header, remove fake bo supportBen Skeggs
2009-07-27libdrm/nouveau: unmap before ufree means nvbo->sysmem != NULL, which inbalanc...Maarten Maathuis
2009-07-15Add RADEON_INIT_R600_CP tooAlex Deucher
2009-07-15Add R600_SCRATCH_REG_OFFSET to radeon_drm.hAlex Deucher
2009-07-15Bump to version 2.4.12 for release.Eric Anholt
2009-07-09intel: Free buffers in the BO cache that haven't been reused in a while.Eric Anholt
2009-07-10configure: move AC_USE_SYSTEM_EXTENSIONS up higherDave Airlie
2009-07-09nouveau: fix pin for buffers created with bo_wrapBen Skeggs
2009-07-06s/AC_USE_SYSTEM_MACROS/AC_USE_SYSTEM_EXTENSIONS/Ian Romanick
2009-07-06libdrm: Make chown check for return valuePauli Nieminen
2009-07-06libdrm: Set _XOPEN_SOURCE and _GNU_SOURCEIan Romanick
2009-07-06intel: Fix up math errors when allocating very large BOs.Eric Anholt
2009-07-06intel: fix compiler warning about returning a void value.Edward O'Callaghan
2009-07-06libdrm: Fix pci id numbers to unsigned so code won't mix signed/unsigned inte...Pauli Nieminen
2009-07-06strcasecmp is in strings.h.Ian Romanick
2009-07-06libdrm: Remove typedef for non-existing enumPauli Nieminen
class="hl com"> * * The above copyright notice and this permission notice (including the * next paragraph) shall be included in all copies or substantial portions * of the Software. * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE * USE OR OTHER DEALINGS IN THE SOFTWARE. * * **************************************************************************/ /* * Authors: * Thomas Hellström <thomas-at-tungstengraphics-dot-com> */ #include "drmP.h" #include "sis_drm.h" #include "sis_drv.h" #if defined(__linux__) #include <video/sisfb.h> #endif #define VIDEO_TYPE 0 #define AGP_TYPE 1 #define SIS_MM_ALIGN_SHIFT 4 #define SIS_MM_ALIGN_MASK ( (1 << SIS_MM_ALIGN_SHIFT) - 1) #if defined(__linux__) && defined(CONFIG_FB_SIS) /* fb management via fb device */ #define SIS_MM_ALIGN_SHIFT 0 #define SIS_MM_ALIGN_MASK 0 static void *sis_sman_mm_allocate(void *private, unsigned long size, unsigned alignment) { struct sis_memreq req; req.size = size; sis_malloc(&req); if (req.size == 0) return NULL; else return (void *)~req.offset; } static void sis_sman_mm_free(void *private, void *ref) { sis_free(~((unsigned long)ref)); } static void sis_sman_mm_destroy(void *private) { ; } unsigned long sis_sman_mm_offset(void *private, void *ref) { return ~((unsigned long)ref); } #endif static int sis_fb_init(DRM_IOCTL_ARGS) { DRM_DEVICE; drm_sis_private_t *dev_priv = dev->dev_private; drm_sis_fb_t fb; int ret; DRM_COPY_FROM_USER_IOCTL(fb, (drm_sis_fb_t __user *) data, sizeof(fb)); mutex_lock(&dev->struct_mutex); #if defined(__linux__) && defined(CONFIG_FB_SIS) { drm_sman_mm_t sman_mm; sman_mm.private = (void *)0xFFFFFFFF; sman_mm.allocate = sis_sman_mm_allocate; sman_mm.free = sis_sman_mm_free; sman_mm.destroy = sis_sman_mm_destroy; sman_mm.offset = sis_sman_mm_offset; ret = drm_sman_set_manager(&dev_priv->sman, VIDEO_TYPE, &sman_mm); } #else ret = drm_sman_set_range(&dev_priv->sman, VIDEO_TYPE, 0, fb.size >> SIS_MM_ALIGN_SHIFT); #endif if (ret) { DRM_ERROR("VRAM memory manager initialisation error\n"); mutex_unlock(&dev->struct_mutex); return ret; } dev_priv->vram_initialized = 1; dev_priv->vram_offset = fb.offset; mutex_unlock(&dev->struct_mutex); DRM_DEBUG("offset = %u, size = %u", fb.offset, fb.size); return 0; } static int sis_drm_alloc(drm_device_t * dev, drm_file_t * priv, unsigned long data, int pool) { drm_sis_private_t *dev_priv = dev->dev_private; drm_sis_mem_t __user *argp = (drm_sis_mem_t __user *) data; drm_sis_mem_t mem; int retval = 0; drm_memblock_item_t *item; DRM_COPY_FROM_USER_IOCTL(mem, argp, sizeof(mem)); mutex_lock(&dev->struct_mutex); if (0 == ((pool == 0) ? dev_priv->vram_initialized : dev_priv->agp_initialized)) { DRM_ERROR ("Attempt to allocate from uninitialized memory manager.\n"); return DRM_ERR(EINVAL); } mem.size = (mem.size + SIS_MM_ALIGN_MASK) >> SIS_MM_ALIGN_SHIFT; item = drm_sman_alloc(&dev_priv->sman, pool, mem.size, 0, (unsigned long)priv); mutex_unlock(&dev->struct_mutex); if (item) { mem.offset = ((pool == 0) ? dev_priv->vram_offset : dev_priv->agp_offset) + (item->mm-> offset(item->mm, item->mm_info) << SIS_MM_ALIGN_SHIFT); mem.free = item->user_hash.key; mem.size = mem.size << SIS_MM_ALIGN_SHIFT; } else { mem.offset = 0; mem.size = 0; mem.free = 0; retval = DRM_ERR(ENOMEM); } DRM_COPY_TO_USER_IOCTL(argp, mem, sizeof(mem)); DRM_DEBUG("alloc %d, size = %d, offset = %d\n", pool, mem.size, mem.offset); return retval; } static int sis_drm_free(DRM_IOCTL_ARGS) { DRM_DEVICE; drm_sis_private_t *dev_priv = dev->dev_private; drm_sis_mem_t mem; int ret; DRM_COPY_FROM_USER_IOCTL(mem, (drm_sis_mem_t __user *) data, sizeof(mem)); mutex_lock(&dev->struct_mutex); ret = drm_sman_free_key(&dev_priv->sman, mem.free); mutex_unlock(&dev->struct_mutex); DRM_DEBUG("free = 0x%lx\n", mem.free); return ret; } static int sis_fb_alloc(DRM_IOCTL_ARGS) { DRM_DEVICE; return sis_drm_alloc(dev, priv, data, VIDEO_TYPE); } static int sis_ioctl_agp_init(DRM_IOCTL_ARGS) { DRM_DEVICE; drm_sis_private_t *dev_priv = dev->dev_private; drm_sis_agp_t agp; int ret; dev_priv = dev->dev_private; DRM_COPY_FROM_USER_IOCTL(agp, (drm_sis_agp_t __user *) data, sizeof(agp)); mutex_lock(&dev->struct_mutex); ret = drm_sman_set_range(&dev_priv->sman, AGP_TYPE, 0, agp.size >> SIS_MM_ALIGN_SHIFT); if (ret) { DRM_ERROR("AGP memory manager initialisation error\n"); mutex_unlock(&dev->struct_mutex); return ret; } dev_priv->agp_initialized = 1; dev_priv->agp_offset = agp.offset; mutex_unlock(&dev->struct_mutex); DRM_DEBUG("offset = %u, size = %u", agp.offset, agp.size); return 0; } static int sis_ioctl_agp_alloc(DRM_IOCTL_ARGS) { DRM_DEVICE; return sis_drm_alloc(dev, priv, data, AGP_TYPE); } static drm_local_map_t *sis_reg_init(drm_device_t *dev) { drm_map_list_t *entry; drm_local_map_t *map; list_for_each_entry(entry, &dev->maplist->head, head) { map = entry->map; if (!map) continue; if (map->type == _DRM_REGISTERS) { return map; } } return NULL; } int sis_idle(drm_device_t *dev) { drm_sis_private_t *dev_priv = dev->dev_private; uint32_t idle_reg; unsigned long end; int i; if (dev_priv->idle_fault) return 0; if (dev_priv->mmio == NULL) { dev_priv->mmio = sis_reg_init(dev); if (dev_priv->mmio == NULL) { DRM_ERROR("Could not find register map.\n"); return 0; } } /* * Implement a device switch here if needed */ if (dev_priv->chipset != SIS_CHIP_315) return 0; /* * Timeout after 3 seconds. We cannot use DRM_WAIT_ON here * because its polling frequency is too low. */ end = jiffies + (DRM_HZ * 3); for (i=0; i<4; ++i) { do { idle_reg = SIS_READ(0x85cc); } while ( !time_after_eq(jiffies, end) && ((idle_reg & 0x80000000) != 0x80000000)); } if (time_after_eq(jiffies, end)) { DRM_ERROR("Graphics engine idle timeout. " "Disabling idle check\n"); dev_priv->idle_fault = 1; } /* * The caller never sees an error code. It gets trapped * in libdrm. */ return 0; } void sis_lastclose(struct drm_device *dev) { drm_sis_private_t *dev_priv = dev->dev_private; if (!dev_priv) return; mutex_lock(&dev->struct_mutex); drm_sman_cleanup(&dev_priv->sman); dev_priv->vram_initialized = 0; dev_priv->agp_initialized = 0; dev_priv->mmio = NULL; mutex_unlock(&dev->struct_mutex); } void sis_reclaim_buffers_locked(drm_device_t * dev, struct file *filp) { drm_sis_private_t *dev_priv = dev->dev_private; drm_file_t *priv = filp->private_data; mutex_lock(&dev->struct_mutex); if (drm_sman_owner_clean(&dev_priv->sman, (unsigned long)priv)) { mutex_unlock(&dev->struct_mutex); return; } if (dev->driver->dma_quiescent) { dev->driver->dma_quiescent(dev); } drm_sman_owner_cleanup(&dev_priv->sman, (unsigned long)priv); mutex_unlock(&dev->struct_mutex); return; } drm_ioctl_desc_t sis_ioctls[] = { [DRM_IOCTL_NR(DRM_SIS_FB_ALLOC)] = {sis_fb_alloc, DRM_AUTH}, [DRM_IOCTL_NR(DRM_SIS_FB_FREE)] = {sis_drm_free, DRM_AUTH}, [DRM_IOCTL_NR(DRM_SIS_AGP_INIT)] =