fdo-mirrors/mesa-drm
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/drm.git synced 2025-12-20 18:40:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
4362 commits 99 branches 412 tags 16 MiB
Commit graph

59 commits

Author SHA1 Message Date
Pekka Paalanen
0054e14793 drm_compat: remove kmap_atomic_prot_pfn() 
This function is unused, and yet creates build problems: the symbol
init_mm is not exported by the latest -rc kernels and I don't believe it
ever will be. Even CONFIG_UNUSED_SYMBOLS does not provide it anymore.

If this function is needed in the future, it needs to be reinvented in
any case. So remove it.

Signed-off-by: Pekka Paalanen <pq@iki.fi>
 2009-02-16 20:45:16 +02:00
Jesse Barnes
9583c099b4 Revert "Merge branch 'modesetting-gem'" 
This reverts commit 6656db1055.

We really just want the libdrm and ioctl bits, not all the driver
stuff.
 2008-12-10 15:50:22 -08:00
Jesse Barnes
8074b2e83d Make modesetting-gem build with recent kernels 
Needed to merge in VM fault changes & pci_read_base API update.
 2008-08-07 17:15:50 -07:00
Dave Airlie
10d5b037b8 drm: add fault handler support so as to be more like possible upstream 2008-07-31 13:12:36 +10:00
Dave Airlie
df9871064e radeon: add initial atombios modesetting and GEM -> TTM translation layer. 
This is an initial import of the atom bios parser with modesetting support
for r500 hw using atombios. It also includes a simple memory manager
layer that translates a radeon GEM style interface onto TTM internally.

So far this memory manager has only been used for pinned object allocation
for the DDX to test modesetting.
 2008-07-26 08:56:23 +10:00
Alan Hourihane
eeff906aa0 Fix build problems 2008-05-09 16:36:28 +01:00
Dave Airlie
ef204fb5c2 Merge remote branch 'origin/master' into modesetting-101 
Conflicts:

	linux-core/Makefile.kernel
	shared-core/i915_drv.h
 2008-05-08 10:25:01 +10:00
Dave Airlie
b44f2da380 drm: nopage compat fixup for drm_vm 
The kernel has removed nopage so move the old nopage codepaths into a compat vm file and switch to using the fault paths.

nopfn is on its way out in the future also, so we should switch to using fault
for that path as well soon
 2008-05-07 15:10:23 +10:00
Thomas Hellstrom
7f269bec7e Merge branch 'master' into modesetting-101 
Conflicts:

	linux-core/Makefile.kernel
	linux-core/drm_compat.c
	linux-core/drm_fops.c
	linux-core/drm_lock.c
	shared-core/drm.h
	shared-core/i915_dma.c
	shared-core/i915_drv.h
	shared-core/i915_irq.c
 2008-04-28 12:10:44 +02:00
Thomas Hellstrom
65dd0e68ff Fix up buffer manager locking. 2008-04-14 12:13:17 +02:00
Thomas Hellstrom
88bd1e4a35 Merge branch 'intel-post-reloc' 
Conflicts:

	linux-core/drm_compat.c
	linux-core/drm_compat.h
	linux-core/drm_ttm.c
	shared-core/i915_dma.c

Bump driver minor to 13 due to introduction of new
relocation type.
 2008-03-12 11:34:29 +01:00
Dave Airlie
f78cdac8e5 fixup previous merge 2008-03-05 15:28:59 +10:00
Dave Airlie
43891ff2d0 Merge remote branch 'origin/master' into modesetting-101 
Conflicts:

	linux-core/drm_compat.c
 2008-03-05 10:37:02 +10:00
Patrice Mandin
09999c90ab FIX_KMAP_BEGIN requires CONFIG_HIMEM (see include/asm-i386.h/fixmap.h) 2008-02-29 21:57:40 +01:00
Thomas Hellstrom
1d068973d5 Fix compilation breakage on x86-64. 2008-02-29 13:32:25 +01:00
Thomas Hellstrom
8ef838e5ff Add a compat kmap_atomic_prot_pfn to do quick kernel map / unmaps of 
PCI- or high memory.
This is substantially more efficient than drm_bo_kmap,
since the mapping only lives on a single processor.
Unmapping is done use kunmap_atomic(). Flushes only a single tlb() entry.

Add a support utility int drm_bo_pfn_prot() that returns the
pfn and desired page protection for a given bo offset.

This is all intended for relocations in bound TTMS or vram.
Mapping-accessing-unmapping must be atomic, either using preempt_xx() macros
or a spinlock.
 2008-02-28 14:06:46 +01:00
Thomas Hellstrom
40c9e6a26d Add a compat kmap_atomic_prot_pfn to do quick kernel map / unmaps of 
PCI- or high memory.
This is substantially more efficient than drm_bo_kmap,
since the mapping only lives on a single processor.
Unmapping is done use kunmap_atomic(). Flushes only a single tlb() entry.

Add a support utility int drm_bo_pfn_prot() that returns the
pfn and desired page protection for a given bo offset.

This is all intended for relocations in bound TTMS or vram.
Mapping-accessing-unmapping must be atomic, either using preempt_xx() macros
or a spinlock.
 2008-02-28 13:47:15 +01:00
Alan Hourihane
66cd6bd666 compatibility code for pci_get_bus_and_slot() 2008-02-20 19:55:14 +00:00
Alan Hourihane
7cc825f594 Add missing round_jiffies_relative() for older kernels 2008-02-05 10:10:36 +00:00
Pekka Paalanen
f5e5e5c0ea drm: One forgotten rename of 'mask' to 'proposed_flags'. 
Due to commit d1187641d6.
 2008-01-05 00:42:38 +02:00
Dave Airlie
7f6bf84c23 drm: remove lots of spurious whitespace. 
Kernel "cleanfile" script run.
 2007-11-05 12:42:22 +10:00
Thomas Hellstrom
3b19b50cb5 Remove the need for the hardware lock in the buffer manager. 
Add interface entry cleaning a memory type without touching NO_EVICT buffers.
 2007-10-21 12:20:56 +02:00
Brian
c453135789 Added idr_replace() function which was apparently added in Linux 2.6.18 
Someone should probably double-check my work here since this is the
first time I've touched drm_compat.[ch]
 2007-09-12 11:49:51 -06:00
Dave Airlie
23631fca09 drm: fixup old kernel compat code 2007-07-16 13:52:21 +10:00
Dave Airlie
be85ad0333 drm: detypedef ttm/bo/fence code 2007-07-16 13:37:02 +10:00
Dave Airlie
2c9e05cf4c Merge branch 'master' into cleanup 
Conflicts:

	libdrm/xf86drm.c
	linux-core/drm_bo.c
	linux-core/drm_fence.c
 2007-07-11 11:23:41 +10:00
Thomas Hellstrom
b6b5df24b9 Try to make buffer object / fence object ioctl args 64-bit safe. 
Introduce tile members for future tiled buffer support.
Allow user-space to explicitly define a fence-class.
Remove the implicit fence-class mechanism.
64-bit wide buffer object flag member.
 2007-06-12 12:21:38 +02:00
Dave Airlie
280083d4a2 use krh's idr mods to remove lists from idr code 2007-06-10 15:40:21 +10:00
Dave Airlie
7426da7538 oops must fix this properly at some point 2007-06-07 18:45:00 +10:00
Dave Airlie
e22f428f5f drm: fix radeon setparam alignment issues on 32/64-bit 2007-06-07 18:41:18 +10:00
Dave Airlie
58b2ed7832 Revert "drm/ttm: cleanup mm_ioctl ioctls to be separate ioctls." 
This reverts commit 3fdef0dc20.

ditto not on master yet
 2007-05-26 03:48:08 +10:00
Dave Airlie
3fdef0dc20 drm/ttm: cleanup mm_ioctl ioctls to be separate ioctls. 
This is the first bunch of ioctls
 2007-05-26 03:32:34 +10:00
Dave Airlie
ee8954cb53 drm/ttm: cleanup mm_ioctl ioctls to be separate ioctls. 
This is the first bunch of ioctls
 2007-05-06 11:17:30 +10:00
Thomas Hellstrom
72d457fc19 Make sure CMA (Can't map aperture) pages are mapped uncached. 
(Should really make this write-combined using PATs, at some point).
 2007-04-03 10:29:14 +02:00
Thomas Hellstrom
80468e7532 Fix build for 2.6.21-rc1. 
The vm subsystem of 2.6.21 is fully compatible with the buffer object
vm code.
 2007-02-26 18:17:54 +01:00
Michel Dänzer
7803977aa9 Fix build against older kernels. 2007-02-15 09:26:16 +01:00
Thomas Hellstrom
04760563b8 Set the drm bus map type for each buffer object memory type. 2007-02-14 12:39:02 +01:00
Thomas Hellstrom
7bcb62b45d Rework buffer object vm code to use nopfn() for kernels >= 2.6.19. 2007-02-14 10:49:37 +01:00
Thomas Hellstrom
e4b2da4406 A minor function interface change and some memcpy bugfixing. 
Hooray!! it sort of works with a fixed AGP area as faked VRAM.
 2007-02-08 16:21:38 +01:00
Thomas Hellstrom
1257907fa9 Simplify external ttm page allocation. 
Implement a memcpy fallback for copying between buffers.
 2007-02-08 13:29:08 +01:00
Thomas Hellstrom
71b9e876f9 Simplify pci map vs no pci map choice. 2007-02-06 16:59:45 +01:00
Thomas Hellstrom
63f2abd721 Make also later kernels work with buffer object vm 
and clean up some function names.
 2007-02-02 19:49:11 +01:00
Thomas Hellstrom
c269d560e4 Make vm handle buffer objects instead of ttm objects. 
Remove ttm objects.
Make vm aware of PCI memory type buffer objects.
(Only works for pre 2.6.16 kernels for now).
 2007-02-02 14:47:44 +01:00
Thomas Hellstrom
dd733dea38 Fix missing ttm_open_vma call from previous commit. 
Honour the ttm backend cant-use-aperture flag.
 2007-02-01 13:19:05 +01:00
Thomas Hellstrom
975136d6e5 Proper allocation of AGP pages for ttms. 2006-12-27 15:32:09 +01:00
Thomas Hellstrom
3b8e6ccd25 Security fix. Zero pages before they are handed to user space. 
TTM pages were not cleared when allocated and handed to user space.
Sensitive information may leak.
 2006-12-19 23:45:59 +01:00
Thomas Hellstrom
3624e43282 Bug #8707, 2.6.19-rc compatibility for memory manager code. 2006-10-20 15:06:31 +02:00
Thomas Hellstrom
c34faf224b Remove max number of locked pages check and call, since 
that is now handled by the memory accounting.
 2006-10-17 20:03:26 +02:00
Thomas Hellstrom
d515936ea7 Add memory usage accounting to avoid DOS problems. 2006-10-17 19:40:57 +02:00
Thomas Hellstrom
3070389367 Compatibility code for 2.6.15-2.6.18. It is ugly but a little comfort is that 
it will go away in the mainstream kernel.
Some bugfixes, mainly in error paths.
 2006-10-11 22:21:01 +02:00