e5c4a26a29
Merge branch 'nouveau-1'
2006-12-20 10:30:16 +11:00
81251bf78f
Reclaim buffers locked fixup.
...
Avoid calling reclaim_buffers_locked if we don't have a
hardware lock.
Improve reclaim_buffers_locked deadlock error formatting.
2006-12-19 23:14:11 +01:00
f7affda35b
drm: fixup page alignment on SAREA map on ppc64
2006-11-06 11:44:36 +11:00
cee659afb5
Get rid of all ugly PTE hacks.
2006-10-03 12:08:07 +02:00
418b81c65c
Add a comment to previos commit.
2006-10-02 13:37:54 +02:00
c6be27401f
Trap and be verbose about a deadlock that occurs with AIGLX and drivers that
...
use drm_reclaim_buffers_locked().
2006-10-02 13:34:30 +02:00
4ddabd1562
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into drm-ttm-0-2-branch
...
Conflicts:
linux-core/drmP.h
2006-08-28 09:28:10 +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
3586ecd060
fix const pointer warnings with file_operations
2006-08-28 11:27:13 +10:00
b4feb2c04e
remove some DRM_ARRAY_SIZE from linux core code
2006-08-28 11:27:05 +10:00
42c2cfcf7d
Generic DRM support base-class support for user-space objects, like
...
fence objects and buffer objects:
Refcounting,
Inter-process sharing,
Synchronization
Destruction.
2006-08-21 20:30:19 +02:00
0316f93d51
Remove hash tables on DRM exit.
2006-08-16 16:36:56 +02: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
1a9e5bae10
Fix drm_remove_magic potential memory leak / corruption. Move drm
...
authentication token hashing to new generic hash table implementation.
2006-06-06 17:46:17 +00:00
4791dc8856
major realigment of DRM CVS with kernel code, makes integration much easier
2006-02-18 02:53:36 +00:00
92150972e5
use drm_cards_limit instead of cards_limit
2006-01-02 05:54:10 +00:00
ea07fefcbf
convert to use __set_current_state, align some header includes
2005-11-11 08:42:36 +00:00
bcbf5ff797
we don't use this stuff anymore .. remove 1k buffer from driver ..
2005-10-23 04:07:50 +00:00
cd16d96856
remove pci_find_class use for alpha
2005-09-18 09:31:06 +00:00
c789ea1521
Rename the driver hooks in the DRM to something a little more
...
understandable: preinit -> load postinit -> (removed) presetup ->
firstopen postsetup -> (removed) open_helper -> open prerelease ->
preclose free_filp_priv -> postclose pretakedown -> lastclose
postcleanup -> unload release -> reclaim_buffers_locked version ->
(removed)
postinit and version were replaced with generic code in the Linux DRM
(drivers now set their version numbers and description in the driver
structure, like on BSD). postsetup wasn't used at all. Fixes the savage
hooks for initializing and tearing down mappings at the right times.
Testing involved at least starting X, running glxgears, killing
glxgears, exiting X, and repeating.
Tested on: FreeBSD (g200, g400, r200, r128) Linux (r200, savage4)
2005-08-05 03:50:23 +00:00
143622a987
Implement permanent sarea maps
2005-08-04 14:48:43 +00:00
ea2c7a895d
Split the control of master vs root priv. Everything is still marked as
...
needing root.
2005-08-04 13:15:27 +00:00
e2ba08d283
release can happen before dev->ctxlist is allocated
2005-06-30 16:00:35 +00:00
2ce5ddec83
Bug in conversion from old DRM to core DRM....
2005-06-29 02:57:18 +00:00
805a07714f
misc cleanup patch from Adrian Bunk
2005-06-04 06:18:11 +00:00
5128542814
Allow drivers to override reclaim_buffers in an OS-independent way by
...
passing drm_device_t* as first parameter, like in the BSD version.
2004-10-31 15:16:44 +00:00
b974e2cd68
Break poll() to make it match the Xserver's broken expectations.
2004-10-28 15:52:31 +00:00
0d89b19325
Update Doxygen configuration & comments.
2004-10-18 14:16:41 +00:00
91aa32742c
Move drm_cpu_valid out of drm_init. drm_init is empty now.
2004-10-15 20:36:15 +00:00
5e8838fd11
Add a poll function that alternates between zero and normal poll return to
...
bring DRM into conformance with normal poll().
2004-10-13 16:40:53 +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
1c0a437fa2
Move things around to reduce public symbols and even out files. Switch to
...
get_order from drm_order.
2004-09-30 19:26:35 +00:00
3aef3841d0
Make fops per driver instead of global, remove default flush, poll, read
...
functions
2004-09-30 18:13:33 +00:00
fa6b1d129e
First check in for DRM that splits core from personality modules
2004-09-27 19:51:38 +00:00
eeae6a0a38
merge back bunch of whitespace and misc changes from kernel
2004-09-05 10:54:59 +00:00
019fd38a3c
__NO_VERSION__ hasn't been needed since 2.3 days ditch it...
2004-08-27 09:11:07 +00:00
d4dbf45781
Merged drmfntbl-0-0-2
2004-08-24 11:15:53 +00:00
5c9ed83094
Merged drmfntbl-0-0-1
2004-08-17 13:10:05 +00:00
a776c5ec04
first set of __user annotations from kernel (Al Viro)
2004-07-20 12:43:12 +00:00
c3e2685e82
long dev_t patches from 2.6 tree
2004-04-08 12:25:31 +00:00
2655ccddf4
Memory layout transition:
...
the 2D driver initializes MC_FB_LOCATION and related registers sanely
the DRM deduces the layout from these registers
clients use the new SETPARAM ioctl to tell the DRM where they think the
framebuffer is located in the card's address space
the DRM uses all this information to check client state and fix it up if
necessary
This is a prerequisite for things like direct rendering with IGP chips and
video capturing.
2003-11-04 00:46:05 +00:00
d2443b2186
Merged DRM documentation.
2003-05-27 00:37:33 +00:00
e15b0b6a1b
Install dummy/noop read & poll fops unless the driver has replacements.
2003-04-23 23:42:29 +00:00
fc4fb6b51b
remove DRM read, poll and write_string
2003-04-22 08:06:14 +00:00
c2d7ff1bf9
Bring some drm module changes over from the XFree86 trunk:
...
- Reset 'bound' flag for an agp entry after undbind succeeded in
drm_agpsupport.h (Egbert Eich).
- Ignore hw_lock for drm device if lock was set by a different instance (ie
Xserver) to prevent second server from spinning in driver release
function (currently only relevant for i8xx drm drivers) (David Dawes).
- Use the agpgart "key" for the unique handle for bindings rather than the
memory address (the key is guaranteed to be unique) (David Dawes).
2003-04-17 18:41:28 +00:00
b3eb34e0ea
linux merge for drm
2003-03-25 11:36:43 +00:00
9e67da5626
Allow drm to build under 2.4 and 2.5(.14)
2002-05-16 23:47:15 +00:00
44aa4d6297
First pass merge of XFree86 4.2.0 import.
2002-01-27 20:05:42 +00:00
f4c2f14002
No one's maintaining 2.2.x support - so remove all the cruft.
2001-08-19 15:20:08 +00:00
51e38d96ea
Lots of DRM fixes: added new pieces of template code so the ffb driver can
...
be ported, rolled back r128 and i810 version bumps so 4.1.0 works with
cvs kernel modules, added Config.in and updated Makefile.kernel,
incorporated lots of drm fixes inspired by patches sent by Redhat, made
DRM(realloc) usage check for NULL allocations, restructure driver init
routines to export dev_priv only when initialized and to check for all
error conditions.
2001-08-07 18:15:10 +00:00
a576d41498
Import of XFree86 4.0.99.3
2001-05-01 17:07:59 +00:00
1759c16ab9
Import -f XFree86 4.0.99.2
2001-04-09 16:27:54 +00:00
5d6ddbca26
Merged ati-pcigart-1-0-0
2001-04-05 22:16:12 +00:00
01a14789ed
- Clean up the way customization of the templates is done.
...
- Fix old-style DMA for gamma driver (please test).
- Pull out IRQ handling into drm_dma.h (please test on i810, gamma).
- Lots of general cleanups, remove compiler warnings etc.
2001-02-16 05:24:06 +00:00
360475376c
Merge mga-1-0-0-branch into trunk.
2001-02-15 08:12:14 +00:00
Dave Airlie
Thomas Hellstrom
Dave Airlie
Dave Airlie
Thomas Hellstrom
Eric Anholt
Jon Smirl
Felix Kuehling
Jose Fonseca
Michel Daenzer
Keith Whitwell
David Dawes
Alan Hourihane
Jeff Hartmann
Kevin E Martin
Gareth Hughes