Commit Graph

1801 Commits

Author SHA1 Message Date
Wang Zhenyu c3a49b5123 Add simplest wm kernel program for no mask picture composite
This is a try to use new gen4asm language, and will finish
composite program for mask picture with or without CA case later.
2006-09-28 10:36:00 +08:00
Eric Anholt 6ea16bf6b0 Merge branch 'master' into modesetting
This reverts most of the mergedfb code.  This will instead be done in device-
independent RandR code.

Conflicts:

	src/Makefile.am
	src/i810_driver.c
	src/i810_reg.h
	src/i830.h
	src/i830_cursor.c
	src/i830_driver.c
	src/i830_modes.c
	src/i830_video.c
2006-09-27 16:38:01 -07:00
Eric Anholt fdb6de6635 Re-disable broken load-based CRT detection. 2006-09-27 13:59:41 -07:00
Eric Anholt 1407a42c73 Merge branch 'randr-1.2' into modesetting 2006-09-27 13:33:23 -07:00
Eric Anholt 25890ecda9 Merge branch 'acpi-hotkey' into modesetting
Conflicts:

	src/i830.h
	src/i830_driver.c
2006-09-27 13:33:17 -07:00
Eric Anholt 117ff04b50 Attempt to make the ACPI hotkey support a little more modesetting-compatible.
Previously, we watched for the BIOS to have changed the layout, and repaired
the resulting configuration.  Now, we request that the BIOS make no changes,
but leave a note in a register for when the key has been pressed.  When we
notice this, we reprobe monitors and turn on/off the things we find.

This is a temporary solution until we can get the hotkey hooked up as an
input key to external applications to control the change using RandR 1.2.  It
is also untested as neither of my laptops do anything with the hotkey.
However, this code does result in many fewer BIOS calls.
2006-09-27 13:30:09 -07:00
Michel Dänzer fe691953f0 Store viewport limits of both pipes in SAREA.
This allows DRI clients to determine which pipe they should synchronize buffer
swaps of each window to.
2006-09-27 15:06:43 +02:00
Michel Dänzer 06c5f7bd07 If the DRM can handle it, enable vertical blank interrupts for both pipes. 2006-09-27 15:06:07 +02:00
Michel Dänzer 89cbc6e215 Only enable the IRQ after DRIFinishScreenInit.
This makes sure we've been assigned a context ID, so the interrupt context
won't mess things up if it grabs the HW lock.
2006-09-27 11:00:37 +02:00
Wang Zhenyu 185df8a181 Add mask sampler state 2006-09-27 16:48:43 +08:00
Wang Zhenyu 1422d4f04a change some src sampler states
sampler for mask should also be set up, and fix
default border texel.
2006-09-27 13:54:14 +08:00
Alan Hourihane 6614b4bda2 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-video-intel 2006-09-25 12:04:01 +01:00
Alan Hourihane d6ca9feb78 Fix bug #7943 where video flickers when changing
attributes. This code was a leftover from testing lockups
and shouldn't be needed anymore.
2006-09-25 12:03:27 +01:00
Wang Zhenyu 52a4f2a02b Add file for i965 exa composite
This does not include ps program, which will be added
in g4a form.
2006-09-25 14:35:51 +08:00
Wang Zhenyu f272f0d811 Merge branch 'master' into exa 2006-09-25 14:15:21 +08:00
Keith Packard 4bd3b89c73 Oops, duplicated CRT-redetect code. 2006-09-23 16:41:38 +01:00
Keith Packard c34490bbda Construct default monitor description for hotplug non-DDC monitor.
When detecting a monitor that doesn't support DDC, construct a default
monitor with "sensible" values instead of using whatever the builtin LCD
screen uses. Clearly we need a way to set the monitor parameters when we
cannot detect them.
2006-09-23 12:00:43 +01:00
Eric Anholt 965609f6fa Restructure i830_bios.c so we don't leak a copy of the BIOS per generation. 2006-09-22 10:52:04 -07:00
Eric Anholt c52242c227 Remove some dead code related to clock ranges. 2006-09-22 10:52:03 -07:00
Eric Anholt c2446be9b4 Remove the GetDevicePresence BIOS call which just printed BIOS information.
Because we aren't using the BIOS to set modes any more, what the BIOS thinks is
present is probably even less important than before.
2006-09-22 10:52:02 -07:00
Eric Anholt b6ba268d0d Remove the no-longer-connected VBERestore option. 2006-09-22 10:52:00 -07:00
Eric Anholt 20956a5d6f Remove unused display{Attached,Present} fields. 2006-09-22 10:52:00 -07:00
Eric Anholt 2cd28be714 Remove empty SAVERESTORE_HWSTATE code. 2006-09-22 10:52:00 -07:00
Wang Zhenyu ff202f8e2a Fix a typo to mark sync for XAA.
This should fix the scrolling screen corrupt in
XAA method.
2006-09-22 15:02:19 +08:00
Keith Packard d87d1f5bb0 Remove BIOS from non-BIOS related names.
Lots of names included BIOS for no apparent reason; as we try to eliminate
BIOS calls from the driver, these only serve to confuse us.
(cherry picked from 8e5d280d94ad3d3ba3c75871c17abec9da62ed34 commit)
2006-09-22 02:24:05 +01:00
A Costa b3ddcf3348 Typo fix in man page (Debian bug #364559). 2006-09-21 23:18:43 +10:00
Keith Packard 4820caf46e Make planeEnabled track pipes controlled by randr.
Also add code to deal with disabling pipes.
2006-09-21 01:47:27 -07:00
Keith Packard c11c445bde Consistently use Cursor A on Pipe 0 and Cursor B on Pipe 1.
Mixing random cursors and pipes didn't work very well. I'm left wondering
whether the palette stuff will work on pre-9xx series hardware though; it is
special cased everwhere else.
2006-09-21 01:23:10 -07:00
Keith Packard 4a8b9515e9 Merge branch 'modesetting' into randr-1.2 2006-09-20 22:46:55 -07:00
Keith Packard bdca8697cc Merge branch 'modesetting-origin' into modesetting 2006-09-20 22:46:42 -07:00
Keith Packard 18a510bf9a Merge branch 'modesetting' into randr-1.2 2006-09-20 22:45:48 -07:00
Keith Packard f6500e94fe Update driver for RandR 1.2 X server API.
This is not entirely what I'd like to see, but it's at least functional.

Limitations:
	Can't disable/enable crtcs
	Can't move outputs on/off crtcs

But, it does handle monitor hot-plug, detecting changes in VGA and SDVO
status on-the fly. Which makes for good demo material.
2006-09-20 22:38:55 -07:00
Linus Torvals daade50ca2 Add standard C headers to fix build on some systems after xf86_ansic.h removal.
This appears to have been hidden for others by header pollution in X Server
headers.
2006-09-20 12:07:09 -07:00
Wang Zhenyu 1681fe6bb0 Revert "fix default tex wrap mode with clamp"
oops, we've set border color to all zero, which should
give us transparent in RepeatNone case.
2006-09-20 09:36:02 +08:00
Keith Packard d9db5ec686 Merge branch 'modesetting-origin' into modesetting 2006-09-19 16:03:04 -07:00
Wang Zhenyu 5adb05f0b8 fix default tex wrap mode with clamp
we don't set any 'default' border color,
default tex wrap mode should be clamp to edge.
2006-09-19 17:14:05 +08:00
Eric Anholt e3ab89b032 shader program fix for component alpha set
If CA is set and blend op needs src alpha, the src
value is not needed and should be (src.A * mask.X).
This is found in handling exa magic two pass composite.
2006-09-19 10:27:36 +08:00
Wang Zhenyu 37429c3ecb misc cleanup 2006-09-19 10:08:31 +08:00
Adam Jackson e3f4caf407 Add model-specific tweaks for some funky 945GM boards.
For the Aopen Mini-PC, ignore the claimed attached 800x600 LVDS panel.
Likewise for the Apple Mac Mini, but done slightly differently since it
shares PCI IDs with the Macbook Pro.
2006-09-15 13:51:18 -04:00
Eric Anholt bd758030a6 Add a compile flag to enable syncing after each operation in EXA.
This replaces other debug sync options sprinkled around the EXA code.  It
doesn't change the mis-rendering of text on the 915.
2006-09-14 11:12:03 -07:00
Eric Anholt f46c70e877 Add a note on maxX/maxY for the 2D rendering. 2006-09-14 10:05:51 -07:00
Eric Anholt ce00db054b Replace a couple of mis-uses of the screen's bpp when the pixmap's was needed. 2006-09-14 10:00:06 -07:00
Eric Anholt 71c2dd6336 Replace duplicated sync code in exa with a call to I830Sync.
The I830Sync version has additional code for the 965.
2006-09-14 09:54:19 -07:00
Alan Hourihane 564c830a91 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-video-intel 2006-09-13 16:34:10 +01:00
root bf49084ad7 bump max Xvideo height to 1088 to cope with some players. 2006-09-13 16:32:39 +01:00
Wang Zhenyu 59ce4180b9 reimplement Solid function
Replace COLOR_BLT_CMD with XY_COLOR_BLT_CMD, by which
device would care for direction and provide a (x,y) coord
interface. This fixes pixmap artifacts even in no composite
case.
2006-09-11 22:57:23 +08:00
Eric Anholt 2b9c87bbf8 Remove xf86_ansic.h usage. 2006-09-08 11:16:02 -07:00
Eric Anholt b970166eab Fix a compile failure from the last commit. 2006-09-08 11:09:19 -07:00
Eric Anholt 2b7602847a Merge branch 'exa-origin' into exa
Conflicts:

	src/i915_exa_render.c
2006-09-08 11:02:41 -07:00
Eric Anholt e4cdc42a98 Remove another debug printf. 2006-09-07 10:32:02 -07:00