Ben Skeggs [Wed, 8 Aug 2007 02:28:20 +0000 (12:28 +1000)]
Merge branch 'upstream-master' into upstream-randr-1.2
Conflicts:
src/nv_dma.c
src/nv_dma.h
src/nv_exa.c
Ben Skeggs [Wed, 8 Aug 2007 01:48:48 +0000 (11:48 +1000)]
Add forgotten prototype
Ben Skeggs [Wed, 8 Aug 2007 00:32:08 +0000 (10:32 +1000)]
Timeouts got lost somewhere along the way..
Stephane Marchesin [Tue, 7 Aug 2007 21:42:09 +0000 (23:42 +0200)]
Fix some overlooked hardcoded subchannels...
Stephane Marchesin [Mon, 6 Aug 2007 21:30:04 +0000 (23:30 +0200)]
Fix explicit usage of subchannels, and remove subchannel defines altogether.
Matthieu Castet [Mon, 6 Aug 2007 17:55:52 +0000 (19:55 +0200)]
make XAA work on nv17
Stephane Marchesin [Mon, 6 Aug 2007 16:27:19 +0000 (18:27 +0200)]
oops remove the debugging ErrorFs.
Stephane Marchesin [Mon, 6 Aug 2007 16:13:13 +0000 (18:13 +0200)]
Fix UTS/DFS when gart is smaller than transfer size.
Ben Skeggs [Mon, 6 Aug 2007 16:09:30 +0000 (02:09 +1000)]
NVDmaSetObjectFromSubchannel doesn't exist anymore!
Stephane Marchesin [Mon, 6 Aug 2007 15:29:41 +0000 (17:29 +0200)]
Add subchannel handling code
Ben Skeggs [Mon, 6 Aug 2007 11:45:50 +0000 (21:45 +1000)]
Adapt to drm 0.0.10
Arthur Huillet [Sun, 5 Aug 2007 23:37:17 +0000 (01:37 +0200)]
Xv: waiting for last transfers to finish before freeing notifiers
Ben Skeggs [Sun, 5 Aug 2007 14:13:35 +0000 (00:13 +1000)]
Clamp NV_MEMORY_TO_MEMORY_FORMAT_LINE_COUNT to 2047 lines.
At least NV40 can't handle values larger than this. Patch fixes hang
when visiting opengl.org.
Arthur Huillet [Mon, 30 Jul 2007 01:27:55 +0000 (03:27 +0200)]
Xv now manages a pool of 6 notifiers for its double buffering. Also improved the memory allocation logic.
Arthur Huillet [Sat, 28 Jul 2007 23:54:42 +0000 (01:54 +0200)]
Xv: fixed bugs when displayed only part of the source image (tvtime with overscan)
Xv: fixed bug with overlay behaving badly when window is partly out of screen
Xv: clean up NVPutImage code
Dave Airlie [Sat, 28 Jul 2007 06:34:49 +0000 (16:34 +1000)]
exa: disable compositing on big endian machines
This at least allows me to see what I'm typing for now :-)
Arthur Huillet [Fri, 27 Jul 2007 17:50:48 +0000 (19:50 +0200)]
no overlay with composite
Arthur Huillet [Fri, 27 Jul 2007 14:28:48 +0000 (16:28 +0200)]
Xv: gotos are evil
Arthur Huillet [Fri, 27 Jul 2007 13:11:31 +0000 (15:11 +0200)]
Removed comments in preparation for upstream push
Arthur Huillet [Thu, 26 Jul 2007 21:00:02 +0000 (23:00 +0200)]
re-added CPU copy code as a second fallback option (first being to use X GARTScratch)
Arthur Huillet [Thu, 26 Jul 2007 14:08:40 +0000 (16:08 +0200)]
Completely removed notifier wait, when using double buffered stuff.
I may have to re-add a wait in the future, but I'm not sure yet how to use two notifiers at a time.
Arthur Huillet [Thu, 26 Jul 2007 13:21:08 +0000 (15:21 +0200)]
Preliminary implementation of "host-side double buffering" to improve performance of Xv
Arthur Huillet [Wed, 25 Jul 2007 20:23:37 +0000 (22:23 +0200)]
removed pointless sleep in notifier wait
Arthur Huillet [Fri, 20 Jul 2007 15:46:18 +0000 (17:46 +0200)]
cleaner Xv code - fallback on CPU copy yet to be implemented
Arthur Huillet [Thu, 19 Jul 2007 23:33:49 +0000 (01:33 +0200)]
Now using GART as the source for the blitter - preliminary implementation, gotta clean it up
Arthur Huillet [Thu, 19 Jul 2007 23:22:11 +0000 (01:22 +0200)]
now yielding in the wait for notifier for Xv only
Arthur Huillet [Sat, 14 Jul 2007 23:00:19 +0000 (01:00 +0200)]
VERY EXPERIMENTAL now EXA waits for sync before its operations - this removed the text corruption and didn't affect performance here, please report.
Arthur Huillet [Sat, 14 Jul 2007 22:35:46 +0000 (00:35 +0200)]
VERY EXPERIMENTAL moved the notifier wait at the beginning of NvPutImage
Arthur Huillet [Thu, 12 Jul 2007 01:19:21 +0000 (03:19 +0200)]
new structure for PutImage, and DMA transfers
Ben Skeggs [Tue, 17 Jul 2007 04:00:25 +0000 (14:00 +1000)]
NV50: Get NV_MEMORY_TO_MEMORY_FORMAT working.
Ben Skeggs [Tue, 17 Jul 2007 03:32:06 +0000 (13:32 +1000)]
Merge branch 'nv50-branch' into randr-1.2
Ben Skeggs [Tue, 17 Jul 2007 03:32:03 +0000 (13:32 +1000)]
Merge branch 'master' into randr-1.2
Ben Skeggs [Tue, 17 Jul 2007 03:09:34 +0000 (13:09 +1000)]
Emit NOTIFY+NOP sequence after M2MF.
Ben Skeggs [Fri, 13 Jul 2007 05:28:56 +0000 (15:28 +1000)]
Play "nuke the typedef"
Ben Skeggs [Thu, 12 Jul 2007 01:28:58 +0000 (11:28 +1000)]
Merge branch 'randr-1.2' into nv50-branch
Conflicts:
src/nv_driver.c
Ben Skeggs [Thu, 12 Jul 2007 01:22:54 +0000 (11:22 +1000)]
Merge branch 'master' into randr-1.2
Conflicts:
src/nv_type.h
Ben Skeggs [Thu, 12 Jul 2007 00:47:53 +0000 (10:47 +1000)]
Match drm 0.0.9 interface changes.
Arthur Huillet [Wed, 11 Jul 2007 00:42:24 +0000 (02:42 +0200)]
added support for PCI GART when no AGP is available - requires DRM interface version 8
Ben Skeggs [Mon, 9 Jul 2007 06:20:31 +0000 (16:20 +1000)]
Merge branch 'nv50-branch' into upstream-nv50-branch
Conflicts:
src/Makefile.am
src/nv_hw.c
src/nv_proto.h
Ben Skeggs [Mon, 9 Jul 2007 06:18:32 +0000 (16:18 +1000)]
Merge branch 'randr-1.2' into upstream-randr-1.2
Conflicts:
src/nv_hw.c
Ben Skeggs [Fri, 6 Jul 2007 15:20:18 +0000 (01:20 +1000)]
NV50: Basic EXA support.
Ben Skeggs [Thu, 5 Jul 2007 00:34:04 +0000 (10:34 +1000)]
Merge branch 'randr-1.2' into nv50-branch
Ben Skeggs [Thu, 5 Jul 2007 00:33:50 +0000 (10:33 +1000)]
Merge branch 'master' into randr-1.2
Ben Skeggs [Sun, 1 Jul 2007 08:22:37 +0000 (18:22 +1000)]
Always provide UTS, fallback to memcpy if no GART.
Ben Skeggs [Sun, 1 Jul 2007 08:19:44 +0000 (18:19 +1000)]
Always provide DFS, use memcpy fallback if no GART.
Ben Skeggs [Sat, 30 Jun 2007 05:27:07 +0000 (15:27 +1000)]
Remove some unused cruft
Ben Skeggs [Fri, 29 Jun 2007 18:26:48 +0000 (04:26 +1000)]
No need to call exaMarkSync() in UTS/DFS.
Ben Skeggs [Thu, 28 Jun 2007 06:16:38 +0000 (16:16 +1000)]
nv50: Fix FB offsets
Ben Skeggs [Thu, 28 Jun 2007 06:15:46 +0000 (16:15 +1000)]
Merge branch 'upstream-randr-1.2' into upstream-nv50-branch
Conflicts:
src/Makefile.am
src/nv_dma.c
src/nv_driver.c
Ben Skeggs [Thu, 28 Jun 2007 06:13:11 +0000 (16:13 +1000)]
Fix FB offsets.
Ben Skeggs [Thu, 28 Jun 2007 06:12:28 +0000 (16:12 +1000)]
Merge branch 'upstream-master' into upstream-randr-1.2
Conflicts:
src/Makefile.am
src/nv_driver.c
src/nv_hw.c
src/nv_proto.h
Ben Skeggs [Thu, 28 Jun 2007 05:16:35 +0000 (15:16 +1000)]
Bail if GlxSetVisualConfigs isn't found.
Ben Skeggs [Mon, 25 Jun 2007 03:05:00 +0000 (13:05 +1000)]
Merge branch 'upstream-randr-1.2' into upstream-nv50-branch
Conflicts:
src/Makefile.am
src/nv_dma.c
src/nv_driver.c
Ben Skeggs [Mon, 25 Jun 2007 02:59:56 +0000 (12:59 +1000)]
Merge branch 'upstream-master' into upstream-randr-1.2
Conflicts:
src/Makefile.am
src/nv_driver.c
src/nv_hw.c
src/nv_proto.h
Ben Skeggs [Mon, 25 Jun 2007 02:45:31 +0000 (12:45 +1000)]
Bump required xorg-server version to 1.3
Ben Skeggs [Mon, 25 Jun 2007 02:44:12 +0000 (12:44 +1000)]
Check PRAMIN for BIOS image if not found in PROM.
Ben Skeggs [Sun, 24 Jun 2007 07:48:33 +0000 (17:48 +1000)]
Implement NV40 EXA composite hooks with 3D engine.
Named NV30EXA, but won't work on NV30 just yet. This should change at some
point in the future.
Will likely break non-voodoo'd NV4X cards (if the latest drm changes didn't
already break them). Use EXANoComposite xorg.conf option to disable the hook
if that's the case.
Ben Skeggs [Sun, 24 Jun 2007 07:34:10 +0000 (17:34 +1000)]
Slightly saner UploadToScreen implementation
Ben Skeggs [Sun, 24 Jun 2007 07:27:42 +0000 (17:27 +1000)]
Wait on notifier instead of PGRAPH_STATUS
When multiple channels are in use, PGRAPH_STATUS may report busy even if the
ddx's channel is idle.
Ben Skeggs [Sun, 24 Jun 2007 07:21:27 +0000 (17:21 +1000)]
Match drm 0.0.7 interface changes
Ben Skeggs [Sun, 24 Jun 2007 06:47:36 +0000 (16:47 +1000)]
Hide the allocator's use of physical addresses
Ben Skeggs [Sun, 24 Jun 2007 06:46:40 +0000 (16:46 +1000)]
Pass pScrn instead of pNv in a few places
Ben Skeggs [Mon, 11 Jun 2007 10:36:28 +0000 (20:36 +1000)]
don't nuke user-specified CFLAGS
Ben Skeggs [Fri, 25 May 2007 02:15:36 +0000 (12:15 +1000)]
NV50: exit without SEGV
Ben Skeggs [Fri, 25 May 2007 02:08:41 +0000 (12:08 +1000)]
NV50: Make sure CLUT gets initialised during ScreenInit
Ben Skeggs [Mon, 21 May 2007 11:13:34 +0000 (21:13 +1000)]
consistent PreInit fail path
Ben Skeggs [Mon, 21 May 2007 10:29:37 +0000 (20:29 +1000)]
reindent nv_driver.c
Ben Skeggs [Mon, 21 May 2007 04:01:07 +0000 (14:01 +1000)]
NV50: Hook up CLUT, broken - LoadPalette never gets called...
Ben Skeggs [Sun, 20 May 2007 02:35:38 +0000 (12:35 +1000)]
NV50: cursor not in a static location like nv
Ben Skeggs [Fri, 18 May 2007 03:26:51 +0000 (13:26 +1000)]
NV50: hook up hwcursor init
Ben Skeggs [Fri, 18 May 2007 03:19:56 +0000 (13:19 +1000)]
NV50: hook up nv50 code for Enter/LeaveVT
Ben Skeggs [Wed, 16 May 2007 04:52:34 +0000 (14:52 +1000)]
Don't go pounding PMC_ENABLE..
Disabling things we don't know how to reinit is bad.
Ben Skeggs [Wed, 16 May 2007 04:51:45 +0000 (14:51 +1000)]
oops, pNv->PRAMIN points at 0x710000 *not* 0x700000
Ben Skeggs [Wed, 16 May 2007 04:39:21 +0000 (14:39 +1000)]
add chipsets to Probe routine too
Ben Skeggs [Wed, 16 May 2007 04:29:46 +0000 (14:29 +1000)]
Hack in NV50 display setup calls
Ben Skeggs [Wed, 16 May 2007 04:18:22 +0000 (14:18 +1000)]
NV50: Don't even bother attempting to create a FIFO yet
Ben Skeggs [Wed, 16 May 2007 03:51:32 +0000 (13:51 +1000)]
NV50: Add NV_ARCH/CHIPSET defines for G80/G84
Ben Skeggs [Wed, 16 May 2007 03:47:02 +0000 (13:47 +1000)]
NV50: rename G80* to NV50*
Ben Skeggs [Wed, 16 May 2007 03:43:16 +0000 (13:43 +1000)]
NV50: Steal modesetting code from xf86-video-nv, not hooked up yet
Dave Airlie [Sun, 6 May 2007 07:30:30 +0000 (17:30 +1000)]
remove more unused code
Dave Airlie [Sun, 6 May 2007 07:26:51 +0000 (17:26 +1000)]
use newer randr setup code
Dave Airlie [Sun, 6 May 2007 07:09:34 +0000 (17:09 +1000)]
remove unsued function
Dave Airlie [Sat, 31 Mar 2007 08:08:20 +0000 (18:08 +1000)]
add enable bit
Henry Zhao [Sun, 22 Apr 2007 23:38:09 +0000 (01:38 +0200)]
Import from nv : Need to inject a mode corresponding panel width/height for validation
Dave Airlie [Sun, 22 Apr 2007 08:16:00 +0000 (18:16 +1000)]
fix flicker on nv_output detection
Dave Airlie [Sun, 22 Apr 2007 08:01:05 +0000 (18:01 +1000)]
set crtc base correctly
Dave Airlie [Sun, 22 Apr 2007 07:47:35 +0000 (17:47 +1000)]
attempt to figure out nv28 DCB table
Dave Airlie [Sun, 22 Apr 2007 05:18:14 +0000 (15:18 +1000)]
nv28: VGA reg 0x59 appears to enable/disable the DVI output somehow
Dave Airlie [Sun, 22 Apr 2007 04:54:18 +0000 (14:54 +1000)]
Merge branch 'origin' into randr-1.2
Conflicts:
src/nv_hw.c
Richard Hughes [Sun, 15 Apr 2007 21:01:52 +0000 (23:01 +0200)]
Fix make dist.
Ben Skeggs [Sun, 25 Mar 2007 15:04:15 +0000 (01:04 +1000)]
nouveau: rip out card init, everything except modesetting.
Dave Airlie [Sun, 25 Mar 2007 07:57:38 +0000 (17:57 +1000)]
initialise the is_g5 variable.. doh..
Dave Airlie [Sun, 25 Mar 2007 02:30:01 +0000 (12:30 +1000)]
the g5 dcb table is whack..
This hardcodes the start of it, which is more whack but seems to start working
Dave Airlie [Sun, 25 Mar 2007 02:12:55 +0000 (12:12 +1000)]
randr12: attempt to parse DCB table from nv40 bios
Dave Airlie [Sun, 25 Mar 2007 01:41:24 +0000 (11:41 +1000)]
randr12: restructure nouveau code
This is the initial restructuring where we make analog/digital outputs
move some things from crtc->output and vice versa where it makes more sense
Dave Airlie [Wed, 21 Mar 2007 07:27:21 +0000 (18:27 +1100)]
Merge branch 'origin' into randr-1.2-origin
Ben Skeggs [Wed, 21 Mar 2007 06:55:38 +0000 (17:55 +1100)]
nouveau: bump for drm interface changes (v0.0.5)
Dave Airlie [Wed, 21 Mar 2007 05:10:50 +0000 (16:10 +1100)]
remove old cursor in range
Matthieu Castet [Sun, 18 Mar 2007 10:30:54 +0000 (11:30 +0100)]
Fix "Fix NoAccel mode" commit : NVAccelCommonInit return a bool
Matthieu Castet [Sun, 18 Mar 2007 10:28:04 +0000 (11:28 +0100)]
Fix NoAccel mode