Arthur Huillet [Fri, 14 Sep 2007 19:13:26 +0000 (21:13 +0200)]
Xv: NV04 overlay now has one "colorkey" attribute
It is technically possible to add other attributes, by copypasting vidix code from mplayer, but it requires a bit of work especially on testing, so I am going
to do it only if someone actually needs it.
Arthur Huillet [Fri, 14 Sep 2007 12:17:32 +0000 (14:17 +0200)]
Xv: NV04 overlay now almost functionnal
Arthur Huillet [Fri, 14 Sep 2007 10:27:45 +0000 (12:27 +0200)]
Xv: quick imple of NV04 overlay
Stephane Marchesin [Wed, 12 Sep 2007 11:10:37 +0000 (13:10 +0200)]
Try to fix nv4/tnt1
Maarten Maathuis [Tue, 11 Sep 2007 18:15:11 +0000 (20:15 +0200)]
Restore PRAMDAC1 and PCRTC1 offsets, in proper format (0x2000/4) and move them to their proper place.
Maarten Maathuis [Mon, 10 Sep 2007 19:14:24 +0000 (21:14 +0200)]
Fix the memory adresses of the secondary crtc and ramdac + minor change.
Patrice Mandin [Mon, 10 Sep 2007 16:29:10 +0000 (18:29 +0200)]
make randr 1.2 disableable for xorg server < 1.3
Patrice Mandin [Mon, 10 Sep 2007 16:28:03 +0000 (18:28 +0200)]
make randr 1.2 disableable for xorg server < 1.3
Maarten Maathuis [Mon, 10 Sep 2007 05:57:01 +0000 (07:57 +0200)]
randr12: Apply the same pll restrictions to a two stage design.
Maarten Maathuis [Mon, 10 Sep 2007 05:25:25 +0000 (07:25 +0200)]
randr12: Some more pll timer restrictions from Haiku.
Maarten Maathuis [Sun, 9 Sep 2007 21:11:18 +0000 (23:11 +0200)]
randr12: Some new pll clock restrictions.
Maarten Maathuis [Sun, 9 Sep 2007 20:50:19 +0000 (22:50 +0200)]
Some reindenting.
Maarten Maathuis [Sun, 9 Sep 2007 20:12:38 +0000 (22:12 +0200)]
randr12: Modify dcb table for nv40 to make it look more like older hardware. Remove i2c bus reverse.
Maarten Maathuis [Sun, 9 Sep 2007 18:40:20 +0000 (20:40 +0200)]
Removed a check for > 1 active crtc's, which seems really odd, no regressions occured for me.
- I cannot plug in both the vga and dvi connector of my monitor, so i cannot verify that.
- The seperate monitor, on crtc0 and crtc1 work as they did (the afp being slightly shifted).
- Also did a little reindenting.
Maarten Maathuis [Sun, 9 Sep 2007 16:49:08 +0000 (18:49 +0200)]
randr12: Fix a nasty regression from
6ba7e83f8cf2da84dd796ee59cb24c15bc36b746.
- For non-flatpanels the dac was never initialized.
Maarten Maathuis [Sat, 8 Sep 2007 22:39:41 +0000 (00:39 +0200)]
randr12: Some missing init.
Maarten Maathuis [Sat, 8 Sep 2007 21:58:39 +0000 (23:58 +0200)]
Some much needed indenting and readability improvements.
Maarten Maathuis [Sat, 8 Sep 2007 19:00:45 +0000 (21:00 +0200)]
Hopefully fix bridged chip detection, such as the 7800GS AGP.
Maarten Maathuis [Sat, 8 Sep 2007 12:25:39 +0000 (14:25 +0200)]
Remove list that is incorrect and no longer needed.
Maarten Maathuis [Sat, 8 Sep 2007 12:24:54 +0000 (14:24 +0200)]
Fix previous commit, change the way Digital Flat Panels are programmed.
- This is mostly taken from the Haiku driver.
- It works for me, please report any issues you have.
- Added scaling, for running 4:3 resolutions on widescreen for example (untested).
Maarten Maathuis [Fri, 7 Sep 2007 22:46:20 +0000 (00:46 +0200)]
Hopefully this will improve flatpanel beheaviour.
- I looked at Haiku and copied as much as i could.
- I removed the htiming and vtiming hack.
- Let's hope this works.
Maarten Maathuis [Fri, 7 Sep 2007 21:11:51 +0000 (23:11 +0200)]
Some more indenting and such.
Maarten Maathuis [Fri, 7 Sep 2007 20:58:56 +0000 (22:58 +0200)]
Removing a hack in the hopes of finding a better way and some minor changes.
Maarten Maathuis [Fri, 7 Sep 2007 20:27:18 +0000 (22:27 +0200)]
Indenting and minor code style changes.
Maarten Maathuis [Fri, 7 Sep 2007 12:37:40 +0000 (14:37 +0200)]
randr12: Fix Xv blitter, please see full changelog for other implications.
- Removed the CRTCNumber variable, instead just store if crtc0 and crtc1 are active.
- This coule break old style setups (picking the wrong monitor for example).
- CRTCNumber option temporarily removed, because the piece of code surrounding it is ugly and needs a rework.
Maarten Maathuis [Thu, 6 Sep 2007 21:26:04 +0000 (23:26 +0200)]
randr-1.2: Only the NV4x have these busses swapped, revert for other architectures.
- If this is also true for NV3x, then please contact me.
Maarten Maathuis [Thu, 6 Sep 2007 20:55:16 +0000 (22:55 +0200)]
Update to latest pciaccess api, this now requires libpciaccess 0.10.0.
Maarten Maathuis [Thu, 6 Sep 2007 20:00:30 +0000 (22:00 +0200)]
NV03 is dead.
Maarten Maathuis [Thu, 6 Sep 2007 19:43:55 +0000 (21:43 +0200)]
randr12: A prettier hack for DFP, that uses several known htiming and vtiming modes.
- I'm fairly sure these modes are tied to resolution.
- You are welcome to supply additional modes.
- A final solution would be even better ;-)
Arthur Huillet [Thu, 6 Sep 2007 13:09:59 +0000 (15:09 +0200)]
Xv: work around some overlay bandwidth problems - may break things though
extended nv workaround from bug 4686 in nv_dac.c to NV1x and NV2x cards, as it fixed problems on someone's NV17.
Maarten Maathuis [Wed, 5 Sep 2007 21:15:57 +0000 (23:15 +0200)]
Workaround for flatpanels.
- Remove the hardcoded values.
- This should probably work for monitors whose mode is already set.
Maarten Maathuis [Wed, 5 Sep 2007 19:23:25 +0000 (21:23 +0200)]
Fix minor issue.
Maarten Maathuis [Wed, 5 Sep 2007 19:22:05 +0000 (21:22 +0200)]
Fix DPMS, patch by Bernhard Kaindl <bk@suse.de>.
Maarten Maathuis [Wed, 5 Sep 2007 19:18:51 +0000 (21:18 +0200)]
Reverse DDC1 and DDC2.
- I need them reversed.
- I also found this: http://www.mail-archive.com/git-commits-head@vger.kernel.org/msg12009.html
- If you need them otherwise, then please consult and hopefully we can solve it.
Maarten Maathuis [Wed, 5 Sep 2007 19:16:11 +0000 (21:16 +0200)]
randr-1.2 clients have their DDC's initialized elsewhere.
Maarten Maathuis [Wed, 5 Sep 2007 19:12:18 +0000 (21:12 +0200)]
LockUnlock CRTC's when going back to X (EnterVT), patch by Bernhard Kaindl <bk@suse.de>.
Maarten Maathuis [Wed, 5 Sep 2007 16:34:27 +0000 (18:34 +0200)]
Xv: improved behavior with NoAccel by disabling blitter and overlay
Ben Skeggs [Wed, 5 Sep 2007 01:58:19 +0000 (11:58 +1000)]
Avoid segv.
Ben Skeggs [Wed, 5 Sep 2007 01:53:48 +0000 (11:53 +1000)]
Add back DCB table parsing from randr-1.2 branch.
Ben Skeggs [Wed, 5 Sep 2007 01:51:35 +0000 (11:51 +1000)]
Add LVDS panels when found in DCB.
Ben Skeggs [Wed, 5 Sep 2007 01:34:14 +0000 (11:34 +1000)]
Nuke "comparison is always false..." warning.
Ben Skeggs [Wed, 5 Sep 2007 00:59:33 +0000 (10:59 +1000)]
Fix pciid detect on non-8800 cards (they identify as NV8x, not NV5x)
Actually, use 0x88000 to get pciid on all chipsets since NV40. Evidence
suggests that NV4x has both the 0x88xxx regs and 0x18xx regs.
Ben Skeggs [Wed, 5 Sep 2007 00:53:32 +0000 (10:53 +1000)]
Neither overlay or blit adaptor work on G8x.
Ben Skeggs [Wed, 5 Sep 2007 00:51:02 +0000 (10:51 +1000)]
Nuke riva_* files + bits of NV03 that got reincarnated.
Ben Skeggs [Wed, 5 Sep 2007 00:46:54 +0000 (10:46 +1000)]
Nuke XAA.
Maarten Maathuis [Tue, 4 Sep 2007 21:04:59 +0000 (23:04 +0200)]
There was some redundant arch checking code left, must have been missed after the randr merge.
Maarten Maathuis [Tue, 4 Sep 2007 20:54:28 +0000 (22:54 +0200)]
I unknowingly broke CRT's i think.
Maarten Maathuis [Tue, 4 Sep 2007 20:17:52 +0000 (22:17 +0200)]
Fix several problems.
- Implement a temporary NVSetMode(), suggestion and code by: Bernhard Kaindl <bk@suse.de>.
Note: I've left his comment intact, just a minor change.
- Fix last commit, i forgot to store the last mode.
- Move some header stuff around, which i created without knowing the true purpose of nv_proto.h ;-)
Maarten Maathuis [Tue, 4 Sep 2007 18:45:25 +0000 (20:45 +0200)]
Fix DVI/Digital alligment with some (magic?) values discovered by Matthew Garrett <mjg59@srcf.ucam.org>.
Maarten Maathuis [Tue, 4 Sep 2007 18:20:02 +0000 (20:20 +0200)]
Add suggestion/patch by Bernhard Kaindl <bk@suse.de> and fix NVRestore().
- When a monitor comes out of DPMS sleep the old state is restored.
- NVRestore() was not ported from randr-1.2 branch, meaning that going from X to console resulted in a unacceptable mode.
Maarten Maathuis [Tue, 4 Sep 2007 16:39:44 +0000 (18:39 +0200)]
Add pci-rework compatibility and remove the pci-id list.
- Detection is now done by probing registers.
- Nforce/Nforce2 have special "hacks", they have been converted, but are untested.
- NV5x detection should work, but has seen no testing.
Ben Skeggs [Tue, 4 Sep 2007 01:38:39 +0000 (11:38 +1000)]
Badness.
Ben Skeggs [Mon, 3 Sep 2007 12:06:27 +0000 (22:06 +1000)]
Hook up G8x accel code.
Ben Skeggs [Mon, 3 Sep 2007 12:06:09 +0000 (22:06 +1000)]
Fix G8x hwcursor
Ben Skeggs [Mon, 3 Sep 2007 11:35:06 +0000 (21:35 +1000)]
Fix up M2MF code for G8x.
Ben Skeggs [Mon, 3 Sep 2007 11:30:16 +0000 (21:30 +1000)]
Init grobjs we need on G8x.
Ben Skeggs [Mon, 3 Sep 2007 11:14:59 +0000 (21:14 +1000)]
Allocate some VRAM for G8x palette.
Ben Skeggs [Mon, 3 Sep 2007 11:06:15 +0000 (21:06 +1000)]
Don't pound PMC_ENABLE on startup, this is DRM's job.
Fixes resetting parts of G8x that shouldn't be.
Ben Skeggs [Mon, 3 Sep 2007 11:05:08 +0000 (21:05 +1000)]
Detect unknown G8x chips in NVProbe() + Force randr12 on G8x
Dave Airlie [Mon, 3 Sep 2007 06:46:34 +0000 (16:46 +1000)]
fix distcheck after randr-1.2 brought in
Dave Airlie [Mon, 3 Sep 2007 06:42:32 +0000 (16:42 +1000)]
merge in the nv50 code from the randr 1.2 branch
Dave Airlie [Mon, 3 Sep 2007 06:22:47 +0000 (16:22 +1000)]
randr12: bring over cursor code
Dave Airlie [Mon, 3 Sep 2007 06:16:43 +0000 (16:16 +1000)]
randr12: try and bring over most of the randr12 code into master
This currently shouldn't break master, and randr-1.2 more than likely doesn't actually work
Arthur Huillet [Fri, 31 Aug 2007 19:42:51 +0000 (21:42 +0200)]
Xv: now "powercycling" the overlay using PMC_ENABLE in order to workaround some lock up problems
Stephane Marchesin [Thu, 30 Aug 2007 23:36:11 +0000 (01:36 +0200)]
Cut remains of NV03 support.
Stephane Marchesin [Thu, 30 Aug 2007 23:35:52 +0000 (01:35 +0200)]
Good ol' nv04 doesn't seem to support dithering type for SIFM.
Arthur Huillet [Thu, 30 Aug 2007 21:19:13 +0000 (23:19 +0200)]
Xv: nv NV30 arbitration patch for DFPs - fixes (some?) bw problems
Stephane Marchesin [Tue, 28 Aug 2007 22:56:05 +0000 (00:56 +0200)]
Silence more warnings.
Stephane Marchesin [Tue, 28 Aug 2007 22:20:19 +0000 (00:20 +0200)]
Silence a warning.
Stephane Marchesin [Tue, 28 Aug 2007 09:18:54 +0000 (11:18 +0200)]
Some small fixes.
Stephane Marchesin [Thu, 23 Aug 2007 20:54:53 +0000 (22:54 +0200)]
Oops I forgot to enable the nv35 object on nv35...
Stephane Marchesin [Thu, 23 Aug 2007 20:39:34 +0000 (22:39 +0200)]
Don't enable that non-working nv30 EXA just yet.
Stephane Marchesin [Thu, 23 Aug 2007 20:33:58 +0000 (22:33 +0200)]
Add nv30 exa code, doesn't work yet.
Stephane Marchesin [Wed, 22 Aug 2007 20:38:08 +0000 (22:38 +0200)]
Update to the latest nouveau_reg.h file.
Matthieu Castet [Tue, 21 Aug 2007 18:03:15 +0000 (20:03 +0200)]
init SCALED_IMAGE_FROM_MEMORY_COLOR_CONVERSION to COLOR_CONVERSION_TYPE_DITHER.
riva and blob init it.
Arthur Huillet [Tue, 21 Aug 2007 12:55:07 +0000 (14:55 +0200)]
Fixed blending in NVComposite by actually creating ContextBeta1 and 4 objects
Arthur Huillet [Mon, 20 Aug 2007 21:50:43 +0000 (23:50 +0200)]
Workaround for NVComposite bug #11949
Accepting only PictOpSrc now, PictOpOver causing crashes.
Arthur Huillet [Mon, 20 Aug 2007 11:18:15 +0000 (13:18 +0200)]
Xv: fixed wrong fix of big endian NV12 copy, as explained by Daniel Chassot
No sleepless coding ever again. <- big lie
Arthur Huillet [Sun, 19 Aug 2007 22:46:00 +0000 (00:46 +0200)]
Xv: patch from Daniel Chassot to do 32bit memory writes in NVCopyNV12ColorPlanes, with minor reworking of mine
Arthur Huillet [Sun, 19 Aug 2007 19:04:00 +0000 (21:04 +0200)]
Xv: this time a correct matching ? :)
Arthur Huillet [Sun, 19 Aug 2007 18:18:49 +0000 (20:18 +0200)]
Xv: stupid build error. blah.
Arthur Huillet [Sun, 19 Aug 2007 18:14:38 +0000 (20:14 +0200)]
Xv: now catching all chips < NV17
Arthur Huillet [Sun, 19 Aug 2007 17:50:57 +0000 (19:50 +0200)]
Xv: disabled YV12 overlay on < NV17
Arthur Huillet [Thu, 16 Aug 2007 22:45:47 +0000 (00:45 +0200)]
Xv: now only uploading the part of source image that is used to workaround bandwidth problems
Arthur Huillet [Wed, 15 Aug 2007 00:27:15 +0000 (02:27 +0200)]
Cleaner DMA and CPU copy upload of color plane for overlay. Fixes a few bugs and is necessary for the bandwidth problem workaround.
Patrice Mandin [Tue, 14 Aug 2007 20:26:02 +0000 (22:26 +0200)]
Can not setup dfp modes with xorg-server-1.1 also
Patrice Mandin [Tue, 14 Aug 2007 20:12:37 +0000 (22:12 +0200)]
Make NV30 EXA disablable
Arthur Huillet [Tue, 14 Aug 2007 13:01:58 +0000 (15:01 +0200)]
Implemented CPU copy fallback for native YV12 overlay as well.
Arthur Huillet [Tue, 14 Aug 2007 12:47:44 +0000 (14:47 +0200)]
Native YV12 overlay support, cleaner Xv code
Added support for a native YV12 overlay for NV10+ cards.
Cleaned up Xv code.
CPU copy fallback does not do native YV12 yet.
Bandwidth problem with YV12.
Carlos Martín Nieto [Sat, 11 Aug 2007 10:27:56 +0000 (12:27 +0200)]
Don't dereference the uninitialised pNv->FB pointer.
Opps, mea culpa. I accidentally commited a debug statement that
dereferences an uninitialised pointer.
Carlos Martín Nieto [Fri, 10 Aug 2007 18:01:27 +0000 (20:01 +0200)]
Move DRI's FB to the higher half of VRAM
If we don't, DRM's push buffer takes the map away from us.
This is just a workaround until that useless DRI mapping goes away.
Arthur Huillet [Fri, 10 Aug 2007 18:59:12 +0000 (20:59 +0200)]
of course, we don't need Xv debug messages upstream
Arthur Huillet [Fri, 10 Aug 2007 17:28:22 +0000 (19:28 +0200)]
"smart" overlay with composite, and a tentative fix of flickering when dropping frames
added "smart overlay" when composite is enabled. not extensively tested
now not changing the buffer when skipping frames - not sure it even has an impact.
Ben Skeggs [Wed, 8 Aug 2007 15:46:46 +0000 (01:46 +1000)]
Fix blit adaptor + NVWaitVBlank() (ie. replace old magic 0x400710 hack)
Stephane Marchesin [Wed, 8 Aug 2007 10:45:59 +0000 (12:45 +0200)]
And of course, we don't really need these ErrorFs. Not any more than last time.
Stephane Marchesin [Wed, 8 Aug 2007 10:38:14 +0000 (12:38 +0200)]
Oh, and of course we need a new object.
Stephane Marchesin [Wed, 8 Aug 2007 10:37:31 +0000 (12:37 +0200)]
Use IMAGE_FROM_CPU for smaller UTS. This is async and helps a lot with glyphs especially.
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...