Commit graph

256 commits

Author SHA1 Message Date
Alan Hourihane
2e4e8d8409 pull in Eric's fixes from drm-kmod 0.9.3 2001-11-07 08:49:40 +00:00
Alan Hourihane
b3e4882589 merge kernel 2.4.13-pre6 2001-10-22 19:16:41 +00:00
Alan Hourihane
435e909f5a merge from trunk. 2001-10-08 12:59:01 +00:00
Alan Hourihane
7dad4d1b1b comment for linux 2001-09-25 09:40:51 +00:00
Alan Hourihane
3d9ff790cd merge with latest trunk code. 2001-09-25 09:35:37 +00:00
Alan Hourihane
759572da3b fix some DRM_OS_RETURN values. 2001-09-19 13:54:39 +00:00
Alan Hourihane
fa696702b8 indirect buffer fix. 2001-09-19 13:48:11 +00:00
Alan Hourihane
c3fc479610 more work on i810 for FreeBSD. 2001-09-19 08:16:34 +00:00
Alan Hourihane
e932864478 remove Linux 2.3.x cruft. 2001-09-18 11:00:39 +00:00
Alan Hourihane
58f87f0bb1 fix another typo 2001-09-17 22:17:09 +00:00
Alan Hourihane
310da25f3d fix typo 2001-09-17 22:16:37 +00:00
Alan Hourihane
3eb3725b0e more -CURRENT fixes (Olivier Houchard) 2001-09-17 21:21:01 +00:00
Alan Hourihane
861f12f19d more -CURRENT fixes 2001-09-17 18:55:20 +00:00
Alan Hourihane
ba5415e0e2 a couple more -CURRENT fixes. 2001-09-17 18:28:40 +00:00
Alan Hourihane
f8c4a4c933 Merge R128 driver from trunk for latest 2D CCE changes. 2001-09-17 14:12:26 +00:00
Alan Hourihane
80fc5b66b7 small cleanups from Eric. 2001-09-11 16:55:40 +00:00
Alan Hourihane
6aafd3ed73 typedef fixes 2001-08-30 20:19:50 +00:00
Alan Hourihane
905d2f4760 warning fix 2001-08-29 16:44:46 +00:00
Alan Hourihane
73adb5e130 Apply Eric Anholt's fixes 2001-08-28 07:43:48 +00:00
Alan Hourihane
4e3c16d6b3 add program to strip out all __FreeBSD__ code and remove __linux__ ifdefs
to return the code to 'PURE LINUX'.
2001-08-24 11:09:50 +00:00
Alan Hourihane
4b4e292958 final lot 2001-08-24 11:04:44 +00:00
Alan Hourihane
e8fd19a35a another 2001-08-24 10:58:07 +00:00
Alan Hourihane
50d352877c a few more 2001-08-24 10:56:31 +00:00
Alan Hourihane
2bf75c8be3 missed one 2001-08-24 10:47:36 +00:00
Alan Hourihane
8af510e3b5 add appropriate '#endif /* __linux__ */' or '#endif /* __FreeBSD__ */ as
per Jeff's suggestion
2001-08-24 09:29:47 +00:00
Alan Hourihane
74f40b6a09 remove some more OS dependencies 2001-08-23 08:12:16 +00:00
Alan Hourihane
60630d0517 *BSD fixes 2001-08-21 08:46:04 +00:00
Alan Hourihane
eff1c43587 *BSD fixes 2001-08-20 15:11:37 +00:00
Alan Hourihane
b577361368 remove Linux 2.2.x cruft from bsd-2-0-0 branch. 2001-08-19 15:34:17 +00:00
Alan Hourihane
4d738200dd more linux fixes 2001-08-19 14:34:53 +00:00
Alan Hourihane
4d3d182d8a tweaks for linux 2001-08-19 14:15:38 +00:00
Alan Hourihane
ed1730707d merge kernel modules from trunk (again). 2001-08-19 12:29:57 +00:00
Alan Hourihane
002b0ae22e comment out DRIVER_CARD_LIST, until drm_count_cards() is fixed for FreeBSD.
Which restores the single head behaviour.
2001-08-12 22:18:38 +00:00
Alan Hourihane
cc95ebfa5e FreeBSD build fixes 2001-08-12 21:58:24 +00:00
Alan Hourihane
dff2dd8494 FreeBSD fix. 2001-08-11 15:53:33 +00:00
Alan Hourihane
3737375ff3 add PCI ID's 2001-08-11 15:43:13 +00:00
Alan Hourihane
2d9ccffcb4 first round of FreeBSD fixups. 2001-08-11 15:28:59 +00:00
Alan Hourihane
130c0bda0f small fixups (now compiles again on Linux) 2001-08-11 14:51:21 +00:00
Alan Hourihane
8a4ffb6349 o.k. so I lied, this is a first crack at merge. It needs testing, and most
definately fixing for multihead support on FreeBSD.
2001-08-11 14:45:21 +00:00
Alan Hourihane
b0f3c00454 dma_drv.h left now... 2001-08-11 13:18:57 +00:00
Alan Hourihane
5d051cb137 remove file 2001-08-11 13:06:36 +00:00
Alan Hourihane
7c0840c593 second batch (drm_bufs.h and drm_drv.h still to do) 2001-08-11 13:04:07 +00:00
Alan Hourihane
92f8982232 first batch of trunk merges 2001-08-11 13:02:15 +00:00
Alan Hourihane
d9e1e82553 merge from trunk (kernel modules next) 2001-08-11 12:25:47 +00:00
Alan Hourihane
b854253533 another linux fix 2001-07-23 08:45:05 +00:00
Alan Hourihane
f7bb776038 couple more merge fixes 2001-07-23 08:39:37 +00:00
Alan Hourihane
3ef755f0ce bug fixes to Eric's patches to compile on Linux. 2001-07-23 08:08:37 +00:00
Alan Hourihane
b684bdbada commit Eric's latest BSD patches. 2001-07-23 08:00:27 +00:00
Alan Hourihane
b8678bc9cc merge latest kernel drivers from trunk. 2001-07-23 07:57:04 +00:00
Alan Hourihane
5a2aa17b8b merge from trunk into bsd-2-0-0 branch (4.1.0) 2001-06-24 22:19:56 +00:00