Arthur Huillet [Fri, 12 Oct 2007 20:39:58 +0000 (22:39 +0200)]
nouveau: mandatory "oops I forgot half of the files" commit
Arthur Huillet [Fri, 12 Oct 2007 20:35:39 +0000 (22:35 +0200)]
nouveau: added support for software methods, and implemented those necessary for NV04 (TNT1) to start X
Dave Airlie [Fri, 12 Oct 2007 00:54:38 +0000 (10:54 +1000)]
i915: add superioctl support to i915
This adds the initial i915 superioctl interface. The interface should be
sufficent even if the implementation may needs fixes/optimisations internally
in the drm wrt caching etc.
Dave Airlie [Thu, 11 Oct 2007 23:46:11 +0000 (09:46 +1000)]
i915: check mask instead of flags for buffer fence types
Eric Anholt [Wed, 10 Oct 2007 22:31:00 +0000 (15:31 -0700)]
FreeBSD: Fill in domain field when supported.
Ian Romanick [Wed, 10 Oct 2007 22:27:07 +0000 (15:27 -0700)]
Eliminate trailing whitespace from last commit.
Ian Romanick [Wed, 10 Oct 2007 22:25:30 +0000 (15:25 -0700)]
Fix command list submission on big-endian.
Matthieu Castet [Wed, 10 Oct 2007 19:11:43 +0000 (21:11 +0200)]
nouveau : nv10 and nv04 PGRAPH_NSTATUS are different
Maarten Maathuis [Wed, 10 Oct 2007 14:41:21 +0000 (16:41 +0200)]
nouveau: PMC_BOOT_1 was not mapped.
Thomas Hellstrom [Wed, 10 Oct 2007 07:31:51 +0000 (09:31 +0200)]
Only add native-type on EXE signals. Otherwise flush flags may
get out of sync.
Stephane Marchesin [Tue, 9 Oct 2007 23:12:20 +0000 (01:12 +0200)]
nouveau: try to fix big endian.
Maarten Maathuis [Sun, 7 Oct 2007 17:01:56 +0000 (19:01 +0200)]
nouveau: A char is signed, so it may overflow for >NV50.
Matthieu Castet [Sat, 6 Oct 2007 10:00:08 +0000 (12:00 +0200)]
nouveau : print correct value in nouveau_graph_dump_trap_info for nv04
Dave Airlie [Fri, 5 Oct 2007 02:11:43 +0000 (12:11 +1000)]
Merge branch 'pre-superioctl-branch'
Maarten Maathuis [Thu, 4 Oct 2007 07:46:16 +0000 (09:46 +0200)]
nouveau: Remove excess device classes.
Maarten Maathuis [Thu, 4 Oct 2007 07:39:31 +0000 (09:39 +0200)]
nouveau: NV47 context switching voodoo + warning
Maarten Maathuis [Thu, 4 Oct 2007 07:31:46 +0000 (09:31 +0200)]
nouveau: Switch over to using PMC_BOOT_0 for card detection.
Maarten Maathuis [Tue, 2 Oct 2007 19:54:37 +0000 (21:54 +0200)]
linux-drm: Obey device class requirements when detecting devices.
Dave Airlie [Thu, 4 Oct 2007 06:13:22 +0000 (16:13 +1000)]
drm: fix page count calculation
Also no need to do pre-populate work on single page
Stephane Marchesin [Thu, 4 Oct 2007 01:43:59 +0000 (03:43 +0200)]
nouveau: nv2a drm context switch support.
Ian Romanick [Wed, 3 Oct 2007 21:12:16 +0000 (14:12 -0700)]
Use 'ifdef __BIG_ENDIAN' instead of 'if __BIG_ENDIAN'
Ian Romanick [Wed, 3 Oct 2007 21:08:18 +0000 (14:08 -0700)]
First round of byte-ordering fixes for PowerPC.
This isn't 100% as command submission via PCI-e GART buffers doesn't work.
I've hacked around that for the time being. This is essentially the code
that was used at the POWER.org event to show Bimini.
Pekka Paalanen [Tue, 2 Oct 2007 18:56:01 +0000 (21:56 +0300)]
nouveau: nv20 graph_create_context difference
nv20 writes the chan->id to a different place than nv28.
This still does not make nv20 run nv10_demo.
Pekka Paalanen [Tue, 2 Oct 2007 18:51:14 +0000 (21:51 +0300)]
nouveau: fix nv25_graph_context_init
It was writing 4x the data in a loop.
Stuart Bennett [Tue, 2 Oct 2007 14:45:30 +0000 (15:45 +0100)]
nouveau: nv20 graph context init
Dave Airlie [Tue, 2 Oct 2007 05:48:28 +0000 (15:48 +1000)]
ttm: returning into dummy causes a buffer object leak
as nobody ever derefs dummy, however not returning does the deref
correctly.
Maarten Maathuis [Mon, 1 Oct 2007 20:21:23 +0000 (22:21 +0200)]
nouveau: Fix dereferencing a NULL pointer when erroring out during initialization.
Stephane Marchesin [Mon, 1 Oct 2007 01:28:10 +0000 (03:28 +0200)]
nouveau: flip the ctx switch bit on. it seems to be ignored on nv34 but causes nv30 issues.
Matthieu Castet [Sun, 30 Sep 2007 21:19:39 +0000 (23:19 +0200)]
nouveau : nv30 remove harcoded NV20_PGRAPH_CHANNEL_CTX_TABLE
Matthieu Castet [Sun, 30 Sep 2007 21:09:30 +0000 (23:09 +0200)]
nouveau : nv20_graph replace nouveau_graph_wait_idle by nouveau_wait_for_idle
Also clean PGRAPH_CHANNEL macros
Pekka Paalanen [Sun, 30 Sep 2007 19:04:53 +0000 (22:04 +0300)]
nouveau: rename nv30_graph.c to nv20_graph.c
Pekka Paalanen [Sun, 30 Sep 2007 18:10:06 +0000 (21:10 +0300)]
nouveau: nv30 graph function renames, removed nv20_graph.c
All nv30 functions in nv30_graph.c that can be used on nv20 are renamed
as accordingly. nv20 specific parts from nv20_graph.c are moved into
nv30_graph.c.
Pekka Paalanen [Sun, 30 Sep 2007 15:14:24 +0000 (18:14 +0300)]
nouveau: graph ctx init nv25
According to mmio_trace_900XGL.tar.bz2 by Evan Fraser the nv25 init is
exactly the same as nv28 init.
Pekka Paalanen [Sun, 30 Sep 2007 09:03:22 +0000 (12:03 +0300)]
nouveau: nv28 graph context init
Pekka Paalanen [Sat, 29 Sep 2007 20:17:19 +0000 (23:17 +0300)]
nouveau: let nv20 hardware do ctx switching automatically.
Pekka Paalanen [Sat, 29 Sep 2007 20:06:29 +0000 (23:06 +0300)]
nouveau: Make nv20 use the nv30 PGRAPH ctx functions.
Pekka Paalanen [Sat, 29 Sep 2007 18:09:09 +0000 (21:09 +0300)]
nouveau: Change couple constants to symbols.
Pekka Paalanen [Sat, 29 Sep 2007 18:07:46 +0000 (21:07 +0300)]
nouveau: NV30 should never call nouveau_nv20_context_switch().
Matthieu Castet [Sun, 30 Sep 2007 12:50:22 +0000 (14:50 +0200)]
nouveau : pgraph_ctx dynamic alloc for nv04, nv10
Matthieu Castet [Sun, 30 Sep 2007 12:21:47 +0000 (14:21 +0200)]
nouveau : nv04 don't use chan->pgraph_ctx array
This commit is a first step to dynamic alloc pgraph context on nv04, nv10.
Matthieu Castet [Sat, 29 Sep 2007 21:06:29 +0000 (23:06 +0200)]
nouveau : stop the fifo of the channel we are deleting
Matthieu Castet [Sat, 29 Sep 2007 21:05:44 +0000 (23:05 +0200)]
nouveau : nv1x fix strange corruption
that appears when running glxgears and nouveau demo
chaohong guo [Sat, 29 Sep 2007 16:06:47 +0000 (18:06 +0200)]
radeon: Commit the ring after each partial texture upload blit.
This makes sure each blit starts as early as possible, which may improve
texture upload performance in some cases.
Michel Dänzer [Thu, 27 Sep 2007 06:01:58 +0000 (08:01 +0200)]
Don't build without any optimization on Linux.
Building without optimization causes the drm module not to link correctly on
ppc.
Matthieu Castet [Fri, 28 Sep 2007 19:28:47 +0000 (21:28 +0200)]
nouveau : clean chan->pgraph_ctx stuff. We now do a static init of the array.
This avoid hardcoding pgraph_ctx size and potential buffer overflow.
Jesse Barnes [Fri, 28 Sep 2007 17:10:08 +0000 (10:10 -0700)]
Revert drm_i915_flip_t braindamage
I should not have renamed this field.
I should not have renamed this field.
I should not have renamed this field.
On the plus side, it was at least binary compatible.
Keith Packard [Wed, 26 Sep 2007 21:25:10 +0000 (14:25 -0700)]
Allow parallel module compile
Alan Hourihane [Wed, 26 Sep 2007 15:18:19 +0000 (16:18 +0100)]
Add brackets
Alan Hourihane [Wed, 26 Sep 2007 14:38:54 +0000 (15:38 +0100)]
don't copy back if an error was returned.
Thomas Hellstrom [Tue, 25 Sep 2007 16:03:31 +0000 (18:03 +0200)]
Merge branch 'master' into pre-superioctl-branch
Conflicts:
linux-core/drm_bo.c
linux-core/drm_fence.c
linux-core/drm_objects.h
shared-core/drm.h
Dave Airlie [Tue, 25 Sep 2007 06:16:14 +0000 (16:16 +1000)]
drm: use fence_class as name instead of class
Dave Airlie [Wed, 12 Sep 2007 13:50:38 +0000 (23:50 +1000)]
drm/ttm: fixup fence class naming and interfaces
This is some code for nouveau that Ben Skeggs worked on, and also
fixes the naming (having class in a system header file == C++ keyword == bad plan)
Thomas Hellstrom [Sat, 22 Sep 2007 12:30:55 +0000 (14:30 +0200)]
Fix pinned buffer fence class.
Thomas Hellstrom [Sat, 22 Sep 2007 11:59:56 +0000 (13:59 +0200)]
Fix drm_bo.c compiling.
Thomas Hellstrom [Sat, 22 Sep 2007 11:38:36 +0000 (13:38 +0200)]
Make nouveau compile on older kernels.
Thomas Hellstrom [Sat, 22 Sep 2007 11:34:33 +0000 (13:34 +0200)]
Add fence error member.
Modify the TTM backend bind arguments.
Export a number of functions needed for driver-specific super-ioctls.
Add a function to map buffer objects from the kernel, regardless of where they're
currently placed.
A number of error fixes.
Eric Anholt [Sat, 22 Sep 2007 00:05:21 +0000 (17:05 -0700)]
Merge branch 'bo-set-pin'
This branch replaces the NO_MOVE/NO_EVICT flags to buffer validation with a
separate privileged ioctl to pin buffers like NO_EVICT meant before. The
functionality that was supposed to be covered by NO_MOVE may be reintroduced
later, possibly in a different way, after the superioctl branch is merged.
Eric Anholt [Fri, 21 Sep 2007 23:14:22 +0000 (16:14 -0700)]
Add some more verbosity to drm_bo_set_pin_req comments.
Eric Anholt [Fri, 21 Sep 2007 22:58:02 +0000 (15:58 -0700)]
Fix mapCount refcounting on unmap, even though the value is unused.
Stephane Marchesin [Fri, 21 Sep 2007 20:42:39 +0000 (22:42 +0200)]
nouveau: fix ppc and get it right this time.
Stephane Marchesin [Fri, 21 Sep 2007 20:27:53 +0000 (22:27 +0200)]
nouveau: fix notifiers on PPC.
Stephane Marchesin [Fri, 21 Sep 2007 20:04:45 +0000 (22:04 +0200)]
nouveau: add some checks to the nv04 graph switching code.
Dave Airlie [Thu, 20 Sep 2007 04:01:29 +0000 (14:01 +1000)]
drm_sysfs: update sysfs code from kernel
Eric Anholt [Wed, 19 Sep 2007 22:55:58 +0000 (15:55 -0700)]
Merge branch 'origin' into bo-set-pin
Michel Dänzer [Tue, 18 Sep 2007 20:03:22 +0000 (21:03 +0100)]
i915: Reinstate check that drawable has valid information in i915_vblank_swap.
Michel Dänzer [Tue, 18 Sep 2007 19:55:43 +0000 (20:55 +0100)]
i915: Fix scheduled buffer swaps.
One instance of unlocking a spinlock was converted incorrectly when this code
was fixed to build on BSD.
Ian Romanick [Tue, 18 Sep 2007 18:03:49 +0000 (11:03 -0700)]
Add ioc32 compat layer for XGI DRM.
Ian Romanick [Tue, 18 Sep 2007 18:03:08 +0000 (11:03 -0700)]
Fix ioc32 compat layer
Previously any ioctls that weren't explicitly listed in the compat ioctl
table would fail with ENOTTY. If the incoming ioctl number is outside the
range of the table, assume that it Just Works, and pass it off to drm_ioctl.
This make the fence related ioctls work on 64-bit PowerPC.
Brian [Wed, 12 Sep 2007 18:05:15 +0000 (12:05 -0600)]
Added bool typedef added in kernel 2.6.19
This allows the xgi code to compile with older kernels.
Brian [Wed, 12 Sep 2007 17:48:48 +0000 (11:48 -0600)]
Added idr_replace() function which was apparently added in Linux 2.6.18
Someone should probably double-check my work here since this is the
first time I've touched drm_compat.[ch]
Jesse Barnes [Wed, 12 Sep 2007 15:55:33 +0000 (08:55 -0700)]
Remove plane->pipe mapping from SAREA private after all
We can figure out which pipe a given plane is mapped to by looking at the
display control registers instead of tracking it in a new SAREA private field.
If this becomes a performance problem, we could move to an ioctl based solution
by adding a new parameter for the DDX to set (defaulting to the old behavior if
the param was never set of course).
Jesse Barnes [Tue, 11 Sep 2007 10:50:17 +0000 (03:50 -0700)]
Merge branch 'master' of ssh://git.freedesktop.org/git/mesa/drm
Jesse Barnes [Tue, 11 Sep 2007 10:48:46 +0000 (03:48 -0700)]
Disambiguate planes & pipes for swap operations
This mod makes the SAREA track plane to pipe mappings and corrects the name of
the plane info variables (they were mislabeled as pipe info since until now all
code assumed a direct mapping between planes and pipes).
It also updates the flip ioctl argument to take a set of planes rather than
pipes, since planes are flipped while pipes generate vblank events.
Patrice Mandin [Mon, 10 Sep 2007 16:52:17 +0000 (18:52 +0200)]
nouveau: nv10: add combiner registers
Matthieu Castet [Sun, 9 Sep 2007 13:49:33 +0000 (15:49 +0200)]
nouveau : nv10 fix NV10_PGRAPH_CTX_USER save/load
Matthieu Castet [Sun, 9 Sep 2007 10:13:00 +0000 (12:13 +0200)]
nouveau : nv10 pipe ctx switch load/save.
This fix some issues with more than one 3D fifo, but there still some "corruption" sometimes
Maarten Maathuis [Sat, 8 Sep 2007 20:19:00 +0000 (22:19 +0200)]
nouveau: Add Quadro NVS 140 pciid
Ben Skeggs [Fri, 7 Sep 2007 10:07:13 +0000 (20:07 +1000)]
nouveau: Use nv41 ctxprog/vals on nv42.
Ian Romanick [Thu, 6 Sep 2007 22:37:52 +0000 (15:37 -0700)]
Merge branch 'xgi-0-0-2'
Ian Romanick [Thu, 6 Sep 2007 22:20:52 +0000 (15:20 -0700)]
Bump version to 1.0.0.
Stephane Marchesin [Thu, 6 Sep 2007 00:46:45 +0000 (02:46 +0200)]
nouveau: fix some nv04 graph switching.
Stephane Marchesin [Thu, 6 Sep 2007 00:12:05 +0000 (02:12 +0200)]
nouveau: add pure nv30 support.
Maarten Maathuis [Tue, 4 Sep 2007 16:51:57 +0000 (18:51 +0200)]
Add context init voodoo and context switch code for NV41.
Ian Romanick [Fri, 31 Aug 2007 17:54:55 +0000 (10:54 -0700)]
Merge branch 'master' of ssh+git://git.freedesktop.org/git/mesa/drm into xgi-0-0-2
Ian Romanick [Fri, 31 Aug 2007 17:48:13 +0000 (10:48 -0700)]
Acutally emit the IRQ (duh) when setting the fence post.
Stephane Marchesin [Thu, 30 Aug 2007 23:39:40 +0000 (01:39 +0200)]
nouveau: nv04 context switching support. Works for starting X up at least.
Stephane Marchesin [Thu, 30 Aug 2007 19:51:53 +0000 (21:51 +0200)]
nouveau: give nv03 the last cut.
Ian Romanick [Wed, 29 Aug 2007 21:41:49 +0000 (14:41 -0700)]
Use ati_pcigart for PCI-e GART table handling.
Ian Romanick [Wed, 29 Aug 2007 07:23:30 +0000 (00:23 -0700)]
Fix late night dumb-dumb mistake.
Ian Romanick [Wed, 29 Aug 2007 07:04:18 +0000 (00:04 -0700)]
Use DRM_SPINLOCK / DRM_UNSPINLOCK macros.
Keith Packard [Tue, 28 Aug 2007 19:23:51 +0000 (12:23 -0700)]
Add register defines for hw binning
Dave Airlie [Tue, 28 Aug 2007 05:17:11 +0000 (15:17 +1000)]
drm: remove XFREE86_VERSION macros
Matthieu Castet [Sun, 26 Aug 2007 18:48:32 +0000 (20:48 +0200)]
nouveau : add NV04_PGRAPH_TRAPPED_ADDR definition
- fix offset for nv04
- use it in nv10 graph ctx switch for getting next channel
- dump NV10_PGRAPH_TRAPPED_DATA_HIGH on nv10+
Matthieu Castet [Sat, 25 Aug 2007 20:10:45 +0000 (22:10 +0200)]
nouveau : nv1x graph reworks
- add forgotten init value
- use the same PGRAPH_DEBUG than the blob
- remove init of ddx reg : it should be done with object
- better handle of channel destruction
hope I didn't break anything ;)
Patrice Mandin [Fri, 24 Aug 2007 22:12:58 +0000 (00:12 +0200)]
nouveau: nv10: output a warning if last channel invalid, and switch to next
Patrice Mandin [Thu, 23 Aug 2007 08:18:34 +0000 (10:18 +0200)]
nouveau: nv10: check some NULL pointers inside context switch
Matthieu Castet [Wed, 22 Aug 2007 21:17:56 +0000 (23:17 +0200)]
nouveau : fix some potential crashes with objects causing hash collision
Ben Skeggs [Wed, 22 Aug 2007 03:23:49 +0000 (13:23 +1000)]
nouveau/nv40: Preserve other bits in 0x400304/0x400310 like NVIDIA do.
Ben Skeggs [Wed, 22 Aug 2007 03:17:19 +0000 (13:17 +1000)]
nouveau/nv40: Dump extra info on ucode state if ctx switch fails.
Ben Skeggs [Wed, 22 Aug 2007 03:09:27 +0000 (13:09 +1000)]
nouveau: NV4c ctx ucode.
Seems we already have a nv4c_ctx_init() somehow, a quick check shows the
ucode matches it still.