Commit Graph

433 Commits (28f4bfa04b8ad4dfcc55027f4b2385f4dd6c23c5)

Author SHA1 Message Date
Ben Skeggs 28f4bfa04b nouveau: support for copy-less pushbuf ioctl 2009-08-18 15:55:42 +10:00
Ben Skeggs 250ab3a38e nouveau: for the moment, assert if we exceed some reloc limits
Nasty, but nicer than silently not writing into the pushbuf
2009-08-18 15:55:02 +10:00
Dave Airlie 1978f6d8d1 radeon: fix bo wait at map time. 2009-08-17 21:21:53 +10:00
Dave Airlie 1d465178fb radeon: fix GTT writing space check
Noticed by vehemens on irc.

Signed-off-by: Dave Airlie <airlied@redhat.com>
2009-08-15 21:32:35 +10:00
Anssi Hannula d74c67fb13 link libdrm_intel with -lrt for new use of clock_gettime().
Signed-off-by: Eric Anholt <eric@anholt.net>
2009-08-05 11:26:40 -07:00
Dave Airlie 4507863058 libdrm_radeon: add tiling support 2009-08-01 17:20:38 +10:00
Dave Airlie 322cf6cf73 radeon: don't map/unmap explicitly.
This caches the mapping and just use mapping as a sync point
2009-08-01 17:20:35 +10:00
Ben Skeggs 5a73f066ba nouveau: don't overwrite user-specified bo size needlessly 2009-07-28 20:59:05 +10:00
Ben Skeggs 0bf8fb3bce nouveau: user buffers need to be mappable 2009-07-28 20:59:05 +10:00
Ben Skeggs 001331f4f1 nouveau: drm api 0.0.15, update object header, remove fake bo support 2009-07-28 20:59:05 +10:00
Maarten Maathuis 30449829c0 libdrm/nouveau: unmap before ufree means nvbo->sysmem != NULL, which inbalances cpu_prep/cpu_finish
- The bo was mapped with sysmem == NULL, so this means cpu prep is called.
- The bo was unmapped with sysmem != NULL, so this means cpu finish is not called.
- This can lead to a non-zero "cpu writers" count in ttm_bo.
2009-07-27 19:24:13 +02:00
Eric Anholt 3f3c5be6f9 intel: Free buffers in the BO cache that haven't been reused in a while.
The goal of the BO cache is to keep buffers on hand for fast continuous use,
as in every frame of a game or every batchbuffer of the X Server.  Keeping
older buffers on hand not only doesn't serve this purpose, it may hurt
performance by resulting in disk cache getting kicked out, or even driving
the system to swap.

Bug #20766.
2009-07-09 20:17:53 -07:00
Ben Skeggs f257201c11 nouveau: fix pin for buffers created with bo_wrap 2009-07-09 11:41:47 +10:00
Pauli Nieminen c5a5bbbe89 libdrm: Make chown check for return value
If call was interrupted by signal we have to make call again.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2009-07-06 14:17:05 -07:00
Eric Anholt 78fa590a1d intel: Fix up math errors when allocating very large BOs.
The logbase2 would overflow and wrap the size around to 0, making the code
allocate a 4kb object instead.  By simplifying the code to just walk the
14-entry bucket array comparing sizes instead of indexing on
ffs(1 << logbase2(size)), we avoid silly math errors and have code of
approximately the same speed.

Many thanks to Simon Farnsworth for debugging and providing a working patch.
Bug #27365.
2009-07-06 13:11:03 -07:00
Edward O'Callaghan cea2d29ee4 intel: fix compiler warning about returning a void value.
bug #21999
2009-07-06 13:11:03 -07:00
Pauli Nieminen 90ae0f2bb8 libdrm: Fix pci id numbers to unsigned so code won't mix signed/unsigned integers. 2009-07-06 10:05:52 -07:00
Ian Romanick 015efd1bfa strcasecmp is in strings.h.
Based on patch by Pauli Nieminen.  Thanks.
2009-07-06 09:23:59 -07:00
Dave Airlie 39970c67b7 radeon: move cs space checking code to libdrm_radeon.
This ports a lot of the space checking code into a the common
library, so that the DDX and mesa can use it.
2009-07-06 15:10:11 +10:00
Jerome Glisse 72a29340ea radeon: fix cs buffer realloc padding
We always realloc at least 0x1000 dwords (page on most system)
when growing the cs buffer this is to avoid having to realloc
at each cs_begin.
2009-07-03 15:03:03 +02:00
Dave Airlie af90222c45 radeon: fix realloc of packets.
This should use ndw not cdw, using cdw leads to realloc alignment going wrong
2009-07-03 21:13:22 +10:00
Dave Airlie fbac5891b9 radeon: add buffer naming function 2009-07-02 15:42:01 +10:00
Dave Airlie de1ed01214 radeon: add support for write followed by read relocs.
the DDX does this and used to handle it internally
2009-06-30 12:19:28 +10:00
Dave Airlie 2fa2db138b libdrm/radeon: add initial libdrm_radeon
requires --enable-radeon-experimental-api for now
2009-06-17 17:47:42 +10:00
Ben Skeggs 3d4bfe8c89 nouveau: 0.0.14 + extend bo interface to support subrange mapping
Normal map() should operate as before, and map_range()/map_flush() should
give correct results but lacking any performance difference from map().

Nothing exiting being done here yet, but the interface is a good start.
2009-06-05 14:07:23 +10:00
Ben Skeggs 2cb4c64d73 nouveau: fix bo mapping issue 2009-06-04 09:01:32 +10:00
Ben Skeggs 00fae87f96 nouveau: fill in bo->tiled field for referenced buffers
Fixes the dri1 gallium driver if the front buffer happens to be non-linear.
2009-06-03 10:25:53 +10:00
Ben Skeggs c65a343ed2 nouveau: bump for 0.0.13 2009-05-26 15:47:14 +10:00
Eric Anholt f355ad8943 intel: quiet a warning. 2009-05-19 10:07:16 -07:00
Eric Anholt 469655fab7 intel: Only do BO caching up to 64MB objects.
This avoids making objects significantly bigger than they would be
otherwise, which would result in some failing at binding to the GTT.
Found from firefox hanging on:
http://upload.wikimedia.org/wikipedia/commons/b/b7/Singapore_port_panorama.jpg
due to a software fallback trying to do a GTT-mapped copy between two 73MB
BOs that were instead each 128MB, and failing because both couldn't fit
simultaneously.

The cost here is that we get no opportunity to cache these objects and
avoid the mapping.  But since the objects are a significant percentage
of the aperture size, each mapped access is likely having to fault and rebind
the object most of the time anyway.

Bug #20152 (2/3)
2009-05-19 10:05:38 -07:00
Keith Packard f57d7f4b0b libdrm/intel: Make get_pipe_from_crtc_id per-bufmgr. Return -1 on failure.
The convention is that all APIs are per-bufmgr, so make this one the same.
Then, have it return -1 on failure so that the application can know what's
going on and do something sensible.

Signed-off-by: Keith Packard <keithp@keithp.com>
2009-05-14 16:58:14 -07:00
Carl Worth afd245dd7f Add new drm_intel_get_pipe_from_crtc_id function.
This wraps the new DRM_IOCTL_I915_GET_PIPE_FROM_CRTC_ID ioctl,
allowing applications to discover the pipe number corresponding
to a given CRTC ID. This is necessary for doing pipe-specific
operations such as waiting for vblank on a given CRTC.
2009-05-14 15:32:54 -07:00
Keith Packard 5b5ce30128 libdrm/intel: add drm_intel_bo_disable_reuse api
Scanout buffers need to be freed through the kernel as it holds a reference
to them; exposing this API allows applications allocating scanout buffers to
flag them as not reusable.

Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
2009-05-12 18:19:22 -07:00
Alan Coopersmith 1bae8844ca Delete extra libdrm_lists.h line after libdrm_la_SOURCES in libdrm/Makefile.am
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
2009-05-09 17:22:17 -07:00
Keith Packard 68103b2758 libdrm/intel: assert that clients are using bo refcounting correctly
Add assertions to drm_intel_gem_bo_reference,
drm_intel_gem_bo_reference_locked and drm_intel_gem_bo_unreference_locked
that the object has not been freed (refcount > 0). Mistakes in refcounting
lead to attempts to insert a bo into a free list more than once which causes
application failure as empty free lists are dereferenced as buffer objects.

Signed-off-by: Keith Packard <keithp@keithp.com>
2009-05-01 18:49:59 -07:00
Jesse Barnes 11b60973bc intel: NULL fake bo block when freeing in evict_all
Fixes assertion failures on later use of the object.
2009-04-27 11:49:16 -07:00
Dave Airlie 412d370b9a libdrm/mode: align subpixel results 2009-04-22 20:25:40 +10:00
Ben Skeggs a1e3ab9e55 nouveau: write posting got lost somewhere, bring it back 2009-04-17 09:29:19 +10:00
Ben Skeggs 78e753d033 nouveau: store bo handle in public struct in bo_ref_handle 2009-04-15 12:44:21 +10:00
Jesse Barnes 3637dcc66d Revert "libdrm: speed up connector & mode fetching"
This reverts commit cd5c66c659.  It broke too
many kernel assumptions about the double ioctl (connector status, mode
fetching, etc.)
2009-04-10 15:24:10 -07:00
Jesse Barnes cd5c66c659 libdrm: speed up connector & mode fetching
This patch speeds up drmModeGetConnector by pre-allocating mode &
property info space before calling into the kernel.  In many cases this
pre-allocation will be sufficient to hold the returned values (it's easy
enough to tweak if the common case becomes larger), which means we don't
have to make the second call, which saves a lot of time.

Acked-by: Jakob Bornecrantz <wallbraker@gmail.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
2009-03-30 14:37:04 -07:00
Jesse Barnes e2d7dfb61a libdrm/intel: support GTT maps correctly
libdrm has some support for GTT mapping already, but there are bugs
with it (no surprise since it hasn't been used much).

In fixing 20803, I found that sharing bo_gem->virtual was a bad idea,
since a previously mapped object might not end up getting GTT mapped,
leading to corruption.  So this patch splits the fields according to
use, taking care to unmap both at free time (but preserving the map
caching).

There's still a risk we might run out of mappings (there's a sysctl
tunable for max number of mappings per process, defaulted to 64k or so
it looks like) but at least GTT maps will work with these changes (and
some others for fixing PAT breakage in the kernel).

Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
2009-03-26 16:43:00 -07:00
Ben Skeggs d6ad0dba01 libdrm/nouveau: fix typo in nouveau_device_close() 2009-03-25 08:10:12 +10:00
Ben Skeggs 98b0df3953 libdrm/nouveau: ask the kernel for vram/gart aperture sizes 2009-03-20 10:41:28 +10:00
Ben Skeggs bad16a6b22 libdrm/nouveau: remove unneccesary null ptr checks 2009-03-20 10:32:47 +10:00
Ben Skeggs c37fca4ef6 libdrm/nouveau: incr refcount on ref fence before decr on old fence 2009-03-20 10:25:16 +10:00
Maarten Maathuis 00d8e960ca libdrm/nouveau: unref fences when deleting bo
- This was causing a significant memory leak.
2009-03-20 00:02:12 +01:00
Ben Skeggs 6169e3a601 libdrm/nouveau: implement bo_handle_get for !mm_enabled
bo_handle_ref on !mm_enabled treats handle as an offset, make
bo_handle_get do the same rather than failing.
2009-03-18 10:25:22 +10:00
Robert Noland 2e2e8575b1 libdrm_nouveau: The handle that is passed to mmap needs to be drm_handle_t
drm_handle_t is defined to be a u32 on linux and a u64 on everything
else.  This addresses an issue on FreeBSD amd64 where the map offsets
may be greater than 32bits.  When the handle is cast to 32bit, mmap
cannot match the requested map and causes X to crash.

This should be a NOOP on linux since drm_handle_t is always 32bit.

Signed-off-by: Robert Noland <rnoland@2hip.net>
2009-03-16 01:20:08 -05:00
Eric Anholt 7ce8d4c1fe intel: Update reloc_tree_size of the first buffer when we count the tree size.
This helps avoid the n^2 performance cost of counting tree size when we
get a lot of relocations into our batch buffer.  rgb10text on keithp's laptop
went from 136k glyphs/sec to 234k glyphs/sec.
2009-02-27 14:12:54 -08:00