summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2008-06-18i915: use WC mapping for framebuffer screen_baseJesse Barnes
2008-06-18Merge branch 'modesetting-101' into modesetting-gemJesse Barnes
2008-06-18i915: switch back to fbcon on panicJesse Barnes
2008-06-18i915: Add support for Intel 4 series chipsetsZhenyu Wang
2008-06-16[intel] Quirk away MSI support on 945G/GM.Eric Anholt
2008-06-16[linux] Use the device's irq for handler setup instead of stale dev->irq.Eric Anholt
2008-06-15radeon: *really* fix screen corruption thanks to Lukasz KrotowskiJerome Glisse
2008-06-15radeon: actualy try to fix the corruptionJerome Glisse
2008-06-15radeon: fix screen corruption introduced by last patchJerome Glisse
2008-06-13[intel-gem] Execute MI_FLUSH in leavevt_ioctlKeith Packard
2008-06-13[intel-gem] inactive list may contain objects in CPU write domainKeith Packard
2008-06-13[intel-gem] BUG_ON active objects in gem_object_unbindKeith Packard
2008-06-13[intel-gem] Debugging -- verify inactive list invariantsKeith Packard
2008-06-13[intel-gem] whitespace fixesKeith Packard
2008-06-13[intel-gem] show total GTT space in /proc/dri/*/gem_objectsKeith Packard
2008-06-13[intel-gem] Wait for rendering to complete before unbinding.Keith Packard
2008-06-13[libdrm] Restart all ioctls on signal receiptKeith Packard
2008-06-13[intel-gem] add gtt and pin counts to /proc/dri/*/gem_objectsKeith Packard
2008-06-13[intel-gem] Left the last exec buffer pinned. oops.Keith Packard
2008-06-13[FreeBSD] Fix another lock leakRobert Noland
2008-06-13[intel-gem] Pin objects during execbufferKeith Packard
2008-06-13[intel-gem] throttle based on frames rather than time. Reduces jitter.Keith Packard
2008-06-13[intel-gem] evict_something was failing when wait_request freed objectsKeith Packard
2008-06-13[intel] Enable MSI for i915 IRQKeith Packard
2008-06-13[intel] Restructure irq to pend all work until after iir write.Keith Packard
2008-06-13[intel-gem] Use a delayed_work instead of a timer + work_structKeith Packard
2008-06-13[intel-gem] Reorder i915_add_request to schedule work lastKeith Packard
2008-06-13Use /bin/pwd instead of trusting shell built-inKeith Packard
2008-06-13Fix i915_wait_irq in the presence of interrupt masking.Eric Anholt
2008-06-13[gem] Catch -EINTR from blocking ioctls and restart them.Eric Anholt
2008-06-13[gem] Remove the interrupt handler for retiring requests.Eric Anholt
2008-06-13[gem] Don't require the lock in execbuf now that it's not needed for the ring.Eric Anholt
2008-06-13radeon: bump driver date to know if lockup fix is inJerome Glisse
2008-06-13radeon: r345xx fixe hard lockupJerome Glisse
2008-06-12xgi: Bump kernel versionIan Romanick
2008-06-12Bump libdrm version to 2.4.0.Eric Anholt
2008-06-12Don't clear USER_INTERRUPT if we're not handling it.Eric Anholt
2008-06-11[gem] Remove the drm_client_lock_take in set_domain.Eric Anholt
2008-06-11Use GEM in modesettingJesse Barnes
2008-06-11Move the renaming of mm.c symbols to #defines in the header.Eric Anholt
2008-06-11[gem] Another round of cleanups from checkpatch.plEric Anholt
2008-06-11RADEON: use DSTCACHE_CTLSTAT rather than RB2D_DSTCACHE_CTLSTATAlex Deucher
2008-06-11[gem] Move potentially device-specific ioctls to the intel driver.Eric Anholt
2008-06-11Remove override of drm module list in preparation for merge.Eric Anholt
2008-06-11[gem] Remove carefully-sprinkled i915_kernel_lost_context().Eric Anholt
2008-06-11Merge commit 'origin/drm-gem' into modesetting-gemJesse Barnes
2008-06-10[intel] Fix BUG_ON trigger in irq masking if you did on/off with irqs disabled.Eric Anholt
2008-06-10[gem] Manage the ringbuffer from the kernel in the GEM case.Eric Anholt
2008-06-10xgixp: Remove dependency on TTM fencesIan Romanick
2008-06-10Merge commit 'origin/drm-gem' into modesetting-gemJesse Barnes
LOCKED; return 0; } int DRM(waitlist_destroy)(drm_waitlist_t *bl) { if (bl->rp != bl->wp) return -EINVAL; if (bl->bufs) DRM(free)(bl->bufs, (bl->count + 2) * sizeof(*bl->bufs), DRM_MEM_BUFLISTS); bl->count = 0; bl->bufs = NULL; bl->rp = NULL; bl->wp = NULL; bl->end = NULL; return 0; } int DRM(waitlist_put)(drm_waitlist_t *bl, drm_buf_t *buf) { int left; unsigned long flags; left = DRM_LEFTCOUNT(bl); if (!left) { DRM_ERROR("Overflow while adding buffer %d from filp %p\n", buf->idx, buf->filp); return -EINVAL; } buf->list = DRM_LIST_WAIT; spin_lock_irqsave(&bl->write_lock, flags); *bl->wp = buf; if (++bl->wp >= bl->end) bl->wp = bl->bufs; spin_unlock_irqrestore(&bl->write_lock, flags); return 0; } drm_buf_t *DRM(waitlist_get)(drm_waitlist_t *bl) { drm_buf_t *buf; unsigned long flags; spin_lock_irqsave(&bl->read_lock, flags); buf = *bl->rp; if (bl->rp == bl->wp) { spin_unlock_irqrestore(&bl->read_lock, flags); return NULL; } if (++bl->rp >= bl->end) bl->rp = bl->bufs; spin_unlock_irqrestore(&bl->read_lock, flags); return buf; } int DRM(freelist_create)(drm_freelist_t *bl, int count) { atomic_set(&bl->count, 0); bl->next = NULL; init_waitqueue_head(&bl->waiting); bl->low_mark = 0; bl->high_mark = 0; atomic_set(&bl->wfh, 0); bl->lock = SPIN_LOCK_UNLOCKED; ++bl->initialized; return 0; } int DRM(freelist_destroy)(drm_freelist_t *bl) { atomic_set(&bl->count, 0); bl->next = NULL; return 0; } int DRM(freelist_put)(drm_device_t *dev, drm_freelist_t *bl, drm_buf_t *buf) { drm_device_dma_t *dma = dev->dma; if (!dma) { DRM_ERROR("No DMA support\n"); return 1; } if (buf->waiting || buf->pending || buf->list == DRM_LIST_FREE) { DRM_ERROR("Freed buffer %d: w%d, p%d, l%d\n", buf->idx, buf->waiting, buf->pending, buf->list); } if (!bl) return 1; buf->list = DRM_LIST_FREE; spin_lock(&bl->lock); buf->next = bl->next; bl->next = buf; spin_unlock(&bl->lock); atomic_inc(&bl->count); if (atomic_read(&bl->count) > dma->buf_count) { DRM_ERROR("%d of %d buffers free after addition of %d\n", atomic_read(&bl->count), dma->buf_count, buf->idx); return 1; } /* Check for high water mark */ if (atomic_read(&bl->wfh) && atomic_read(&bl->count)>=bl->high_mark) { atomic_set(&bl->wfh, 0); wake_up_interruptible(&bl->waiting); } return 0; } static drm_buf_t *DRM(freelist_try)(drm_freelist_t *bl) { drm_buf_t *buf; if (!bl) return NULL; /* Get buffer */ spin_lock(&bl->lock); if (!bl->next) { spin_unlock(&bl->lock); return NULL; } buf = bl->next; bl->next = bl->next->next; spin_unlock(&bl->lock); atomic_dec(&bl->count); buf->next = NULL; buf->list = DRM_LIST_NONE; if (buf->waiting || buf->pending) { DRM_ERROR("Free buffer %d: w%d, p%d, l%d\n", buf->idx, buf->waiting, buf->pending, buf->list); } return buf; } drm_buf_t *DRM(freelist_get)(drm_freelist_t *bl, int block) { drm_buf_t *buf = NULL; DECLARE_WAITQUEUE(entry, current); if (!bl || !bl->initialized) return NULL; /* Check for low water mark */ if (atomic_read(&bl->count) <= bl->low_mark) /* Became low */ atomic_set(&bl->wfh, 1); if (atomic_read(&bl->wfh)) { if (block) { add_wait_queue(&bl->waiting, &entry); for (;;) { current->state = TASK_INTERRUPTIBLE; if (!atomic_read(&bl->wfh) && (buf = DRM(freelist_try)(bl))) break; schedule(); if (signal_pending(current)) break; } current->state = TASK_RUNNING; remove_wait_queue(&bl->waiting, &entry); } return buf; } return DRM(freelist_try)(bl); }