Commit Graph

6160 Commits (290d29d9794813a2fe0578dbb905ad09bc810516)

Author SHA1 Message Date
Jerome Glisse 7651b4c424 radeon: debug bo 2008-11-02 16:00:06 +01:00
Pekka Paalanen 87e90c7362 nouveau: compat fix for set_page_locked().
The set_page_locked() function has changed its name again.
2.6.28 offers __set_page_locked() instead, which uses non-atomic
__set_bit() to do the work. In this case, offer our own
set_page_locked() using the atomic set_bit(), because I do not know
if atomic access is really necessary. Atomic behaviour is the one
previously expected.

Signed-off-by: Pekka Paalanen <pq@iki.fi>
2008-11-02 13:55:23 +02:00
Eric Anholt 00847dabe0 libdrm 2.4.1. 2008-10-30 11:36:46 -07:00
Eric Anholt 4b9826408f intel: Rename dri_ and intel_ symbols to drm_intel_.
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-30 11:29:40 -07:00
Jerome Glisse 40c64eb524 Merge branch 'modesetting-gem' of ssh://git.freedesktop.org/git/mesa/drm into modesetting-gem 2008-10-29 23:41:48 +01:00
Jerome Glisse 5d861951b3 radeon: libdrm_radeon updates bo & cs interfaces 2008-10-29 23:40:20 +01:00
Jesse Barnes 1db35ba583 libdrm: fix ABI change in drm_mode_get_encoder
The encoder_type field should be at the top to match the kernel.
2008-10-29 12:18:15 -07:00
Eric Anholt 0e86731232 intel: Add dri_bufmgr_check_aperture support for bufmgr_gem.
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-28 14:27:49 -07:00
Ben Skeggs e47ab7a508 nv50: symlink nv50_grctx.h to linux-core... 2008-10-28 12:00:08 +11:00
Ben Skeggs 48b73904b4 nv50: move context-related tables a separate header file
This turns the various nvXX_graph_init_ctxvals() methods into tables,
and speeds up compliation of nv50_graph.c quite a bit.  This has bothered
me for a while, but others are complaining now so it's time to fix it :)
2008-10-28 11:56:07 +11:00
Jerome Glisse af118cd186 radeon: reloc are backend dependant 2008-10-27 23:26:15 +01:00
Pekka Paalanen 89ef1b5483 drm: missing init_mm symbol, compatibility fix
The drm_compat.c version of kmap_atomic_prot_pfn() uses the macro
pgd_offset_k(), which references the symbol init_mm.
Starting in 2.6.25, init_mm is no longer exported by default.

The only user of kmap_atomic_prot_pfn() is i915, so this should
not hurt anyone, and it allows people to load drm.ko.

Signed-off-by: Pekka Paalanen <pq@iki.fi>
2008-10-27 21:21:15 +02:00
Robert Noland 145d2d610b i915: Since FreeBSD doesn't have gem support yet, don't advertise it.
This allows us to not crash X when using newer Intel ddx drivers.
2008-10-27 14:39:05 -04:00
Jerome Glisse 3b17b50e9c Merge branch 'modesetting-gem' of ssh://git.freedesktop.org/git/mesa/drm into modesetting-gem 2008-10-27 19:33:56 +01:00
Jerome Glisse 7617d1fef7 radeon: radeon util library 2008-10-27 19:27:15 +01:00
Alex Deucher e1372f6727 radeon: fix error in busmaster enable logic
- logic was wrong.  rs400/rs480 should clear the RADEON_BUS_MASTER_DIS bit
- should fix kernel bug 11798
2008-10-27 13:18:07 -04:00
Alex Deucher 848f00d773 radeon: fix some fallout from the busmaster disable cleanup
rs400 is just like rs480.  I mixed up the internal
chipset names for rs600 and rs400.
2008-10-27 12:59:39 -04:00
Dave Airlie 389b7617b5 drm: make handles 32-bits again not sure why they changed 2008-10-27 17:06:23 +10:00
Matthias Hopf 1d930fc75b drm/i915: fix ioremap of a user address for non-root (CVE-2008-3831)
Olaf Kirch noticed that the i915_set_status_page() function of the i915
kernel driver calls ioremap with an address offset that is supplied by
userspace via ioctl. The function zeroes the mapped memory via memset
and tells the hardware about the address. Turns out that access to that
ioctl is not restricted to root so users could probably exploit that to
do nasty things. We haven't tried to write actual exploit code though.

It only affects the Intel G33 series and newer.
2008-10-25 12:15:50 -04:00
Jakob Bornecrantz 34a3ebffc3 mode: Try to settle on a standard for struct fields 2008-10-24 18:46:47 +02:00
Jakob Bornecrantz 0796bf8c6b mode: Indent defines 2008-10-24 18:23:39 +02:00
Xiang, Haihao b7d54b1dba intel: Also total child_size of the target_bos. Partial fix #17964. 2008-10-24 16:41:54 +08:00
Robert Noland 8256c347cc [FreeBSD] We should use dev2unit() rather than minor() 2008-10-23 15:46:32 -04:00
Robert Noland 7dbeb18777 [FreeBSD] This check isn't correct and causes at least mga to lockup. 2008-10-23 15:42:49 -04:00
Keith Packard a59ea02ff8 intel: ioctl is not defined to return -errno
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-16 23:54:19 -07:00
Dave Airlie 4c8aeb6fc7 link libdrm_intel properly
libdrm_intel needs symbols from libdrm, so link against it.
(cherry picked from commit d9c2f65dd8)

Conflicts:

	libdrm/Makefile.am
2008-10-17 06:40:38 +10:00
Dave Airlie 9dda3a8f63 libdrm: don't depend or link to libdrm_intel 2008-10-17 06:39:58 +10:00
Eric Anholt 6df7b0719f intel: Protect bufmgr objects with a pthread mutex.
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-17 06:38:57 +10:00
Xiang, Haihao 769197c8f1 intel: avoid deadlock in intel_bufmgr_fake. 2008-10-16 10:37:30 +08:00
Dave Airlie 26076bf24a radeon: add initial agp support.
This add agpmode command line option.
2008-10-16 10:59:31 +10:00
Dave Airlie 8d9a11c55c radeon: add CS support for r100/r200 in 2D driver 2008-10-16 10:57:31 +10:00
Dave Airlie 66740cbd54 radeon: fixup interrupt suspend/resume 2008-10-16 10:55:24 +10:00
Dave Airlie 318770a78d radeon: fixup suspend/resume bus master enable 2008-10-16 10:53:55 +10:00
Dave Airlie 9c5819fc60 radeon: re-enable hw blits for copying from VRAM 2008-10-16 10:53:26 +10:00
Dave Airlie b18e6b0a0d radeon: fix buffer copying for VRAM->TT 2008-10-16 10:52:53 +10:00
Dave Airlie 3e3280eccc radeon: move memcpy until after CP is stopped 2008-10-16 10:52:28 +10:00
Dave Airlie 09f99dc5fe drm: remove stray debug code 2008-10-16 10:51:56 +10:00
Dave Airlie d958cd7bb9 radeon: use discardable flags on no backing store objects 2008-10-16 10:51:31 +10:00
Dave Airlie 11320fd6b1 drm: add discardable flag.
This discards memory contents on suspend/resume with the
hope the upper layers know something we don't.
2008-10-16 10:50:31 +10:00
Dave Airlie fc33686ef0 drm/radeon: initial suspend/resume fix.
This enables the evict code and also sets radeon up
to allow evict from VRAM to LOCAL
2008-10-16 10:49:58 +10:00
Eric Anholt 458e2d5bc5 intel: Fix compile warning. 2008-10-14 13:33:38 -07:00
Eric Anholt 993383873c intel: Add interface for getting tiling mode of a bo. 2008-10-14 13:23:04 -07:00
Julien Cristau d9c2f65dd8 link libdrm_intel properly
libdrm_intel needs symbols from libdrm, so link against it.
2008-10-13 16:39:33 -07:00
Eric Anholt 3e03d781f7 intel: Avoid pthread mutex recursion in bufmgr_fake.
Bug #18035. Fixes deadlock in glean texCube testcase.
2008-10-13 13:41:10 -07:00
Dave Airlie c6109df93b libdrm: don't depend or link to libdrm_intel 2008-10-13 07:16:33 +10:00
Robert Noland f5327aca0c [FreeBSD] Plug memory leak in drm_rmdraw() and drm_drawable_free_all() 2008-10-10 18:23:11 -04:00
Robert Noland cdd3e9fc56 [FreeBSD] Rework all of the memory allocations
Allocate memory from different pools.  This allows the OS to track memory
allocations for us, much like the linux memory debugging.  This will ease
tracking down memory leaks since the OS can track the number of allocations
from each pool and help to point us in the right direction.  Also replace
drm_alloc and friends with static __inline__ versions while we are here.
2008-10-10 13:06:22 -04:00
Robert Noland 1150a42d43 [FreeBSD] Fix linux list compat list_for_each_safe()
linux_for_each_safe would not handle lists with a single entry.
2008-10-09 22:13:26 -04:00
Robert Noland a8f73c214d i915: Cleanup interrupt handling 2008-10-09 22:11:55 -04:00
Keith Packard 94c88c151c Manage fences in user-mode bufmgr_fake to clean buffers
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-09 18:25:58 -07:00