Commit Graph

476 Commits

Author SHA1 Message Date
Keith Packard d649fb0d96 Don't require MonitorLayout when two monitors are plugged in.
With randr12 working, we can just leave the second monitor off for now.
2006-10-05 22:46:07 -07:00
Keith Packard 0a5504e59f Fix DPI at startup in RandR 1.2 code.
Use requested monitor resolution to compute the appropriate screen size when
resizing the screen during RandR initialization.
2006-10-05 09:11:29 -07:00
Keith Packard 4ac81d58b7 Remove mode origins, add preferred mode count.
Just tracking changes in the 1.2 protocol spec.
2006-10-04 23:22:52 -07:00
Keith Packard 16988b2725 Merge branch 'modesetting-guitar' into modesetting 2006-10-04 18:44:43 -07:00
Keith Packard 5a06000248 Add mode origins for randr 2006-10-04 18:43:07 -07:00
Keith Packard cc4148e25d Merge branch 'modesetting-origin' into modesetting 2006-10-03 22:00:41 -07:00
Keith Packard 1bc1cedbcd Enable XV_PORT attribute even when not in Clone mode.
As Clone mode is now something that can change after server startup, always
enable the XV_PORT attribute as we cannot change the list of reported
attributes.
2006-10-03 22:00:14 -07:00
Keith Packard 33629ed304 Always register list of modes for outputs, even when disabled. 2006-10-03 09:39:22 -07:00
Eric Anholt 3e6f81f70f Move cursor base address register setting to a separate function. 2006-10-02 09:53:57 -07: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
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
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
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
Keith Packard d9db5ec686 Merge branch 'modesetting-origin' into modesetting 2006-09-19 16:03:04 -07: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 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
Alan Hourihane 8b9d7a5f85 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-video-intel 2006-09-07 17:45:57 +01:00
Alan Hourihane 6500a3aa13 When in MergedFB mode, fix offscreen memory allocation. 2006-09-07 17:45:28 +01:00
Eric Anholt 1e6e288b88 Add a check for intel-gen4asm, and rules to compile {wm,sf}_prog.h using it.
This adds assembly source for the two programs used in the textured video
implementation on the 965, which should make them easier to modify in the
future. The compiled versions are also included, so that intel-gen4asm isn't a
build requirement for people that aren't modifying these programs.

There are minor differences in the compiled versions of these programs compared
to their previous versions which were compiled with a different tool.  I
believe the changes should be harmless, and video continues to work on my
system.
2006-09-01 16:47:17 -07:00
Keith Packard cbaf3cf74b verbose debug message for panel sync data 2006-08-31 18:25:21 -07:00
Alan Hourihane 1feb733eb8 Fix bug with probing info of DFP2 and LFP2 connected
devices (Aaron Ridout)
2006-08-29 14:54:15 +01:00
Alan Hourihane 26e6c074c1 Fix SetVBlank to operate all the time 2006-08-28 11:55:38 +01:00
Ross Burton 6f0d352b83 Bug #7957: Fix distcheck. 2006-08-24 18:18:41 -07:00
Alan Hourihane ea63e82ef4 fix typo 2006-08-22 16:40:08 +01:00
Alan Hourihane dc4128ea07 remove GL* usage 2006-08-21 12:13:42 +01:00
Alan Hourihane dad0e7fc09 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-video-intel 2006-08-21 12:08:01 +01:00
Alan Hourihane 361c49ad3c Fix bug #7930, i810 doesn't compile without DRI
(Samuel Thibault)
2006-08-21 12:07:29 +01:00
Eric Anholt 43daaec639 Bug #7905: Mark DRI state as dirty in 965 textured video, fixing hangs with 3d. 2006-08-17 15:58:29 -07:00
Alan Hourihane cdcc6f23e8 Disable device check when mergedfb in operation. 2006-08-16 17:16:28 +01:00
Alan Hourihane a94c96abf9 Fix bug #5150. Disable LVDS usage on i915G, i945G and i965G. 2006-08-16 17:15:26 +01:00
Wang Zhenyu 2a4e486d29 Fix undefined alloc type for agp memory
This shuts up the nonfatal warning that type 3 for alloc agp
memory is undefined for intel-agp.
2006-08-11 11:07:08 +08:00
Eric Anholt 4cfed93df6 Bump to 1.6.5 for release. 2006-08-10 15:41:32 -07:00