Commit graph

24 commits

Author SHA1 Message Date
Dave Airlie
eeae6a0a38 merge back bunch of whitespace and misc changes from kernel 2004-09-05 10:54:59 +00:00
Dave Airlie
838bb7af71 oops called ctor instead of dtor.. found this on the kernel merge 2004-09-02 12:33:03 +00:00
Dave Airlie
55c6e72306 remove hacky context thing that was gamma only 2004-08-29 12:17:26 +00:00
Dave Airlie
019fd38a3c __NO_VERSION__ hasn't been needed since 2.3 days ditch it... 2004-08-27 09:11:07 +00:00
Dave Airlie
d4dbf45781 Merged drmfntbl-0-0-2 2004-08-24 11:15:53 +00:00
Dave Airlie
5c9ed83094 Merged drmfntbl-0-0-1 2004-08-17 13:10:05 +00:00
Eric Anholt
dd83f39f03 Add a "dev" argument to DRIVER_CTX_[CD]TOR. This will be used in an
upcoming commit for the SiS driver.
2004-08-14 00:46:15 +00:00
Dave Airlie
a776c5ec04 first set of __user annotations from kernel (Al Viro) 2004-07-20 12:43:12 +00:00
Keith Whitwell
82157579b5 drm_ctx_dtor.patch Submitted by: Erdi Chen 2004-02-20 22:55:12 +00:00
Jose Fonseca
d2443b2186 Merged DRM documentation. 2003-05-27 00:37:33 +00:00
Alan Hourihane
9c5d16216d remove unused variable 2003-04-22 12:42:22 +00:00
Keith Whitwell
a1780925fb Move a chunk of gamma-specific code out of drm_dma.h. Remove unused
'DRM_FLAG_NOCTX' option.
2003-04-22 11:31:55 +00:00
Keith Whitwell
056762a910 remove unused dma histogram code 2003-04-22 10:18:29 +00:00
Keith Whitwell
5141da97f6 Move a bunch of gamma-specific code into a gamma-specific file. Restore the
kooky DRM(write_string) code for gamma.
2003-04-22 10:13:14 +00:00
Keith Whitwell
fc4fb6b51b remove DRM read, poll and write_string 2003-04-22 08:06:14 +00:00
Leif Delgass
10444e06d4 Use list_entry() to get container struct from struct list_head pointers.
Build fix for RedHat 9 kernel (5 args to remap_page_range()).
2003-04-08 01:30:43 +00:00
Alan Hourihane
8aecdbea76 gamma_alloc -> DRM(alloc) 2002-06-25 12:13:20 +00:00
David Dawes
44aa4d6297 First pass merge of XFree86 4.2.0 import. 2002-01-27 20:05:42 +00:00
Alan Hourihane
ca820fca87 merge with 2.4.10 kernel 2001-09-25 09:32:16 +00:00
Jeff Hartmann
aa09e36114 Sync with Linus 2.4.9-pre2 + make all nopage routines more alike 2001-08-13 23:23:47 +00:00
Jeff Hartmann
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
Kevin E Martin
74e19a4018 Merged sarea-1-0-0 2001-03-14 22:22:50 +00:00
Gareth Hughes
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
Gareth Hughes
360475376c Merge mga-1-0-0-branch into trunk. 2001-02-15 08:12:14 +00:00