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

46 commits

Author SHA1 Message Date
Jesse Barnes
a1d9600724 Merge commit 'origin/drm-gem' into modesetting-gem 
Passed the compile test; it's ready to ship.

Conflicts:

	libdrm/Makefile.am
	linux-core/Makefile.kernel
	linux-core/drmP.h
	linux-core/drm_memrange.c
	linux-core/drm_stub.c
	shared-core/drm.h
	shared-core/i915_dma.c
	shared-core/i915_drv.h
	shared-core/i915_irq.c
 2008-06-10 17:31:54 -07:00
Eric Anholt
3ad8db2071 Rename drm_mm.c and its fuctions to drm_memrange. 
It's not really a graphics memory allocator, just something to track ranges
of address space.  It doesn't involve actual allocation, and was consuming
some desired namespace.
 2008-04-28 16:54:53 -07: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
c9b73ef6da Unlock the BO mutex while waiting for idle, unmapped, unfenced. 
Move unfenced checking into idle checking.
Never time out while waiting for software events like unmapped or unfenced.
 2008-04-14 12:13:33 +02:00
Alan Hourihane
b6dc381fab Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101 
Conflicts:

	shared-core/i915_dma.c
	shared-core/i915_drv.h
	shared-core/i915_irq.c
 2008-03-12 10:18:33 +00:00
Thomas Hellstrom
fa1d88e3b2 Make sure other TTM memory types than TT is really unbound when evicted. 2008-03-12 09:56:06 +01: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
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
Dave Airlie
e7a41d7f5b Merge remote branch 'origin/master' into modesetting-101 
Conflicts:

	linux-core/drm_bo.c
	linux-core/drm_drv.c
	shared-core/drm.h
	shared-core/i915_dma.c
	shared-core/i915_drv.h
	shared-core/i915_irq.c
	shared-core/radeon_irq.c
 2008-01-25 15:27:53 +10:00
Keith Packard
d1187641d6 Rename inappropriately named 'mask' fields to 'proposed_flags' instead. 
Flags pending validation were stored in a misleadingly named field, 'mask'.
As 'mask' is already used to indicate pieces of a flags field which are
changing, it seems better to use a name reflecting the actual purpose of
this field. I chose 'proposed_flags' as they may not actually end up in
'flags', and in an case will be modified when they are moved over.

This affects the API, but not ABI of the user-mode interface.
 2007-12-21 12:16:29 -08:00
Keith Packard
6d44f48002 Clean up and document drm_ttm.c APIs. drm_bind_ttm -> drm_ttm_bind. 
Aside from changing drm_bind_ttm to drm_ttm_bind, this patch
adds only documentation and fixes the functions inside drm_ttm.c
to all be prefixed with drm_ttm_.
 2007-12-21 12:16:29 -08:00
Keith Packard
b0bc5f1ae5 Make ttm create/destroy APIs consistent. Pass page_flags in create. 
Creating a ttm was done with drm_ttm_init while destruction was done with
drm_destroy_ttm. Renaming these to drm_ttm_create and drm_ttm_destroy makes
their use clearer. Passing page_flags to the create function will allow that
to know whether user or kernel pages are needed, with the goal of allowing
kernel ttms to be saved for later reuse.
 2007-12-15 12:10:41 -08:00
Jerome Glisse
f29b2a583d drm: fix dead lock in drm_buffer_object_transfer 2007-11-19 14:39:14 +01:00
Jerome Glisse
648b5b582a drm: fix dead lock in drm_buffer_object_transfer 2007-11-19 14:37:21 +01:00
Thomas Hellstrom
5ce43a346c Merge branch 'master' into modesetting-101 
Conflicts:

	linux-core/drm_bufs.c
	shared-core/i915_dma.c
	shared-core/i915_drv.h
	shared-core/i915_irq.c
 2007-11-05 13:46:06 +01:00
Dave Airlie
6ee5412da0 drm/ttm: apply linux kernel coding style to bo_lock/move/object/ttm.c 2007-11-05 19:09:18 +10:00
Dave Airlie
7f6bf84c23 drm: remove lots of spurious whitespace. 
Kernel "cleanfile" script run.
 2007-11-05 12:42:22 +10:00
Thomas Hellstrom
1681189e11 Buffer flags and masks are 64-bit. 
don't mask off the high dword.
Signed-off-by: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
 2007-10-26 10:27:30 +02:00
Thomas Hellstrom
26c32a3d79 Buffer flags and masks are 64-bit. 
don't mask off the high dword.
 2007-10-26 10:25:57 +02:00
Alan Hourihane
90bfc8e611 Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101 
Conflicts:

	linux-core/drm_bo.c
	linux-core/drm_objects.h
	shared-core/i915_dma.c
	shared-core/i915_drv.h
 2007-10-16 15:28:33 +01:00
Dave Airlie
495bbbaadc drm: fix page count calculation 
Also no need to do pre-populate work on single page
 2007-10-04 16:13:22 +10:00
Jesse Barnes
5cc3083179 Merge branch 'master' into modesetting-101 - TTM & typedef removal 
Conflicts:

	linux-core/drmP.h
	linux-core/drm_bo.c
	linux-core/drm_drv.c
	linux-core/drm_objects.h
	shared-core/drm.h
	shared-core/i915_dma.c
	shared-core/i915_drv.h
	shared-core/i915_irq.c

Mostly removing typedefs that snuck into the modesetting code and
updating to the latest TTM APIs.  As of today, the i915 driver builds,
but there are likely to be problems, so debugging and bugfixes will
come next.
 2007-09-24 14:41:46 -07:00
Thomas Hellstrom
da63f4ba0f Add fence error member. 
Modify the TTM backend bind arguments.
Export a number of functions needed for driver-specific super-ioctls.
Add a function to map buffer objects from the kernel, regardless of where they're
currently placed.
A number of error fixes.
 2007-09-22 13:57:13 +02:00
Ben Skeggs
92084c6e05 Export some useful ttm functions to drivers. 2007-08-06 22:11:18 +10:00
Dave Airlie
be85ad0333 drm: detypedef ttm/bo/fence code 2007-07-16 13:37:02 +10:00
Dave Airlie
21ee6fbfb8 drm: remove drmP.h internal typedefs 2007-07-16 12:32:51 +10:00
Alan Hourihane
8a78dead29 Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101 
Conflicts:

	linux-core/drm_drv.c
	linux-core/drm_fops.c
	linux-core/drm_objects.h
	linux-core/drm_stub.c
	shared-core/i915_dma.c
 2007-06-29 20:09:44 +01:00
Thomas Hellstrom
00f1a66f22 Fence object reference / dereference cleanup. 
Buffer object dereference cleanup.
Add a struct drm_device member to fence objects:
This can simplify code, particularly in drivers.
 2007-06-29 12:58:45 +02:00
Dave Airlie
79aa1d5474 another large overhaul of interactions with userspace... 
We need to keep a list of user created fbs to nuke on master exit.
We also need to use the bo properly.
 2007-04-17 18:16:38 +10:00
Jesse Barnes
65619cab27 Fix PRIV0 memory initialization (mm_init takes pages, not bytes), align fb 
allocation correctly, and use drm_mem_reg_iomap to map ring buffer object.
 2007-04-14 15:35:21 -07:00
Thomas Hellstrom
7766378d97 Initial support for fence object classes. 
(Fence objects belonging to different command submission mechanisms).
 2007-02-15 12:11:38 +01:00
Thomas Hellstrom
9efdae317c More bugfixes. 
Fixed memory, pinned buffers and unmappable memory now seems
fully functional.
 2007-02-13 20:05:32 +01:00
Thomas Hellstrom
398913dc0e Lindent. 2007-02-12 20:34:50 +01:00
Thomas Hellstrom
b0c5339ed6 More bugfixes. 2007-02-12 20:32:03 +01:00
Thomas Hellstrom
f02f83ee08 Cleanup and fix support for pinned buffers. 2007-02-12 17:47:57 +01:00
Thomas Hellstrom
85ee2a8d04 Various bugfixes. 2007-02-10 12:06:36 +01:00
Thomas Hellstrom
53aee3122a I915 accelerated blit copy functional. 
Fixed - to System memory copies are implemented by
flipping in a cache-coherent TTM,
blitting to it, and then flipping it out.
 2007-02-09 16:36:53 +01:00
Thomas Hellstrom
99acdaee48 Fix copyright statements. 2007-02-09 00:07:29 +01:00
Thomas Hellstrom
6a49d9a8ab Fix evict_mutex locking range. 
Implement unmappable buffers. (fault moves them to mappable when needed).
Various bugfixes.
 2007-02-09 00:02:02 +01:00
Thomas Hellstrom
b2bcbf874b Add an accelerated buffer copy cleanup helper. 
Export helper functions and make some important buffer-object functions non-static.
Add an i915 accelerated blit buffer move for pci memory buffers.
 2007-02-08 21:28:33 +01:00
Thomas Hellstrom
a0ed808d05 Don't create a ttm just to copy from. 2007-02-08 19:06:39 +01:00
Thomas Hellstrom
bf8f46d4c6 Fix mm_block leak. 
Some other minor fixes.
 2007-02-08 18:59:02 +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
c1fbd8a566 Checkpoint commit. 
Flag handling and memory type selection cleanup.
glxgears won't start.
 2007-02-07 17:25:13 +01:00
Thomas Hellstrom
af24465b2e Fix a stray unlock_kernel() in drm_vm.c 
Add a file for memory move helpers, drm_bo_move.c
Implement generic memory move.
Cached, no_move and unmapped memory temporarily broken.
 2007-02-07 12:52:23 +01:00