summaryrefslogtreecommitdiff
path: root/libdrm/intel
AgeCommit message (Collapse)Author
2008-12-10Revert "Merge branch 'modesetting-gem'"Jesse Barnes
This reverts commit 6656db10551bbb8770dd945b6d81d5138521f208. We really just want the libdrm and ioctl bits, not all the driver stuff.
2008-12-03Merge branch 'master' into modesetting-gemJesse Barnes
2008-12-02intel: Add a function for setting (GTT,GTT) domain, for use by UXA.Eric Anholt
This function can also serve the role that the bo_wait_rendering did, when write_enable is unset.
2008-11-19libdrm_intel: fix merge errorJesse Barnes
don't take the lock twice
2008-11-13Merge branch 'master' into modesetting-gemJesse Barnes
Conflicts: libdrm/Makefile.am libdrm/intel/intel_bufmgr.h libdrm/intel/intel_bufmgr_fake.c libdrm/intel/intel_bufmgr_gem.c shared-core/drm.h shared-core/i915_dma.c shared-core/i915_irq.c shared-core/radeon_cp.c shared-core/radeon_drv.h
2008-11-13libdrm_intel: fix warnings on 64 bitJesse Barnes
Cast a couple of %llx args to unsigned long long.
2008-11-13libdrm: add support for i915 GTT mapping ioctlJesse Barnes
Add a drm_intel_gem_bo_map_gtt() function for mapping a buffer object through the aperture rather than directly to its CPU cacheable memory.
2008-11-07intel: Restart on interrupt of bo_wait_rendering instead of complaining.Eric Anholt
2008-10-30intel: Rename dri_ and intel_ symbols to drm_intel_.Eric Anholt
I wanted to avoid doing this, as it's a bunch of churn, but there was a conflict between the dri_ symbols in libdrm and the symbols that were in Mesa in 7.2, which broke Mesa 7.2 AIGLX when the 2D driver had loaded new libdrm symbols. The new naming was recommended by cworth for giving the code a unique prefix identifying where the code lives. Additionally, take the opportunity to fix up two API mistakes: emit_reloc's arguments were in a nonsensical order, and set_tiling lacked the stride argument that the kernel will want to use soon. API compatibility with released code is maintained using #defines.
2008-10-28intel: Add dri_bufmgr_check_aperture support for bufmgr_gem.Eric Anholt
This relies on a new kernel ioctl to get the available aperture size. In order to provide reasonable performance from dri_bufmgr_check_aperture, we now require that once a buffer has been used as the target of a relocation, it gets no further relocations added to it. This cuts the cost of check_aperture from 10% to 1% in the 3D driver with no code changes, but slightly complicates our plans for the 2D driver.
2008-10-24intel: Also total child_size of the target_bos. Partial fix #17964.Xiang, Haihao
2008-10-16intel: ioctl is not defined to return -errnoKeith Packard
Don't count on ioctl returning -errno; use errno directly. Signed-off-by: Keith Packard <keithp@keithp.com> Signed-off-by: Eric Anholt <eric@anholt.net>
2008-10-17link libdrm_intel properlyDave Airlie
libdrm_intel needs symbols from libdrm, so link against it. (cherry picked from commit d9c2f65dd8e50736a33e97a55c257ef6843e1ce7) Conflicts: libdrm/Makefile.am
2008-10-17intel: Protect bufmgr objects with a pthread mutex.Eric Anholt
We want to be able to use the bufmgr from multiple threads for GL, and thus we need to protect the internal structures. The pthread-stubs package is used so that programs not linked against pthreads get weak symbols to stubs and don't eat most of the cost.
2008-10-16intel: avoid deadlock in intel_bufmgr_fake.Xiang, Haihao
2008-10-14intel: Fix compile warning.Eric Anholt
2008-10-14intel: Add interface for getting tiling mode of a bo.Eric Anholt
2008-10-13link libdrm_intel properlyJulien Cristau
libdrm_intel needs symbols from libdrm, so link against it.
2008-10-13intel: Avoid pthread mutex recursion in bufmgr_fake.Eric Anholt
Bug #18035. Fixes deadlock in glean texCube testcase.
2008-10-09Manage fences in user-mode bufmgr_fake to clean buffersKeith Packard
When using bufmgr_fake without DRM, the X server idles the ring whenever it wants to wait for something to complete (brutal, but effective). In this case, bufmgr_fake must treat the pending fence as having passed. However, it wasn't recording the fences as it emitted them, nor cleaning buffers as they passed. Signed-off-by: Keith Packard <keithp@keithp.com>
2008-10-09intel: Protect bufmgr objects with a pthread mutex.Eric Anholt
We want to be able to use the bufmgr from multiple threads for GL, and thus we need to protect the internal structures. The pthread-stubs package is used so that programs not linked against pthreads get weak symbols to stubs and don't eat most of the cost.
2008-10-09intel: fix for write_domain and static BOs.Xiang, Haihao
http://bugs.freedesktop.org/show_bug.cgi?id=17705
2008-09-30intel bufmgr: reinstate buffer handle trackingJesse Barnes
We need a way of getting at the underlying handle for use with mode setting. We can either export it in the dri_bo object or provide a new callback to get it.
2008-09-30Merge remote branch 'origin/master' into modesetting-gemDave Airlie
Conflicts: libdrm/Makefile.am libdrm/dri_bufmgr.h linux-core/drm_irq.c linux-core/drm_sysfs.c linux-core/drm_ttm.c shared-core/i915_dma.c shared-core/i915_irq.c shared-core/nouveau_drv.h shared-core/radeon_cp.c
2008-09-27intel: Copy data from card memory back to backing store when mapping.Xiang, Haihao
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=17705
2008-09-23intel: Allow up to 15 seconds chewing on one buffer before acknowledging -EBUSY.Eric Anholt
The gltestperf demo in some cases took over seven seconds to make it through one batchbuffer on a GM965. Bug #17004.
2008-09-23intel: Replace wraparound test logic in bufmgr_fake. Again.Eric Anholt
I'd swapped the operands, so if we weren't in lockstep with the hardware we said the sequence was always passed. Additionally, a race was available that we might have failed at recovering from. Instead, I've replaced the logic with new stuff that should be more robust and not rely on all the parties in userland following the same IRQ_EMIT() == 1 protocol. Also, in a radical departure from past efforts, include a long comment describing the failure modes and how we're working around them. Thanks to haihao for catching the original issue.
2008-09-23intel: Do strerror on errno, not on the -1 return value from ioctl.Eric Anholt
2008-09-22intel: Fix driver-supplied argument to exec function (fd.o bug #17653).Xiang, Haihao
2008-09-10intel: don't forget to include config.h in bufmgr code.Eric Anholt
Thanks to airlied for catching this.
2008-09-10intel: move drm calls to exec buffers to libdrm_intel.Eric Anholt
This avoids duplicating the effort in 3 places. Also, added emit/wait fence callbacks back in bufmgr_fake since we need it for non-drm 2d. Sigh.
2008-09-10intel: Move IRQ emit/wait from callbacks into the bufmgr.Eric Anholt
In the process, work around the glaring bugs of the kernel irq wait function.
2008-09-10Move intel libdrm stuff to libdrm_intel.soEric Anholt
dri_bufmgr.h is replaced by intel_bufmgr.h, and several functions are renamed, though the structures and many functions remain dri_bufmgr_* and dri_bo_*
2008-08-26[intel_bufmgr_gem] Remember global name when creating buffer from name.Kristian Høgsberg
2008-08-14Merge branch 'radeon-gem-cs' into modesetting-gemDave Airlie
Conflicts: libdrm/xf86drm.c linux-core/Makefile.kernel linux-core/drmP.h linux-core/drm_compat.h linux-core/drm_drv.c linux-core/drm_stub.c linux-core/drm_vm.c shared-core/i915_dma.c shared-core/r300_cmdbuf.c shared-core/radeon_drv.h
2008-08-13Merge branch 'master' into modesetting-gemJesse Barnes
Conflicts: libdrm/Makefile.am libdrm/xf86drm.h shared-core/i915_dma.c shared-core/i915_irq.c
2008-08-12[intel_bufmgr_gem] Fix flink buffer name caching (#17085, #17092).Kristian Høgsberg
Store the global name in global_name, don't overwrite the gem_handle.
2008-08-12Export a generic dri_bo handle for use by clientsJesse Barnes
We'll need something like this (either a handle field or a dri_bo_get_handle function) for kernel mode setting to get at the handles.
2008-08-11libdrm: Allow build outside of source tree.Matthieu Herrb
2008-08-08Drop TTM interfaces from the userland library.Eric Anholt
2008-08-08Fix compile warning from check_aperture change.Eric Anholt
2008-08-08Replace the check_aperture API with one we can make thread-safe.Eric Anholt
While the bufmgr isn't thread-safe at the moment, we need it to be for shared objects between contexts.
2008-08-07Make flink save the kernel-assigned name and return it instead of creating ↵Keith Packard
another name
2008-08-04Expose pin/unpin/set_tiling/flink APIsKeith Packard
2008-07-31drm: userspace rip out TTM APIDave Airlie
2008-06-24[intel-gem] Use I915_GEM_DOMAIN_GTT in dri_gem_bo_wait_rendering.Keith Packard
I915_GEM_DOMAIN_CPU is very expensive to wait for -- it generally requires clflushing the frame buffer.
2008-06-20[intel-gem] Add DRM_IOCTL_I915_GEM_SW_FINISH to flag CPU writesKeith Packard
When a software fallback has completed, usermode must notify the kernel so that any scanout buffers can be synchronized. This ioctl should be called whenever a fallback completes to flush CPU and chipset caches.
2008-06-13[gem] Catch -EINTR from blocking ioctls and restart them.Eric Anholt
Thanks to Thomas Hellstrom for catching the issue, no thanks to the kernel developer who authoritatively told me that they would get restarted on their own.
2008-06-11Move the renaming of mm.c symbols to #defines in the header.Eric Anholt
This reduces the diff from Mesa and reduces the illegibility of what I did.
2008-06-11[gem] Move potentially device-specific ioctls to the intel driver.Eric Anholt
This is the create (may want location flags), pread/pwrite/mmap (performance tuning hints), and set_domain (will 32 bits be enough for everyone?) ioctls. Left in the generic set are just flink/open/close. The 2D driver must be updated for this change, and API but not ABI is broken for 3D. The driver version is bumped to mark this.