9583c099b4
Revert "Merge branch 'modesetting-gem'"
...
This reverts commit 6656db1055
2008-12-10 15:50:22 -08:00
086716c8e2
Merge commit 'origin/drm-gem' into modesetting-gem
...
Conflicts:
linux-core/Makefile.kernel
linux-core/drmP.h
linux-core/drm_mm.c
linux-core/drm_stub.c
linux-core/i915_gem.c
linux-core/i915_opregion.c
shared-core/i915_dma.c
shared-core/i915_drv.h
shared-core/i915_irq.c
2008-08-01 13:35:56 -04:00
e68b57c17d
intel-gem: checkpatch.pl on drm_proc.c new contents.
2008-07-28 23:12:41 -07:00
86accbcb34
Merge commit 'origin/drm-gem' into modesetting-gem
...
Lots of conflicts, seems to load ok, but I'm sure some bugs snuck in.
Conflicts:
linux-core/drmP.h
linux-core/drm_lock.c
linux-core/i915_gem.c
shared-core/drm.h
shared-core/i915_dma.c
shared-core/i915_drv.h
shared-core/i915_irq.c
2008-06-18 15:25:54 -07:00
a7139cb851
[intel-gem] show total GTT space in /proc/dri/*/gem_objects
2008-06-13 19:35:22 -07:00
217beb9c8d
[intel-gem] add gtt and pin counts to /proc/dri/*/gem_objects
...
Not quite portable, but these are useful for intel. Some more general
mechanism could be done...
2008-06-13 15:43:02 -07:00
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
8f7fc880e8
drm: fix oops on reading proc file with no master
2008-05-12 16:28:40 +10:00
ab3549d133
Add a bit of /proc/dri/*/gem support. Clean up some refcount/pagelock issues.
...
Track named objects in /proc/dri/0/gem_names.
Track total object count in /proc/dri/0/gem_objects.
Initialize device gem data.
return -ENODEV for gem ioctls if the driver doesn't support gem.
Call unlock_page when unbinding from gtt.
Add numerous misssing calls to drm_gem_object_unreference.
2008-05-02 16:34:16 -07:00
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
c0a1cd052a
Add an emergency pinnable memory quota for root-only processes.
2008-03-12 10:10:03 +01:00
12574590cd
drm: reorganise minor number handling using code from modesetting branch
...
Rip out the whole head thing and replace it with an idr and drm_minor
structure.
2008-03-06 05:21:50 +10:00
75b01cf996
switch naming to new proposed scheme
2008-02-15 10:04:28 +10:00
a4fc1d7ac6
start moving over to proper hierarchy wrt master accesses
2008-02-13 16:30:15 +10:00
0fbee62ec1
major port of multi-master ideas into modesetting
2008-02-13 15:19:42 +10:00
f276c845bd
drm: re-write minor number allocation to use an idr.
...
Fixup the minor number allocation scheme to use an idr and move the control
nodes up higher.
2008-02-13 12:12:52 +10:00
10937cf20b
drm: move drm_head to drm_minor and fix up users
2008-01-04 16:12:24 +11:00
5dc5c36e62
drm: major whitespace/coding style realignment with kernel
2007-11-22 16:10:36 +10:00
6ad1df2176
drm: remove drm_u64_t, replace with uint64_t everwhere
...
This might break something, stdint.h inclusion in drm.h maybe required
but I'm not sure yet what platforms have it what ones don't.
2007-07-18 09:42:06 +10:00
be85ad0333
drm: detypedef ttm/bo/fence code
2007-07-16 13:37:02 +10:00
21ee6fbfb8
drm: remove drmP.h internal typedefs
2007-07-16 12:32:51 +10:00
b95ac8b7b3
drm: detypedef drm.h and fixup all problems
2007-07-16 11:22:15 +10:00
7b48f0022a
drm: cleanup use of Linux list handling macros
...
This makes the drms use of the list handling macros a lot cleaner
and more along the lines of how they should be used.
2007-05-26 04:26:24 +10:00
8d918b0b63
cleanup more whitespace from ttm merge
2007-03-23 14:56:39 +11:00
483f6a113d
use ARRAY_SIZE
2007-03-19 08:32:25 +11:00
ae58225613
Improve memory manager accounting printout formatting.
2006-12-21 10:43:47 +01:00
f22f89e6b3
Add vma list memory usage to memory accounting.
...
Use byte unit for /proc printout of memory usage for small sizes to be
able to detect memory allocation bugs more easily.
2006-10-17 19:52:34 +02:00
d515936ea7
Add memory usage accounting to avoid DOS problems.
2006-10-17 19:40:57 +02:00
d85b99435f
Allow for 44 bit user-tokens (or drm_file offsets)
2006-10-02 13:49:43 +02:00
273eb7833d
Add /proc filesystem buffer / fence object accounting.
...
Check for NULL pointer in the i915 flush handler.
Remove i915_sync_flush declaration.
2006-09-25 11:51:08 +02:00
a02155a0d9
Fix proc formatting broken by last commit.
...
GPU lockup error reporting.
2006-09-22 09:25:36 +02:00
fa511a3ff5
Allow for 64-bit map handles of ttms and buffer objects.
2006-09-20 16:31:15 +02:00
9b984b34e9
drm: lots of small cleanups and whitespace issues fixed up
...
remove a mach64 warning, align a lot of things from linux kernel
2006-08-28 11:31:43 +10:00
5cfbd5dbab
switch drm to use Linux mutexes instead of semaphore.
...
I hope the fallback compat code works if not shout at me.
2006-07-24 10:51:27 +10:00
a204d5acb2
realign whitespace with kernel
2005-11-11 09:09:03 +00:00
36356df3cb
A bunch of create_proc_dir_entry() calls creating directories had crept in
...
since the last sweep; converted to proc_mkdir().
From: Al Viro (via kernel)
2005-11-11 08:59:57 +00:00
7af0186f4c
add Egberts 32/64 bit patch (its in kernel already...)
2005-08-16 12:51:57 +00:00
805a07714f
misc cleanup patch from Adrian Bunk
2005-06-04 06:18:11 +00:00
ed165a2529
Added a new DRM map type _DRM_CONSISTENT for consistent PCI memory. It uses
...
drm_pci_alloc/free for allocating/freeing the memory. Only implemented
in the Linux DRM so far.
2005-01-01 20:03:15 +00:00
7ebbebf3d3
Switch linux-core from using dev->pdev->driver->name to
...
dev->driver->pci_driver.name. This avoids the stealth mode case where
pdev is pointing to the wrong driver or no driver.
2004-10-20 05:11:49 +00:00
0d89b19325
Update Doxygen configuration & comments.
2004-10-18 14:16:41 +00:00
ad70dc676e
Breakout heads into their own data structures.
2004-10-12 03:59:17 +00:00
ad549c5ae6
Rename fn_tbl to driver. Core driver now uses pci_driver name which
...
reflects the personality name.
2004-10-10 22:54:55 +00:00
9f9a8f1382
Lindent of core build. Drivers checked for no binary diffs. A few files
...
weren't Lindent's because their comments didn't convert very well. A
bunch of other minor clean up with no code implact included.
2004-09-30 21:12:10 +00:00
fa6b1d129e
First check in for DRM that splits core from personality modules
2004-09-27 19:51:38 +00:00
019fd38a3c
__NO_VERSION__ hasn't been needed since 2.3 days ditch it...
2004-08-27 09:11:07 +00:00
4f8f02a192
fix for drm in /proc - from Jon Smirl
2004-08-03 09:21:11 +00:00
c3e2685e82
long dev_t patches from 2.6 tree
2004-04-08 12:25:31 +00:00
8e7cd92f35
Added the Doxygen configuration file. Minor documentation fixes.
2003-06-03 23:50:23 +00:00
d2443b2186
Merged DRM documentation.
2003-05-27 00:37:33 +00:00
Jesse Barnes
Kristian Høgsberg
Eric Anholt
Jesse Barnes
Keith Packard
Jesse Barnes
Dave Airlie
Alan Hourihane
Thomas Hellstrom
Dave Airlie
Felix Kuehling
Jon Smirl
Jose Fonseca