summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2008-05-08i915: fix vbl swap for multi-masterDave Airlie
2008-05-08drm: check for NULL fb here, shouldn't happen but avoid oops for nowDave Airlie
2008-05-08drm: set crtc->fb to NULLDave Airlie
2008-05-08intel: set correct limits on screen width/height from DDXDave Airlie
2008-05-08drm: fix replacefb to change fb propertiesDave Airlie
2008-05-08drm_mode: initial replacefb implemenationDave Airlie
2008-05-08drm: fix typo from previous mergeDave Airlie
2008-05-08cursor: pass handle not BO.Dave Airlie
2008-05-08Merge remote branch 'origin/master' into modesetting-101Dave Airlie
2008-05-07GEM: fix testcases for new ioctl args.Eric Anholt
2008-05-07Apply a few stylistic cleanups to match kernel code.Arjan van de Ven
2008-05-07GEM: Wait for existing rendering to complete before writing relocation data.Eric Anholt
2008-05-07GEM: Extend cache domain stuff for 965.Eric Anholt
2008-05-07drm: nopage compat fixup for drm_vmDave Airlie
2008-05-06[intel-GEM] ref count objects in gtt-lru.Keith Packard
2008-05-06[intel-GEM] Add memory domain support.Keith Packard
2008-05-06Merge commit 'anholt/drm-gem' into drm-gemKeith Packard
2008-05-06Start coding up memory domainsKeith Packard
2008-05-06GEM: Use irq-based fencing rather than syncing and evicting every exec.Eric Anholt
2008-05-06GEM: Skip relocation if presumed offset matches.Eric Anholt
2008-05-06GEM: Save the last ioremapped page for relocations in case we need it again.Eric Anholt
2008-05-05Dump last batch buffer when hardware lockup is detected.Keith Packard
2008-05-05Monitor ACTHD register while polling for idle ring.Keith Packard
2008-05-05Unlock pages right after getting them.Keith Packard
2008-05-05Merge commit 'anholt/drm-gem' into drm-gemKeith Packard
2008-05-05GEM: Replace drm_memrange_for_each with just evicting what we brought in.Eric Anholt
2008-05-05Remove some debug messages.Keith Packard
2008-05-05Add object base to relocation store address.Keith Packard
2008-05-05Emit clflush and chipset flush when mapping objects to gttKeith Packard
2008-05-05Correct execbuffer offset. Add memory barrier and chipset flush.Keith Packard
2008-05-05Add i915_dispatch_gem_execbuffer (broken).Keith Packard
2008-05-05r500: add allowed range for us config/pixsizeDave Airlie
2008-05-02Don't forget to set the memrange private, and reset ring on kernel entry.Eric Anholt
2008-05-02Don't include the tail guard memrange in foreach callbacking.Eric Anholt
2008-05-02Check for do_mmap errorsKeith Packard
2008-05-02Add a bit of /proc/dri/*/gem support. Clean up some refcount/pagelock issues.Keith Packard
2008-05-02Add name/open ioctls, separate handle and pointer ref counts.Keith Packard
2008-05-02Remove drm_driver argument to functions taking drm_gem_object.Keith Packard
2008-05-02Fix nouveau warning when returning pointers in uint64_t objects.Keith Packard
2008-05-01Add alignment to all aperture allocation requests.Keith Packard
2008-05-01Fix gem ioctls to be 32/64-bit clean.Keith Packard
2008-05-01Use krefs for refcounting.Keith Packard
2008-05-01Unbind objects when freeing, fix some error paths, and warn in others.Eric Anholt
2008-05-01Fix offset passed to AGP to be pages instead of bytes.Eric Anholt
2008-05-01Fix missing member settings in obj/obj_priv, and some error paths.Eric Anholt
2008-05-01Make GEM object handles be nonzero.Eric Anholt
2008-05-01Update mm tests for GEM rename.Eric Anholt
2008-05-01Remove _args from gem ioctl argument structure tags.Eric Anholt
2008-05-01Add pin/unpin object ioctls for gem.Eric Anholt
2008-05-01checkpoint: relocations support.Eric Anholt
">int (*f) DRM_SYSCTL_HANDLER_ARGS; } drm_sysctl_list[] = { {"name", drm_name_info}, {"vm", drm_vm_info}, {"clients", drm_clients_info}, {"bufs", drm_bufs_info}, }; #define DRM_SYSCTL_ENTRIES (sizeof(drm_sysctl_list)/sizeof(drm_sysctl_list[0])) struct drm_sysctl_info { struct sysctl_ctx_list ctx; char name[2]; }; int drm_sysctl_init(drm_device_t *dev) { struct drm_sysctl_info *info; struct sysctl_oid *oid; struct sysctl_oid *top, *drioid; int i; info = malloc(sizeof *info, M_DRM, M_WAITOK | M_ZERO); if ( !info ) return 1; dev->sysctl = info; /* Add the sysctl node for DRI if it doesn't already exist */ drioid = SYSCTL_ADD_NODE( &info->ctx, &sysctl__hw_children, OID_AUTO, "dri", CTLFLAG_RW, NULL, "DRI Graphics"); if (!drioid) return 1; /* Find the next free slot under hw.dri */ i = 0; SLIST_FOREACH(oid, SYSCTL_CHILDREN(drioid), oid_link) { if (i <= oid->oid_arg2) i = oid->oid_arg2 + 1; } if (i>9) return 1; /* Add the hw.dri.x for our device */ info->name[0] = '0' + i; info->name[1] = 0; top = SYSCTL_ADD_NODE( &info->ctx, SYSCTL_CHILDREN(drioid), OID_AUTO, info->name, CTLFLAG_RW, NULL, NULL); if (!top) return 1; for (i = 0; i < DRM_SYSCTL_ENTRIES; i++) { oid = SYSCTL_ADD_OID(&info->ctx, SYSCTL_CHILDREN(top), OID_AUTO, drm_sysctl_list[i].name, CTLTYPE_INT | CTLFLAG_RD, dev, 0, drm_sysctl_list[i].f, "A", NULL); if (!oid) return 1; } SYSCTL_ADD_INT(&info->ctx, SYSCTL_CHILDREN(top), OID_AUTO, "debug", CTLFLAG_RW, &drm_debug_flag, sizeof(drm_debug_flag), "Enable debugging output"); return 0; } int drm_sysctl_cleanup(drm_device_t *dev) { int error; error = sysctl_ctx_free( &dev->sysctl->ctx ); free(dev->sysctl, M_DRM); dev->sysctl = NULL; return error; } #define DRM_SYSCTL_PRINT(fmt, arg...) \ do { \ snprintf(buf, sizeof(buf), fmt, ##arg); \ retcode = SYSCTL_OUT(req, buf, strlen(buf)); \ if (retcode) \ goto done; \ } while (0) static int drm_name_info DRM_SYSCTL_HANDLER_ARGS { drm_device_t *dev = arg1; char buf[128]; int retcode; int hasunique = 0; DRM_SYSCTL_PRINT("%s 0x%x", dev->driver.name, dev2udev(dev->devnode)); DRM_LOCK(); if (dev->unique) { snprintf(buf, sizeof(buf), " %s", dev->unique); hasunique = 1; } DRM_UNLOCK(); if (hasunique) SYSCTL_OUT(req, buf, strlen(buf)); SYSCTL_OUT(req, "", 1); done: return retcode; } static int drm_vm_info DRM_SYSCTL_HANDLER_ARGS { drm_device_t *dev = arg1; drm_local_map_t *map, *tempmaps; const char *types[] = { "FB", "REG", "SHM", "AGP", "SG" }; const char *type, *yesno; int i, mapcount; char buf[128]; int retcode; /* We can't hold the lock while doing SYSCTL_OUTs, so allocate a * temporary copy of all the map entries and then SYSCTL_OUT that. */ DRM_LOCK(); mapcount = 0; TAILQ_FOREACH(map, &dev->maplist, link) mapcount++; tempmaps = malloc(sizeof(drm_local_map_t) * mapcount, M_DRM, M_NOWAIT); if (tempmaps == NULL) { DRM_UNLOCK(); return ENOMEM; } i = 0; TAILQ_FOREACH(map, &dev->maplist, link) tempmaps[i++] = *map; DRM_UNLOCK(); DRM_SYSCTL_PRINT("\nslot offset size type flags " "address mtrr\n"); for (i = 0; i < mapcount; i++) { map = &tempmaps[i]; if (map->type < 0 || map->type > 4) type = "??"; else type = types[map->type]; if (!map->mtrr) yesno = "no"; else yesno = "yes"; DRM_SYSCTL_PRINT( "%4d 0x%08lx 0x%08lx %4.4s 0x%02x 0x%08lx %s\n", i, map->offset, map->size, type, map->flags, (unsigned long)map->handle, yesno); } SYSCTL_OUT(req, "", 1); done: free(tempmaps, M_DRM); return retcode; } static int drm_bufs_info DRM_SYSCTL_HANDLER_ARGS { drm_device_t *dev = arg1; drm_device_dma_t *dma = dev->dma; drm_device_dma_t tempdma; int *templists; int i; char buf[128]; int retcode; /* We can't hold the locks around DRM_SYSCTL_PRINT, so make a temporary * copy of the whole structure and the relevant data from buflist. */ DRM_LOCK(); if (dma == NULL) { DRM_UNLOCK(); return 0; } DRM_SPINLOCK(&dev->dma_lock); tempdma = *dma; templists = malloc(sizeof(int) * dma->buf_count, M_DRM, M_NOWAIT); for (i = 0; i < dma->buf_count; i++) templists[i] = dma->buflist[i]->list; dma = &tempdma; DRM_SPINUNLOCK(&dev->dma_lock); DRM_UNLOCK(); DRM_SYSCTL_PRINT("\n o size count free segs pages kB\n"); for (i = 0; i <= DRM_MAX_ORDER; i++) { if (dma->bufs[i].buf_count) DRM_SYSCTL_PRINT("%2d %8d %5d %5d %5d %5d %5d\n", i, dma->bufs[i].buf_size, dma->bufs[i].buf_count, atomic_read(&dma->bufs[i] .freelist.count), dma->bufs[i].seg_count, dma->bufs[i].seg_count *(1 << dma->bufs[i].page_order), (dma->bufs[i].seg_count * (1 << dma->bufs[i].page_order)) * PAGE_SIZE / 1024); } DRM_SYSCTL_PRINT("\n"); for (i = 0; i < dma->buf_count; i++) { if (i && !(i%32)) DRM_SYSCTL_PRINT("\n"); DRM_SYSCTL_PRINT(" %d", templists[i]); } DRM_SYSCTL_PRINT("\n"); SYSCTL_OUT(req, "", 1); done: free(templists, M_DRM); return retcode; } static int drm_clients_info DRM_SYSCTL_HANDLER_ARGS { drm_device_t *dev = arg1; drm_file_t *priv, *tempprivs; char buf[128]; int retcode; int privcount, i; DRM_LOCK(); privcount = 0; TAILQ_FOREACH(priv, &dev->files, link) privcount++; tempprivs = malloc(sizeof(drm_file_t) * privcount, M_DRM, M_NOWAIT); if (tempprivs == NULL) { DRM_UNLOCK(); return ENOMEM; } i = 0; TAILQ_FOREACH(priv, &dev->files, link) tempprivs[i++] = *priv; DRM_UNLOCK(); DRM_SYSCTL_PRINT("\na dev pid uid magic ioctls\n"); for (i = 0; i < privcount; i++) { priv = &tempprivs[i]; DRM_SYSCTL_PRINT("%c %3d %5d %5d %10u %10lu\n", priv->authenticated ? 'y' : 'n', priv->minor, priv->pid, priv->uid, priv->magic, priv->ioctl_count); } SYSCTL_OUT(req, "", 1); done: free(tempprivs, M_DRM); return retcode; }