Dave Airlie [Wed, 4 Aug 2004 10:56:48 +0000 (10:56 +0000)]
2.4 compat
Dave Airlie [Wed, 4 Aug 2004 10:53:21 +0000 (10:53 +0000)]
2.4 hotplug compat
Dave Airlie [Tue, 3 Aug 2004 11:26:38 +0000 (11:26 +0000)]
bring over fix from i865-agp branch, it now probes the driver, X hangs
box..
Dave Airlie [Tue, 3 Aug 2004 09:21:11 +0000 (09:21 +0000)]
fix for drm in /proc - from Jon Smirl
Dave Airlie [Mon, 2 Aug 2004 11:45:23 +0000 (11:45 +0000)]
forgot to check these in.. thanks to Jon for reminding me ..
Jon Smirl [Sat, 31 Jul 2004 15:45:00 +0000 (15:45 +0000)]
Add a hotplug event to DRM. Parameters match the ones from the general PCI
hotplug event plus the addition of one requesting RESET. Put your
scripts in /etc/hotplug.d/drm to run. kernel class_simple generates the
ADD/REMOVE events. No cards currently request RESET, the flag is there
to stop you from resetting your boot display.
Dave Airlie [Sat, 31 Jul 2004 08:38:39 +0000 (08:38 +0000)]
patch from RH xorg-x11 tree ported to drm.h
Dave Airlie [Sat, 31 Jul 2004 08:12:39 +0000 (08:12 +0000)]
Patch picked up from Redhat xorg release:
Patch by John Dennis <jdennis@redhat.com> which fixes DRI locking bug on
ia64 architecture.
https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=104338
http://bugs.xfree86.org/show_bug.cgi?id=778
Dave Airlie [Sat, 31 Jul 2004 07:26:52 +0000 (07:26 +0000)]
fixes for using userspace pointers found by sparse utility
From: Dave Airlie
Dave Airlie [Sat, 31 Jul 2004 07:25:58 +0000 (07:25 +0000)]
athe patch below optimises the drm code to not do put_user() on memory the
kernel allocated and then mmap-installed to userspace, but instead
makes it use the kernel virtual address directly instead.
From: Arjan van de Ven <arjanv@redhat.com>
Dave Airlie [Thu, 29 Jul 2004 13:00:48 +0000 (13:00 +0000)]
add read/write 16
Dave Airlie [Thu, 29 Jul 2004 12:49:54 +0000 (12:49 +0000)]
change to agp not pci ... still not working
Dave Airlie [Thu, 29 Jul 2004 11:09:22 +0000 (11:09 +0000)]
initial port of i915 to BSD, not finished doesn't work.. no idea why...
Dave Airlie [Sun, 25 Jul 2004 08:57:15 +0000 (08:57 +0000)]
check for __user if not there define it
Dave Airlie [Sun, 25 Jul 2004 08:47:38 +0000 (08:47 +0000)]
sync up with current 2.6 kernel bk tree - mostly __user annotations
Dave Airlie [Sun, 25 Jul 2004 05:52:22 +0000 (05:52 +0000)]
whitespace merge with kernel
Dave Airlie [Sun, 25 Jul 2004 05:41:44 +0000 (05:41 +0000)]
if the driver has already register don't do another intermodule register
Dave Airlie [Sun, 25 Jul 2004 05:36:45 +0000 (05:36 +0000)]
Patch from Tom Arbuckle for missing bus_address
Keith Whitwell [Fri, 23 Jul 2004 16:12:27 +0000 (16:12 +0000)]
Correct a couple of packet length calculations.
Dave Airlie [Thu, 22 Jul 2004 12:07:13 +0000 (12:07 +0000)]
another logic error returns 0 or greater for success
Dave Airlie [Wed, 21 Jul 2004 09:36:16 +0000 (09:36 +0000)]
ATI Rage 128 and Radeon DRM unconditionally depend on PCI
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Dave Airlie [Wed, 21 Jul 2004 09:30:43 +0000 (09:30 +0000)]
add some more debugging fix ++ and --
Dave Airlie [Tue, 20 Jul 2004 12:43:12 +0000 (12:43 +0000)]
first set of __user annotations from kernel (Al Viro)
Dave Airlie [Tue, 20 Jul 2004 11:48:25 +0000 (11:48 +0000)]
Add NULLs instead of 0 for i915
Dave Airlie [Tue, 20 Jul 2004 11:35:29 +0000 (11:35 +0000)]
Kconfig update add i915 bring over some stuff from kernel
Dave Airlie [Tue, 20 Jul 2004 11:26:13 +0000 (11:26 +0000)]
add x86_64 architecture defines from kernel (leave AMD64 defines in for
backwards compat)
Dave Airlie [Tue, 20 Jul 2004 11:22:26 +0000 (11:22 +0000)]
fix some more NULLs from kernel
Dave Airlie [Tue, 20 Jul 2004 10:59:02 +0000 (10:59 +0000)]
attempt to clean up stub_register, register_chrdev isn't good enough to
make the decision for multiple cards with one drm ..
Dave Airlie [Thu, 15 Jul 2004 13:03:55 +0000 (13:03 +0000)]
sparse cleanups from kernel: Al Viro
Dave Airlie [Wed, 14 Jul 2004 12:34:55 +0000 (12:34 +0000)]
Fix reference counting for stub for new Linux PCI probe
Dave Airlie [Wed, 14 Jul 2004 12:14:37 +0000 (12:14 +0000)]
allow O= usage for Linux 2.6 kernel building in another directory
Dave Airlie [Sun, 11 Jul 2004 10:17:34 +0000 (10:17 +0000)]
split out backwards compat into a separate file makes it easier for merging
to 2.6
Dave Airlie [Sun, 11 Jul 2004 09:58:49 +0000 (09:58 +0000)]
fix issue in 2.4 kernels with returning NULL from this function
Jon Smirl [Thu, 8 Jul 2004 20:18:10 +0000 (20:18 +0000)]
Add two items to Makefile clean XFree86 bug: Reported by: Submitted by:
Reviewed by: Obtained from:
Jon Smirl [Wed, 7 Jul 2004 04:36:36 +0000 (04:36 +0000)]
Make drm/libdrm/xf86drm.c match
xc/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drm.c so
that it matches the prototypes in xf86drm.h XFree86 bug: Reported by:
Submitted by: Reviewed by: Obtained from:
Jon Smirl [Wed, 7 Jul 2004 04:22:17 +0000 (04:22 +0000)]
Add xf86drm.h back to drm/libdrm until it's true home can be found.
mesa-solo needs this file to build. XFree86 bug: Reported by: Submitted
by: Reviewed by: Obtained from:
Eric Anholt [Tue, 6 Jul 2004 00:25:19 +0000 (00:25 +0000)]
Fix module loading on alpha by not referencing MTRR symbols on
!__REALLY_HAVE_MTRR.
Eric Anholt [Tue, 6 Jul 2004 00:23:42 +0000 (00:23 +0000)]
MFC as of
20040705: dev_t -> struct cdev * change.
Dave Airlie [Mon, 5 Jul 2004 12:10:25 +0000 (12:10 +0000)]
align with kernel
Dave Airlie [Mon, 5 Jul 2004 11:56:51 +0000 (11:56 +0000)]
fixes from kernel for 0 vs NULL - mika
Dave Airlie [Mon, 5 Jul 2004 11:44:30 +0000 (11:44 +0000)]
whitespace align with kernel
Dave Airlie [Mon, 21 Jun 2004 11:46:52 +0000 (11:46 +0000)]
fix bug with pci_disable_device in the wrong place (Paul Mackerras) remove
hack code from me..
Dave Airlie [Sat, 12 Jun 2004 02:30:52 +0000 (02:30 +0000)]
dirty hack to make mach64 work, (don't worry I'll get around to fixing it
asap..)
Keith Whitwell [Thu, 10 Jun 2004 12:48:35 +0000 (12:48 +0000)]
A few changes for recent redhat.
Keith Whitwell [Thu, 10 Jun 2004 12:47:50 +0000 (12:47 +0000)]
i915 drm module
Keith Whitwell [Thu, 10 Jun 2004 12:45:38 +0000 (12:45 +0000)]
i915.o drm driver
Dave Airlie [Thu, 10 Jun 2004 09:43:53 +0000 (09:43 +0000)]
gamma_dma_priority and gamma_dma_send_buffers both deref d->send_indices
and/or d->send_sizes. When these functions are called from gamma_dma,
these pointers are user pointers and are thus not safe to deref. This
patch copies over the pointers inside gamma_dma_priority and
gamma_dma_send_buffers.
Submitted-by: Robert T. Johnson <rtjohnso@eecs.berkeley.edu> Signed-off-by:
Dave Airlie <airlied@linux.ie>
Dave Airlie [Mon, 7 Jun 2004 01:42:35 +0000 (01:42 +0000)]
The dev->devname being passed to request_irq in drm_irq.h is null. With the
old DRM interface, the devname was set in DRM(setunique), but with the
current DRM interface >=1.1 the devname is not being set in
DRM(set_busid).
From: Alan Swanson Approved-by: Dave Airlie <airlied@linux.ie>
Ian Romanick [Wed, 2 Jun 2004 17:41:52 +0000 (17:41 +0000)]
Added some comments copied from xf86drm.h.
Ian Romanick [Tue, 1 Jun 2004 16:17:32 +0000 (16:17 +0000)]
Replace size_t with an ugly, ugly hack. This was done so that code in the
core X-server would compile. Hopefully, this will soon be replaced with
explicitly sized types (i.e., uint32_t) and everyone will be happy.
Dave Airlie [Sun, 30 May 2004 23:38:08 +0000 (23:38 +0000)]
2.4 compat
Dave Airlie [Sun, 30 May 2004 23:34:23 +0000 (23:34 +0000)]
fixes from kernel: Make users of page->count use the provided macros
Roland Scheidegger [Tue, 18 May 2004 23:30:46 +0000 (23:30 +0000)]
fix whitespace issue in previous patch
Roland Scheidegger [Tue, 18 May 2004 23:03:22 +0000 (23:03 +0000)]
add R200_EMIT_RB3D_BLENDCOLOR state packet to support GL_EXT_blend_color,
GL_EXT_blend_func_separate and GL_EXT_blend_equation_separate on r200
Dave Airlie [Tue, 18 May 2004 09:46:31 +0000 (09:46 +0000)]
another 2.4 fix
Dave Airlie [Tue, 18 May 2004 09:42:22 +0000 (09:42 +0000)]
2.4 compat fix
Erdi Chen [Fri, 14 May 2004 23:54:31 +0000 (23:54 +0000)]
Add PCI id entry for VIA CN400 (UnichromePro) chip. XFree86 bug: Reported
by: Submitted by: Reviewed by: Obtained from:
Eric Anholt [Tue, 11 May 2004 04:43:43 +0000 (04:43 +0000)]
Merge from FreeBSD-current. Mostly 64-bit cleanliness fixes, but a few
driver interface changes from -current.
Eric Anholt [Tue, 11 May 2004 04:23:02 +0000 (04:23 +0000)]
Add missing DRM_ERR()s.
Dave Airlie [Mon, 10 May 2004 11:16:26 +0000 (11:16 +0000)]
do some real testing and fix the DRM initialising and unloading
Eric Anholt [Sun, 9 May 2004 22:36:19 +0000 (22:36 +0000)]
Add mach64 DRM module for BSD (untested, but compiles).
Eric Anholt [Sun, 9 May 2004 22:29:55 +0000 (22:29 +0000)]
Add .cvsignore files.
Eric Anholt [Sun, 9 May 2004 22:16:11 +0000 (22:16 +0000)]
Warning fixes.
Eric Anholt [Sun, 9 May 2004 22:14:07 +0000 (22:14 +0000)]
- Link in shared files as necessary and clean them up.
- Generate drm_pciids.h automatically.
Eric Anholt [Sun, 9 May 2004 22:07:58 +0000 (22:07 +0000)]
Catch up with sis's DRM tag change.
Eric Anholt [Sun, 9 May 2004 21:59:36 +0000 (21:59 +0000)]
Remove after repocopy to Makefile, now that we don't have to worry about
conflicting with imake's output.
Eric Anholt [Sun, 9 May 2004 21:57:58 +0000 (21:57 +0000)]
No /bin/bash on BSD.
Eric Anholt [Sun, 9 May 2004 21:56:19 +0000 (21:56 +0000)]
drm_hw_lock_t is now defined in drm.h, remove from here.
Dave Airlie [Sun, 9 May 2004 06:45:17 +0000 (06:45 +0000)]
Commit sysfs and drm PCI changes for 2.6 kernel
Dave Airlie [Sun, 9 May 2004 06:36:55 +0000 (06:36 +0000)]
make drm pciids
Dave Airlie [Mon, 3 May 2004 00:06:04 +0000 (00:06 +0000)]
use drm.. not dri for class...
Dave Airlie [Sun, 2 May 2004 13:03:51 +0000 (13:03 +0000)]
fix 2.4 build
Dave Airlie [Sun, 2 May 2004 12:27:17 +0000 (12:27 +0000)]
better device class support from Jon Smirls patches..
Dave Airlie [Mon, 26 Apr 2004 06:43:53 +0000 (06:43 +0000)]
add another tdfx
Dave Airlie [Thu, 22 Apr 2004 12:41:43 +0000 (12:41 +0000)]
Add __user annotations from kernel
Dave Airlie [Thu, 22 Apr 2004 11:31:55 +0000 (11:31 +0000)]
add sparc ffb files from kernel just to keep things in sync
Dave Airlie [Wed, 21 Apr 2004 23:45:18 +0000 (23:45 +0000)]
add new files to generate pci ids
Dave Airlie [Wed, 21 Apr 2004 12:18:42 +0000 (12:18 +0000)]
bug from Linux kernel list caught by checker
Dave Airlie [Wed, 21 Apr 2004 12:13:31 +0000 (12:13 +0000)]
centralise pci ids into one place and use scripts to generate files for
kernel
Michel Daenzer [Sun, 18 Apr 2004 22:59:01 +0000 (22:59 +0000)]
Move Makefile.linux to Makefile.
Get rid of Makefile juggling hacks which are no longer necessary.
Thomas Hellstrom [Mon, 12 Apr 2004 10:18:18 +0000 (10:18 +0000)]
1. Added a PCI ID.
2. Big change to the XvMC part of the SAREA. OpenGL clients will not suffer
from this, and via XvMC is still alpha. Needed to make future additions
to XvMC (More decoders and overlays) possible.
3. Bumped version number to 1.3.0.
Dave Airlie [Mon, 12 Apr 2004 05:44:16 +0000 (05:44 +0000)]
more files for mach64
Dave Airlie [Mon, 12 Apr 2004 05:27:40 +0000 (05:27 +0000)]
Add mach64 to the trunk
Michel Daenzer [Sat, 10 Apr 2004 16:20:00 +0000 (16:20 +0000)]
Have CVS ignore some files produced by the build.
Dave Airlie [Sat, 10 Apr 2004 13:52:43 +0000 (13:52 +0000)]
white space changes to align with kernel
Dave Airlie [Sat, 10 Apr 2004 13:25:30 +0000 (13:25 +0000)]
include highmem.h
Dave Airlie [Sat, 10 Apr 2004 12:58:18 +0000 (12:58 +0000)]
update gamma_dma with patch from davej in 2.6
Dave Airlie [Sat, 10 Apr 2004 08:15:48 +0000 (08:15 +0000)]
patch from Andrew Morton tree from Arjan van de Ven fixes some oopses seen
with 4G/4G split
Dave Airlie [Sat, 10 Apr 2004 07:41:19 +0000 (07:41 +0000)]
align code with Linux kernel.
Dave Airlie [Sat, 10 Apr 2004 07:39:00 +0000 (07:39 +0000)]
remove unused code
Dave Airlie [Sat, 10 Apr 2004 07:36:30 +0000 (07:36 +0000)]
update from linux kernel for ia64
Alan Hourihane [Fri, 9 Apr 2004 00:21:43 +0000 (00:21 +0000)]
remove Imakefile
Alan Hourihane [Thu, 8 Apr 2004 23:22:05 +0000 (23:22 +0000)]
fix build problem
Alan Hourihane [Thu, 8 Apr 2004 23:19:15 +0000 (23:19 +0000)]
disable PCI DMA ioctls as they are not used currently until SAVAGE_CMD_DMA
is made to work.
Dave Airlie [Thu, 8 Apr 2004 14:15:36 +0000 (14:15 +0000)]
big whitespace .. this aligns all the whitespace in this file with the bk
checkout linux tree
Dave Airlie [Thu, 8 Apr 2004 13:11:04 +0000 (13:11 +0000)]
2.6 sysfs patches + stubs in drmP.h for 2.4 compatibility
Dave Airlie [Thu, 8 Apr 2004 12:25:31 +0000 (12:25 +0000)]
long dev_t patches from 2.6 tree
Dave Airlie [Thu, 8 Apr 2004 12:22:22 +0000 (12:22 +0000)]
2.6 patches for larger dev_t
Dave Airlie [Thu, 8 Apr 2004 12:20:39 +0000 (12:20 +0000)]
more 2.4 compat fns
Dave Airlie [Thu, 8 Apr 2004 12:09:10 +0000 (12:09 +0000)]
patch from Linux kernel 2.6.5