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
Dave Airlie [Sun, 11 Mar 2007 07:09:00 +0000 (18:09 +1100)]
do stupid table to map outputs.. this is a hack until we can parse the BIOS
Dave Airlie [Sun, 11 Mar 2007 04:55:43 +0000 (15:55 +1100)]
cleanup pll setting for TMDS monitor
Dave Airlie [Sun, 11 Mar 2007 04:19:15 +0000 (15:19 +1100)]
debug output the mode on each crtc
Dave Airlie [Sun, 11 Mar 2007 04:18:55 +0000 (15:18 +1100)]
fixup DAC mapping
Dave Airlie [Sun, 11 Mar 2007 02:03:49 +0000 (13:03 +1100)]
Merge branch 'origin' into randr-1.2-newcode
Conflicts:
src/Makefile.am
Dave Airlie [Fri, 9 Mar 2007 05:55:38 +0000 (16:55 +1100)]
fix dodgy semicolon
Dave Airlie [Thu, 8 Mar 2007 10:46:18 +0000 (21:46 +1100)]
remove more code ported to server
Dave Airlie [Thu, 8 Mar 2007 08:47:26 +0000 (19:47 +1100)]
drop all the old code
Ben Skeggs [Wed, 7 Mar 2007 10:41:22 +0000 (21:41 +1100)]
Rip out nv30_exa.c, we have other means to play with the 3D engine now.
Ben Skeggs [Wed, 7 Mar 2007 05:46:27 +0000 (16:46 +1100)]
Xv: Make the blit adaptor play nice with EXA
Previously the blit adaptor assumed that all drawing (ie. XAA) would occur to
the screen pixmap, so it didn't bother touching surface offsets. Now, with
EXA this isn't true and the card complained about exceeding the colour buffer
limits when attempting to play video.
This patch kills 2 birds with one stone; instead of pointing the GPU back at
the screen pixmap when playing video, we point it at the destination drawable.
So, Xv will also hopefully play nicely with redirected windows now.
Ben Skeggs [Wed, 7 Mar 2007 02:58:48 +0000 (13:58 +1100)]
Only use Y32 for Solid().
It's the only place the workaround is needed at this point, and in some places
we need to use the "proper" ARGB format (Xv for instance).
Ben Skeggs [Tue, 6 Mar 2007 17:33:44 +0000 (04:33 +1100)]
Fail configure if xorg-server isn't at least version 1.1
The minimum requirement has been 1.1 for a while now, but would only fail
at compile time when compiling nv_exa.c. This patch makes configure fail,
and removes the remaining conditional support for older servers.
Hopefully the configure.ac is ok, I suck at autofoo.
Ben Skeggs [Tue, 6 Mar 2007 17:22:24 +0000 (04:22 +1100)]
reindent and move nv_video.c around a bit
Dave Airlie [Tue, 6 Mar 2007 11:06:31 +0000 (22:06 +1100)]
update randr code to latest from intel - probably won't work yet
Dave Airlie [Tue, 6 Mar 2007 10:45:26 +0000 (21:45 +1100)]
Merge branch 'master' into randr-1.2
Conflicts:
src/nv_driver.c
src/nv_type.h
Ben Skeggs [Mon, 5 Mar 2007 18:42:29 +0000 (05:42 +1100)]
Use Y32 format instead of A8R8G8B8 for 32-bpp pixmaps
fixes 32-bpp EXA solid-fills, previously alpha was forced to 0xff.
Ben Skeggs [Mon, 5 Mar 2007 03:45:04 +0000 (14:45 +1100)]
move NVAccel* funcs into nv_accel_common.c
Stephane Marchesin [Sun, 4 Mar 2007 21:40:48 +0000 (22:40 +0100)]
Joint patch from Ben Skeggs and me that fixes some (all ?) composite issues.
Ben Skeggs [Wed, 28 Feb 2007 21:39:23 +0000 (08:39 +1100)]
nouveau: avoid attempting an AGP-only alloc
will fail on non-AGP cards, and leave nasty messages in Xorg.log...
Ben Skeggs [Wed, 28 Feb 2007 04:30:52 +0000 (15:30 +1100)]
match drm v4 interface changes
context (gr/dma) object handling:
- remove use of flags/dmaobj when creating objects
- move object creation/setup into nv_accel_common.c
- NV04: make PGRAPH complain a bit more if we program the hardware
incorrectly.
- NV04/NV10: enable PGRAPH_DEBUG_3_CTX_METHODS
This bit seems to enable the use of SET_* methods.
- NV04/NV10/NV40: enable PGRAPH_DEBUG_3_IGNORE_PATCHVALID
Objects no longer get PATCH_CONFIG_VALID set in their context.
Not sure how to get this set other than to intercept the
PATCH_EXCEPTION error and enable the flag. I opted for the
same method NVIDIA use, which makes PGRAPH ignore it.
misc:
- use NV04_SCALED_IMAGE_FROM_MEMORY on all NV_ARCH_04 cards
- fix offScreenBase calculation (EXA)
- move mem alloc/free helpers into nv_mem.c
Adam Jackson [Tue, 27 Feb 2007 19:46:20 +0000 (14:46 -0500)]
Typo fix.
Damien Thebault [Tue, 13 Feb 2007 23:35:50 +0000 (00:35 +0100)]
Don't output the chipset list to the log file, silence some warnings.
Stephane Marchesin [Tue, 13 Feb 2007 23:29:52 +0000 (00:29 +0100)]
Fix the workaround (or workaround the fix).
Dave Airlie [Fri, 2 Feb 2007 08:57:30 +0000 (19:57 +1100)]
update nv_crtc to latest code base
Dave Airlie [Fri, 2 Feb 2007 08:53:24 +0000 (19:53 +1100)]
fixup rotate import
Dave Airlie [Fri, 2 Feb 2007 08:51:23 +0000 (19:51 +1100)]
update to latest intel code
Dave Airlie [Tue, 30 Jan 2007 22:21:09 +0000 (09:21 +1100)]
Merge branch 'origin' into randr-1.2
Dave Airlie [Tue, 30 Jan 2007 22:01:25 +0000 (09:01 +1100)]
add some proper tmds register names
Dave Airlie [Tue, 30 Jan 2007 07:57:27 +0000 (18:57 +1100)]
copy over regs from save rec
Dave Airlie [Tue, 30 Jan 2007 06:13:48 +0000 (17:13 +1100)]
remove unsued variables, this commit gets me two heads DFP/CRT stylie..
Dave Airlie [Tue, 30 Jan 2007 05:01:54 +0000 (16:01 +1100)]
add fp registers + save/restore for them
Dave Airlie [Tue, 30 Jan 2007 04:35:09 +0000 (15:35 +1100)]
more ramdac register accessor renaming
Dave Airlie [Tue, 30 Jan 2007 02:09:15 +0000 (13:09 +1100)]
cleanup when to turn on PLLs vs output
Dave Airlie [Tue, 30 Jan 2007 01:21:00 +0000 (12:21 +1100)]
program the plls for FPs as well (doh..)