Commit Graph

170 Commits

Author SHA1 Message Date
Eric Anholt eec5580cef Merge branch 'overhaul' into modesetting 2006-10-23 14:52:55 -07:00
Eric Anholt 2591c1fcf1 Fix LVDS restore path, and move pipe assignment for outputs to the right place. 2006-10-09 14:20:49 -07:00
Eric Anholt 317cc119c5 Move per-output mode setting code to per-output methods.
This is not a very clean interface, as a number of outputs require tweaks to
the DPLL registers.  When possible, the DPLLs are just adjusted in the
per-output post_set_mode, which happens just after the DPLL is enabled.
However, this seems better than the previous method of having all outputs
programmed in the same function.
2006-10-09 11:49:37 -07:00
Adam Jackson 53c28b3980 Expand the check for AOpen Mini-PC.
Just match on subsystem vendor, don't bother inspecting the subsystem device
ID, since apparently they're all busted.
2006-10-07 11:18:26 -04:00
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
Eric Anholt 9bb7736ab3 Remove checks for output privates in various bits of code.
Now, the output is only set up if it fully initializes, so it will never exist
if the private it requires doesn't.
2006-10-05 16:16:45 -07:00
Eric Anholt ada8f62da2 Give each output type an init method in its file, making other methods static. 2006-10-05 15:55:07 -07:00
Eric Anholt 103b4edce7 Move the save, restore, and DPMS per-output settings to per-output files. 2006-10-04 18:48:17 -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 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
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 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 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
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 b970166eab Fix a compile failure from the last commit. 2006-09-08 11:09:19 -07:00
Alan Hourihane 6500a3aa13 When in MergedFB mode, fix offscreen memory allocation. 2006-09-07 17:45:28 +01: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
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
Eric Anholt 2a7426cf13 Clean up warnings. 2006-08-09 15:47:09 -07:00
Eric Anholt d150b53d10 Merge branch 'i965', adding i965G support.
Conflicts:

	src/i830_cursor.c
	src/i830_driver.c
2006-08-08 15:59:17 -07:00
Alan Hourihane 3661d4df86 Re-enable monitor detect after a few fixups. 2006-08-08 12:25:03 +01:00
Alan Hourihane 995b142f51 Disable detecting of new monitors on VT switch.
It's doesn't always work. The modesetting
branch will deal with hotplug displays correctly.
2006-08-08 12:01:39 +01:00
Alan Hourihane 633a683a4a Ensure palette is updated in mergedfb & clone modes 2006-08-08 10:23:29 +01:00
Eric Anholt a79aa0d7b2 Merge branch 'broadwater-video-rehash' into broadwater
Conflicts:

	src/Makefile.am
	src/common.h
	src/i810_driver.c
	src/i810_reg.h
	src/i830.h
	src/i830_accel.c
	src/i830_cursor.c
	src/i830_dri.c
	src/i830_dri.h
	src/i830_driver.c
	src/i830_memory.c
	src/i830_rotate.c
	src/i830_video.c
2006-08-03 18:29:12 -07:00
Alan Hourihane 760021e398 Add current Tungsten Graphics code drop for i965 support. 2006-08-03 17:08:39 -07:00
Alan Hourihane e71108f1e0 Fix DGA with MergedFB
Turn off rotation support when MergedFB enabled
2006-07-28 10:32:12 +01:00
Alan Hourihane ac3ad32f66 Calculate allowable refresh rates on the private
mode data for each independent screen in mergedfb.

Lots of other fixes too.
2006-07-27 15:28:42 +01:00
Alan Hourihane e786e2f9f3 When detecting new monitors in mergedfb renew the modepool. 2006-07-26 16:45:38 +01:00
Alan Hourihane 8e6e990db3 Update Xvideo to deal with MergedFB modes. 2006-07-26 10:48:47 +01:00
Alan Hourihane fd19b12793 Add mergedfb support to the intel driver with
additional pseudo-Xinerama support.
2006-07-25 11:14:11 +01:00
Eric Anholt c7083a2672 Bug #7404: Only save/restore VGA fonts and not other VGA regs.
This fixes a hang on the i945 during restore.  It appears that saving/restoring
the VGA registers is not important, as we're correctly saving/restoring the
registers we touch within the driver anyway.
2006-07-14 14:28:03 -07:00
Luká\u0161 Hejtmánek f9499a68da Make gamma settings apply to the cursor as well, and fix clone-mode gamma. 2006-07-11 10:13:18 -07:00
Alan Hourihane b1c2ea6535 whoops, revert some unnecessary changes 2006-07-11 08:13:30 +01:00
Alan Hourihane 584b544987 Add an additional check before rotating 2006-07-11 07:40:40 +01:00
Eric Anholt f5a01a2ef0 Make DVO code light up my sil164-based DVI output, when already set up by BIOS. 2006-07-10 17:19:19 -07:00
Eric Anholt 3924ffb7d7 Merge branch 'dvo-merge' into modesetting
Conflicts:

	src/i830_driver.c
2006-07-10 12:12:38 -07:00
Eric Anholt 5a8f6a486d Improve output bus setup to include LVDS setup for pre-i915. 2006-07-08 15:26:19 -07:00
Eric Anholt df333cc9a8 Initial add of DVO support code. Probes my sil164.
This is a mostly-untested merge of airlied's work.  The I2C modules are intended
to be moved into the core server or a separate driver module when they're
functional and we're happy with the API.
2006-07-07 13:41:33 -07:00
Eric Anholt 9fbd3d8f4b If the panel power registers are all zeroes on Mobile parts, disable LVDS.
This is the case on the Mac mini, which is an i945GM but has no LVDS attached.
Powering on with the power timing registers zeroed would probably be a bad idea,
even if there was a panel attached.
2006-06-27 23:31:40 +02:00
Eric Anholt 7104b915da Clean up warnings. 2006-06-26 15:11:13 +02:00
Eric Anholt 6d1d105d68 Unset pipe current mode on EnterVT, so we reprogram the mode for sure. 2006-06-26 10:14:27 +02:00
Eric Anholt f5e5f8aedd WIP to allow re-probing and validation of modes for new heads at "xrandr" time.
Now, DDC modes always end up being preferred to custom modelines, even if
smaller.  This should probably be fixed by inserting custom modelines into
the probed mode list if they're valid according to the probed parameters of the
monitor.

Too much code is lifted from static functions in xf86Mode.c, and those should be
made unstatic if possible.  Using xf86ValidateModes is also rather hacky, and
I want to break the function down, but this is a first step.
2006-06-23 23:29:55 -07:00