Commit Graph

4520 Commits (0a24654129847cf5cd61b5e8fb54c8f9c7441c55)

Author SHA1 Message Date
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
Pekka Paalanen d7c42ff4c4 Fix build on kernels < 2.6.26
The commit 651e3dc6dd, "drm: Fix
compilation on 2.6.30" broke all builds on kernels before 2.6.26.
Variadic functions cannot be inlined.

The variadic inline function is replaced with a variadic macro.

Also, the function dev_name() added by that same commit is never used,
so it is removed.

Signed-off-by: Pekka Paalanen <pq@iki.fi>
2009-06-03 22:30:42 +03: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 dbffeadcfc nv50: magic fix for "3d busted without the binary driver first" issue
No idea what this reg does.. NVIDIA put 0x802 into it on some chips, the
criteria aren't too clear on when they do that however.  Hopefully 0x800
will work everywhere...
2009-06-02 17:06:34 +10:00
Michael Buesch 651e3dc6dd drm: Fix compilation on 2.6.30
This fixes DRM compilation of nouveau.ko on kernel 2.6.30.

Signed-off-by: Michael Buesch <mb@bu3sch.de>
2009-05-28 17:26:37 +10:00
Ben Skeggs c65a343ed2 nouveau: bump for 0.0.13 2009-05-26 15:47:14 +10:00
Danny Tholen 85b9f737db nouveau: backlight support for ppc laptops
Patch allows the backlight to be manipulated under gnome on apple powerpc
based NV30 machines.  It works fine on my powerbook, and should also work
for older NV17/NV18 machines.

Note that older powerpc specific tools (pbbuttonsd) have some problems with
this implementation (because the device is not yet there at the start time
of the daemon, and the code makes incorrect assumptions about the max
brightness values). However, IMHO these things can and should be addressed
in the daemon.

Some style/warning fixes applied by Stuart Bennett <stuart@freedesktop.org>
2009-05-22 15:43:26 +01: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 8b8e20e0f9 Bump to version 2.4.10 to mark addition of drm_intel_bo_disable_reuse
New API, new version.

Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
2009-05-12 18:19:22 -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 628dc48a16 Use C99 versions of __FUNCTION__ & __volatile__ when not building with gcc 2009-05-10 15:35:03 -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
Stuart Bennett 94d48d0385 nouveau: backlight compat fix
Avoid failure to build on old kernels with CONFIG_BACKLIGHT_CLASS_DEVICE set
2009-05-07 01:00:41 +01:00
Danny Tholen e2b5fde7f6 nouveau: fix ppc for swab changes in Linux 2.6.29 2009-05-07 01:00:41 +01: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 07646002c6 Bump version to 2.4.9
Who needs 2.4.8 anyway?
2009-04-10 15:34:24 -07:00
Jesse Barnes 4d5e82e7d3 Bump version to 2.4.8 2009-04-10 15:24:41 -07: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
Kristian Høgsberg fef29358bb Bump version to 2.4.7 2009-04-09 15:19:10 -04:00
Kristian Høgsberg ec9b7b320a test: Avoid recursive dependency in makefile 2009-04-09 15:17:51 -04:00
Kristian Høgsberg a85e07b903 test: Makefile.am grammar nazi 2009-04-09 15:02:40 -04:00
Dave Airlie 1faab66cfd drm: fix test makefile
no idea if this is correct but it works so meh
2009-04-07 09:26:32 +10:00
Kristian Høgsberg 751db3fe27 Skip tests that require root
This lets us do make distcheck as non-root.
2009-04-06 17:22:10 -04:00
Kristian Høgsberg 8a5c4d567f XFAIL auth and lock test cases
They're writing to the read end of a pipe and failing.
2009-04-06 17:18:17 -04:00
Kristian Høgsberg e9d6116e5b Use libudev in test case to only run gem tests for intel devices. 2009-04-06 17:13:01 -04:00
Robert Noland 51d6346f9f Move drm_vblank_cleanup() after lastclose.
This may prevent a possible panic on shutdown.
2009-03-31 13:36:04 -05: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
Stuart Bennett 93e6527160 nouveau: nForce 1/2 IGP memory sanity check from DDX 2009-03-30 20:48:08 +01:00
Jesse Barnes 2ada855022 libdrm: bump version to 2.4.6
This version includes GTT unmap support for the Intel bufmgr.
2009-03-30 11:25:09 -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
Stuart Bennett c9cfeaa554 nouveau: plug drm fifo ioremap leak (#14941) 2009-03-25 02:50:34 +00:00
Stuart Bennett 03ca202fa5 nouveau: add linux compat defines for PCI config access, use them for nvidia IGPs 2009-03-25 02:50:34 +00:00
Stuart Bennett b71f3f114e nouveau: use PFB_CSTATUS naming from ddx (reg introduced with nv10)
NV04 had a PFB_FIFO_DATA at the same address, which we don't use, so
remove it to reduce confusion
2009-03-25 02:50:34 +00: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
Robert Noland e8d3476255 FreeBSD: Set up the nouveau build infrastructure
disabled by default until the rest of the patches are in.
2009-03-16 01:17:00 -05:00
Robert Noland dec955d728 FreeBSD: Add support for matching solely on vedor id.
This also adds that ability to set device name from VPD, but that
doesn't seem to be working...
2009-03-16 00:41:23 -05:00