summaryrefslogtreecommitdiff
path: root/libdrm
AgeCommit message (Collapse)Author
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-12mode: Minor reodering and renamingJakob Bornecrantz
2008-11-12mode: Unify userspace API to uint_tJakob Bornecrantz
2008-11-12mode: Remove hotplug support from ioctl interfaceJakob Bornecrantz
2008-11-12radeon+libdrm-radeon: change relocation informationsJerome Glisse
Relocation now consist of the following informations (in this order) : handle buffer object handle identifier start_offset start offset of first data of the buffer object used by the cs end_offset end offset of last data of the buffer object used by the cs read_domain read domain (either VRAM, or GTT as GPU is invalid for CS) write_domain write domain (either VRAM, or GTT as GPU is invalid for CS) flags flags used for further optimization (like discard previous buffer content or forget buffer content after cs which can help in avoiding moving content in or out)
2008-11-10libdrm-radeon: be verbose on bo failure and cleanup cs a bitJerome Glisse
2008-11-09libdrm-radeon: update libdrm-radeon to match current CS relocation structuresJerome Glisse
2008-11-07intel: Restart on interrupt of bo_wait_rendering instead of complaining.Eric Anholt
2008-11-06radeon: lib radeon add bo & cs gem backendJerome Glisse
2008-11-05radeon: libdrm_radeon add handle to debug stringJerome Glisse
2008-11-02radeon: debug boJerome Glisse
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-29radeon: libdrm_radeon updates bo & cs interfacesJerome Glisse
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-27radeon: reloc are backend dependantJerome Glisse
2008-10-27Merge branch 'modesetting-gem' of ssh://git.freedesktop.org/git/mesa/drm ↵Jerome Glisse
into modesetting-gem
2008-10-27radeon: radeon util libraryJerome Glisse
2008-10-24mode: Try to settle on a standard for struct fieldsJakob Bornecrantz
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-17libdrm: don't depend or link to libdrm_intelDave Airlie
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-13libdrm: don't depend or link to libdrm_intelDave Airlie
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-10Add missing \ to libdrm_la_SOURCESEric Anholt
Reported by jcristau.
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-24libdrm: add udev support.Dave Airlie
This patch allows you to --enable-udev, and will avoid having libdrm make device nodes. If you are using udev, you should really --enable-udev your libdrm.
2008-08-18Change prototype of drmIoctl to unsigned long request.Coleman Kane
This resolves and issue on amd64 FreeBSD and it looks like the linux ioctl syscall should be unsigned long as well. Signed-off-by: Robert Noland <rnoland@2hip.net>
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