Dave Airlie [Tue, 5 Jun 2007 08:14:54 +0000 (18:14 +1000)]
remove include of linux ioctl32.h from drm drivers
Maurice van der Pot [Mon, 4 Jun 2007 00:49:30 +0000 (10:49 +1000)]
nouveau: fix RAMHT wrapping
Dave Airlie [Sun, 3 Jun 2007 08:30:52 +0000 (18:30 +1000)]
radeon: refine irq acking for vbl on crtc 2
root [Sun, 3 Jun 2007 08:12:28 +0000 (18:12 +1000)]
Revert "drm: add new drm_wait_on function to replace macro"
This reverts commit
6e860d08d0f5b1e9a2d711aaf9fd6b982aa8039e.
As I said not a good plan - this macro will have to stay for now,
trying to do the vbl code with the inline was a bit messy - may need specialised
drm wait on functions
root [Sun, 3 Jun 2007 08:11:44 +0000 (18:11 +1000)]
Revert "move i915 to new drm_wait_on function"
This reverts commit
feb68037784ac09e333a321d294fdb2d8c57a4c8.
This was a bad idea, the macro is actually a bit harder to convert
to a static for the other use cases
Dave Airlie [Sun, 3 Jun 2007 06:28:21 +0000 (16:28 +1000)]
radeon: add support for vblank on crtc2
This add support for CRTC2 vblank on radeon similiar to the i915 support
Dave Airlie [Fri, 1 Jun 2007 09:00:24 +0000 (19:00 +1000)]
drm: fixup initialisation of list heads and idr
Wang Zhenyu [Wed, 30 May 2007 08:25:49 +0000 (16:25 +0800)]
i915: Add support for 945GME chip
Wang Zhenyu [Wed, 30 May 2007 08:24:42 +0000 (16:24 +0800)]
i915: Add support for 965GME/GLE chip.
Jung-uk Kim [Tue, 15 May 2007 20:35:33 +0000 (13:35 -0700)]
Update a bunch of FreeBSD port code.
Tested on r200/r300. i915 updates still remain to be done.
Brian [Tue, 29 May 2007 20:56:17 +0000 (14:56 -0600)]
reformatting, clean-ups
Brian [Tue, 29 May 2007 20:54:00 +0000 (14:54 -0600)]
Clean-ups and reformatting.
Use 4-space indentation consistently.
Replace occurances of:
if (cond) code;
with:
if (cond)
code;
to facilitate putting breakpoints on code.
Dave Airlie [Sat, 26 May 2007 22:44:38 +0000 (08:44 +1000)]
drm: move context handling code to use linux idr
Dave Airlie [Sat, 26 May 2007 21:26:52 +0000 (07:26 +1000)]
drm: convert drawable handling to use Linux idr
This cleans this code up a lot and uses the generic Linux idr which is
designed for this.
Signed-off-by: Dave Airlie <airlied@linux.ie>
Thomas Gleixner [Fri, 25 May 2007 19:20:59 +0000 (05:20 +1000)]
drm: spinlock initializer cleanup
Michel Dänzer [Fri, 25 May 2007 18:35:54 +0000 (04:35 +1000)]
drm: make sure the drawable code doesn't call malloc(0).
Signed-off-by: Michel Dänzer <michel@tungstengraphics.com>
Signed-off-by: Dave Airlie <airlied@linux.ie>
Dave Airlie [Fri, 25 May 2007 18:02:55 +0000 (04:02 +1000)]
radeon: add other IGP chipsets
Dave Airlie [Fri, 25 May 2007 17:48:08 +0000 (03:48 +1000)]
Revert "drm/ttm: cleanup mm_ioctl ioctls to be separate ioctls."
This reverts commit
3fdef0dc2000308b16907b95f637c60acde80a74.
ditto not on master yet
Dave Airlie [Fri, 25 May 2007 17:47:48 +0000 (03:47 +1000)]
Revert "drm/ttm: cleanup most of fence ioctl split out"
This reverts commit
3dfc1400e9fc58c69292d7cf7c2e1653fa5e6991.
this shouldn't have gone on master yet
Dave Airlie [Tue, 8 May 2007 05:43:29 +0000 (15:43 +1000)]
whitespace fixups from kernel
Dave Airlie [Tue, 8 May 2007 05:09:48 +0000 (15:09 +1000)]
ati_pcigart: cut to 80 chars
Dave Airlie [Sun, 6 May 2007 01:35:11 +0000 (11:35 +1000)]
drm/ttm: cleanup most of fence ioctl split out
Dave Airlie [Sun, 6 May 2007 01:17:30 +0000 (11:17 +1000)]
drm/ttm: cleanup mm_ioctl ioctls to be separate ioctls.
This is the first bunch of ioctls
Dave Airlie [Fri, 25 May 2007 18:26:24 +0000 (04:26 +1000)]
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.
Stephane Marchesin [Thu, 17 May 2007 15:35:14 +0000 (17:35 +0200)]
nouveau: don't build the module by default
Oliver McFadden [Sun, 13 May 2007 16:18:54 +0000 (16:18 +0000)]
r300: Added my comments into r300_reg.h.
Oliver McFadden [Sun, 13 May 2007 07:53:40 +0000 (07:53 +0000)]
r300: Synchronized R300 register defines file.
Just moved the indent control comments so that indent doesn't try to change
anything.
Matthieu Castet [Sat, 12 May 2007 13:35:39 +0000 (15:35 +0200)]
nouveau : nv10 graph move clipping value to per channel init
Matthieu Castet [Sat, 12 May 2007 13:16:37 +0000 (15:16 +0200)]
nouveau : nv10 graph clipping values were forgoten in ddx to drm commit
Keith Packard [Mon, 7 May 2007 13:07:48 +0000 (09:07 -0400)]
Allow vblank interrupts to remain disabled across VT switch.
i915_driver_irq_postinstall was forcing vblank interrupts to pipe A when
called with vblank interrupts disabled. This caused vblank interrupts to be
accidentally re-enabled when VT switching the X server. Instead, start the
driver with vblank interrupts enabled on pipe A to support older X servers,
but then leave control over the state to the X server if it is able to do so.
Oliver McFadden [Wed, 9 May 2007 18:31:31 +0000 (18:31 +0000)]
r300: Synchronized R300 register defines file.
Oliver McFadden [Wed, 9 May 2007 15:22:09 +0000 (15:22 +0000)]
r300: Synchronized R300 register defines file.
Matthieu Castet [Tue, 8 May 2007 19:18:02 +0000 (21:18 +0200)]
nouveau : fix fifo context size for nv10
Dave Airlie [Tue, 8 May 2007 07:51:21 +0000 (17:51 +1000)]
libdrm: fix typo on ttm fence interface
Brian [Sun, 6 May 2007 16:09:59 +0000 (10:09 -0600)]
s/OJBECTS/OBJECTS/
Oliver McFadden [Sun, 6 May 2007 12:47:03 +0000 (12:47 +0000)]
r300: Synchronize the register file from Mesa.
Oliver McFadden [Sun, 6 May 2007 12:35:16 +0000 (12:35 +0000)]
r300: Use the defined names for known registers.
Dave Airlie [Sun, 6 May 2007 00:50:10 +0000 (10:50 +1000)]
drm: remove unused define DRM_HAS_TTM
Thomas Hellstrom [Wed, 2 May 2007 15:13:32 +0000 (17:13 +0200)]
Fix buffer object list freeing.
Michel Dänzer [Tue, 1 May 2007 15:03:55 +0000 (17:03 +0200)]
Michel Dänzer [Sun, 29 Apr 2007 10:17:57 +0000 (12:17 +0200)]
radeon: Don't mess up page flipping when a file descriptor is closed.
There can still be other contexts that may use page flipping later on, so don't
just unilaterally 'clean it up', which could lead to the wrong page being
displayed, e.g. when running 3D apps with a GLX compositing manager such as
compiz using page flipping.
Dave Airlie [Sat, 28 Apr 2007 05:07:22 +0000 (15:07 +1000)]
move i915 to new drm_wait_on function
Dave Airlie [Sat, 28 Apr 2007 05:05:20 +0000 (15:05 +1000)]
drm: add new drm_wait_on function to replace macro
Dave Airlie [Sat, 28 Apr 2007 05:04:49 +0000 (15:04 +1000)]
remove register usage
Dave Airlie [Sat, 28 Apr 2007 04:49:27 +0000 (14:49 +1000)]
remove DRM_GETSAREA and replace with drm_getsarea function
George Sapountzis [Thu, 26 Apr 2007 11:16:51 +0000 (14:16 +0300)]
Revert "bug 7092 : add pci ids for mach64 in Dell poweredge 4200"
This reverts commit
255f3e6f76dfd267a14765dd1293229184298d89.
Rage IIc does not have a vertex setup engine.
George Sapountzis [Thu, 26 Apr 2007 11:16:28 +0000 (14:16 +0300)]
linux: minor indent.
George Sapountzis [Thu, 26 Apr 2007 11:16:13 +0000 (14:16 +0300)]
freebsd: remove stray apperance of IN_MODULE.
The xserver no longer uses the libc-wrapper.
George Sapountzis [Thu, 26 Apr 2007 11:15:55 +0000 (14:15 +0300)]
libdrm: remove HAVE_XORG_CONFIG_H and XFree86LOADER ifdef's.
We no longer import libdrm in the xserver.
Dave Airlie [Thu, 26 Apr 2007 07:54:06 +0000 (17:54 +1000)]
update create_lk_drm.sh script
Dave Airlie [Thu, 26 Apr 2007 06:25:43 +0000 (16:25 +1000)]
whitespace cleanup
Dave Airlie [Thu, 26 Apr 2007 06:22:28 +0000 (16:22 +1000)]
remove some whitespace violation
Dave Airlie [Thu, 26 Apr 2007 06:22:11 +0000 (16:22 +1000)]
drm: nopfn warning on 64-bit
Jesse Barnes [Thu, 26 Apr 2007 06:09:24 +0000 (16:09 +1000)]
drm/ttm: allow drm_buffer_object_create to be used in-kernel
Jesse Barnes [Wed, 11 Apr 2007 19:51:52 +0000 (12:51 -0700)]
Add new buffer object type for kernel allocations that don't initially have a user mapping.
(cherry picked from commit
2e21779992bd5026d8ec4dea52466377dbe5a0ed)
Brian [Wed, 25 Apr 2007 20:52:29 +0000 (14:52 -0600)]
More detailed instructions, tips.
Stephane Marchesin [Mon, 23 Apr 2007 20:37:01 +0000 (22:37 +0200)]
nouveau: fix wacky pci id
Kristian Høgsberg [Fri, 20 Apr 2007 22:06:31 +0000 (18:06 -0400)]
Initialize rwlock using rwlock_init to appease lockdep validator.
Thomas Hellstrom [Thu, 19 Apr 2007 21:25:14 +0000 (23:25 +0200)]
Avoid a fence timeout problem when a signal is pending.
Thomas Hellstrom [Fri, 20 Apr 2007 13:49:31 +0000 (15:49 +0200)]
Fix via compile error
(Reported by Benno Schulenberg.)
Thomas Hellstrom [Wed, 18 Apr 2007 14:33:28 +0000 (16:33 +0200)]
Simplify the ttm backend interface and the agp ttm backend.
Thomas Hellstrom [Tue, 17 Apr 2007 12:15:37 +0000 (14:15 +0200)]
Don't always free up memory space when we unpin buffers.
Thomas Hellstrom [Tue, 17 Apr 2007 08:53:19 +0000 (10:53 +0200)]
Fix buffer object reference problems.
(Reported by Dave Airlie).
Thomas Hellstrom [Tue, 17 Apr 2007 06:58:23 +0000 (08:58 +0200)]
via: Make sure we flush write-combining using a follow-up read.
Thomas Hellstrom [Tue, 17 Apr 2007 06:46:45 +0000 (08:46 +0200)]
Add a code comment.
Thomas Hellstrom [Mon, 16 Apr 2007 14:23:05 +0000 (16:23 +0200)]
Require the hardware lock for buffer creation
(since that implies a validate).
Fix drm_bo_wait_unfenced error messages and codes.
Fix some return codes from libdrm.
Matthieu Castet [Tue, 10 Apr 2007 21:19:29 +0000 (23:19 +0200)]
nouveau: nv10 per channel init from ddx
Oliver McFadden [Mon, 9 Apr 2007 23:23:40 +0000 (23:23 +0000)]
rs480: Renamed some unknown registers. See dri-devel list.
Ben Skeggs [Mon, 9 Apr 2007 13:20:26 +0000 (23:20 +1000)]
nouveau: NV46 support
Dave Airlie [Mon, 9 Apr 2007 12:00:34 +0000 (22:00 +1000)]
radeon: bump version for IGPGART support
Dave Airlie [Mon, 9 Apr 2007 11:52:59 +0000 (21:52 +1000)]
radeon: add support for reverse engineered xpress200m
The IGPGART setup code was traced using mmio-trace on fglrx by myself
and Phillip Ezolt <phillipezolt@gmail.com> on dri-devel.
This code doesn't let the 3D driver work properly as the card has no
vertex shader support.
Thanks to Matthew Garrett + Ubuntu for providing me some hardware to do this
work on.
Dave Airlie [Fri, 6 Apr 2007 21:21:05 +0000 (07:21 +1000)]
fixup install target, not sure what I was smokin...
Dave Airlie [Sun, 1 Apr 2007 06:30:52 +0000 (16:30 +1000)]
i915: use breadcrumb macro everywhere
Ben Skeggs [Thu, 5 Apr 2007 17:24:39 +0000 (03:24 +1000)]
nouveau: make a note about a bit that breaks some cards
Ben Skeggs [Thu, 5 Apr 2007 17:03:59 +0000 (03:03 +1000)]
nouveau: Power up all card units by default on startup.
Dave Airlie [Thu, 5 Apr 2007 01:18:00 +0000 (11:18 +1000)]
add an install target to the drm modules makefile
Thomas Hellstrom [Tue, 3 Apr 2007 08:54:23 +0000 (10:54 +0200)]
Fix user object reference when caller is not object creator.
(Reported by Dave Airlie).
Thomas Hellstrom [Tue, 3 Apr 2007 08:24:06 +0000 (10:24 +0200)]
Add a fence flush event to each fence-signaled check when lazy-waiting
to make sure we don't lose any sequence numbers if, for some reason,
they don't generate an IRQ.
Thomas Hellstrom [Tue, 3 Apr 2007 08:21:41 +0000 (10:21 +0200)]
Make sure we ack irqs before we read a breadcrumb so that
breadcrumb updates that occur _AFTER_ we've read the breadcrumb really
generates a new IRQ.
Thomas Hellstrom [Fri, 30 Mar 2007 12:14:26 +0000 (14:14 +0200)]
Evicted no-move buffers can get lost if they end up in another
memory type than local.
Thomas Hellstrom [Fri, 30 Mar 2007 10:23:22 +0000 (12:23 +0200)]
Fix an oops when trying to clean a not yet initialized memory type.
Thomas Hellstrom [Thu, 29 Mar 2007 19:33:41 +0000 (21:33 +0200)]
Make sure CMA (Can't map aperture) pages are mapped uncached.
(Should really make this write-combined using PATs, at some point).
Oliver McFadden [Mon, 2 Apr 2007 19:45:10 +0000 (19:45 +0000)]
r300: Synchronize the register header file again.
It's a good idea to keep these synchronized; even though the DRM doesn't use all
the defines, maintaining two different copies is prone to errors when the diff
gets bigger.
Matthieu Castet [Sun, 1 Apr 2007 12:31:41 +0000 (14:31 +0200)]
nouveau: fix usage of PGRAPH_CTX_CONTROL on nv20+
http://gitweb.freedesktop.org/?p=mesa/drm.git;a=commitdiff;h=
17985f07d68322519919a7f629a6d2d9bf3916ed could have broken some nvxx_graph code : it rename NV03_PGRAPH_CTX_CONTROL to NV10_PGRAPH_CTX_CONTROL, but forgot to update it in nvxx_graph file.
Also when migrating init stuff in http://gitweb.freedesktop.org/?p=mesa/drm.git;a=commitdiff;h=
674cefd4fe4b537a20a10edcb4ec5df55facca8e, NV04_PGRAPH_CTX_CONTROL is used everywhere but the old ddx code use NV_PGRAPH_CTX_CONTROL_NV04 or NV_PGRAPH_CTX_CONTROL.
Matthieu Castet [Sun, 1 Apr 2007 12:21:29 +0000 (14:21 +0200)]
nouveau : nv10 ctx switch fix
restoring NV10_PGRAPH_CTX_SWITCH1 now works
Matthieu Castet [Sat, 31 Mar 2007 22:44:11 +0000 (00:44 +0200)]
nouveau : set the correct PGRAPH_CTX_CONTROL register
"
5a072f32 (Stephane Marchesin 2007-02-03 04:57:06 +0100" broke nv10 ctx switch by setting wrong PGRAPH_CTX_CONTROL reg
Eric Anholt [Fri, 30 Mar 2007 19:56:34 +0000 (12:56 -0700)]
Merge branch 'crestline-qa', adding support for the 965GM chipset.
Eric Anholt [Fri, 30 Mar 2007 19:56:08 +0000 (12:56 -0700)]
Merge branch 'origin'
Dave Airlie [Wed, 28 Mar 2007 23:25:04 +0000 (09:25 +1000)]
drm/bo: avoid oops if the memory manager for this type isn't initialised
Stephane Marchesin [Wed, 28 Mar 2007 22:54:18 +0000 (00:54 +0200)]
nouveau: fix nv04 context switches.
Dave Airlie [Tue, 27 Mar 2007 08:01:31 +0000 (18:01 +1000)]
drm/i915: set the bo up at firstopen time not after DMA init
This is required to use TTM to allocate the ring buffer.
Dave Airlie [Tue, 27 Mar 2007 07:59:30 +0000 (17:59 +1000)]
drm/ttm: make sure dev_mapping is set-up for the first opener of the drm
This was causing an oops in my miniglx code to try and use a TTM-only setup.
Nian Wu [Tue, 27 Mar 2007 04:53:13 +0000 (12:53 +0800)]
Merge git://proxy01.pd.intel.com:9419/git/mesa/drm into crestline
Ben Skeggs [Mon, 26 Mar 2007 09:43:48 +0000 (19:43 +1000)]
nouveau: move card initialisation into the drm
The PGRAPH init for the various cards will need cleaning up at some point,
a lot of the values written there are per-context state left over from the
all the hardcoding done in the ddx.
It's possible some cards get broken by this commit, let me know.
Tested on: NV5, NV18, NV28, NV35, NV40, NV4E
Nian Wu [Sun, 25 Mar 2007 09:00:36 +0000 (17:00 +0800)]
Merge git://proxy01.pd.intel.com:9419/git/mesa/drm into crestline
Eric Anholt [Sat, 24 Mar 2007 16:39:09 +0000 (09:39 -0700)]
Catch up to new interrupt API, and retire FreeBSD 4.x support here.
Dave Airlie [Sat, 24 Mar 2007 06:58:27 +0000 (17:58 +1100)]
vm: cleanup drm_vm.c along lines of cleanups queued for kernel
Nian Wu [Fri, 23 Mar 2007 09:00:41 +0000 (17:00 +0800)]
Merge git://proxy01.pd.intel.com:9419/git/mesa/drm into crestline
Ben Skeggs [Fri, 23 Mar 2007 03:45:00 +0000 (14:45 +1100)]
nouveau: rework nouveau_fifo_alloc() so the drm can create internal FIFOs
Dave Airlie [Fri, 23 Mar 2007 03:56:39 +0000 (14:56 +1100)]
cleanup more whitespace from ttm merge