Commit Graph

532 Commits

Author SHA1 Message Date
Eric Anholt 27df2ff790 Report pipe status (and status mismatches) in i830DescribeOutputConfiguration() 2006-11-03 16:39:49 -08:00
Eric Anholt ecbe73b940 Merge branch 'modesetting-origin' into modesetting
Conflicts:

	src/i830_display.c
2006-11-03 15:59:59 -08:00
Eric Anholt 561af00797 Add support for load-based CRT detection. 2006-11-03 15:57:34 -08:00
Eric Anholt e416b426d8 Print out modelines as info, not error (which had been used for debugging). 2006-11-03 15:25:41 -08:00
Eric Anholt 282a9e073e Don't memset the modes pointer on init, which was dereferencing NULL. 2006-11-03 13:46:09 -08:00
Keith Packard 9681602177 Create I830PipeRec to hold pipe-specific data. Remove unused I830 members.
I830 contained six parallel arrays for pipe-specific data; these
have been moved to a I830PipeRec structure instead.

I830 also contained several unused members:

   unsigned int bios_version;
   Bool newPipeSwitch;
   Bool fakeSwitch;
   int fixedPipe;

These have been removed, along with the code that set them.
2006-11-03 12:55:25 -08:00
Eric Anholt 0510671a6c Fix a pasteo in I965 register restore. 2006-11-03 10:58:46 -08:00
Keith Packard 2c9ab6e059 set the v_sync_off_high to zero. XXX should check docs 2006-11-02 13:44:59 -08:00
Keith Packard 56f6d4f1bb Disable the panel fitter when not using it. Cleans up SDVO DVI output.
The panel fitter appears to exist on the 965 hardware (at least) and
causes troubles with DVI output over SDVO when enabled. This patch
checks to see if the panel fitter is pointing at the pipe being configured
and disables it unconditionally in that case. The LVDS driver will configure
it correctly if necessary afterwards.
2006-11-02 13:44:59 -08:00
Keith Packard f22d9bcc25 Add another couple of new registers 2006-11-02 13:44:59 -08:00
Eric Anholt a9eac38bcd Remove duplicated register defs that were just added. 2006-11-02 13:24:54 -08:00
Eric Anholt 7887c76062 Add airlied's I2C code, ifdeffed out.
I've gone back to compare our behavior to it several times, so I'll just keep
the code in tree for now.
2006-11-02 13:19:06 -08:00
Eric Anholt 87b15cfbf7 Remove dead specifiedMonitor field. 2006-11-02 13:16:44 -08:00
Keith Packard 2636d68663 Dump more registers for debug purposes 2006-11-02 11:57:11 -08:00
Keith Packard 786ec54c4c Add a few more registers from the 965 spec 2006-11-02 11:56:50 -08:00
Keith Packard 85e32ad2da ch7xxxSaveRegs receives real type instead of void * 2006-11-02 11:56:12 -08:00
Eric Anholt ffbd6ca09b Remove dead VESARec struct. 2006-11-01 13:05:44 -08:00
Eric Anholt 97c3a1b242 Remove the refresh rate appended to some mode names.
This gets the SDVO and CRT outputs I have to have at least 1 common mode
according to RandR.
2006-11-01 13:04:08 -08:00
Eric Anholt 7971c40155 Attempt to pull monitor physical size information out of DDC EDID data. 2006-11-01 12:42:56 -08:00
Eric Anholt fb94c12109 Move mode lists from per-pipe to per-output.
This should let RandR do the right thing in exposing the modes to userland.

As a side effect of getting this working, the SDVO pixel clock range code
was fixed and the mode valid tests for various outputs got extended.  Also,
LVDS grew a get_modes for the fixed panel mode.

Note that we now no longer do automatic enabling of outputs at xrandr -s 0,
hotkey, or VT switch.  That will be left to generic RandR code later.  Also,
generic modes and user-defined modes are once again not validated into the
lists, so this is a regression there.
2006-11-01 12:23:50 -08:00
Eric Anholt f30d7f912f Update for the move of RandR phyiscal size information. 2006-11-01 11:50:51 -08:00
Eric Anholt 7195dfabd5 Give each output a get_modes function and expose those modes through RandR.
The get_modes should return the probed modes only.  The driver should then
append to the list (for example, compatible modes listed in other outputs,
or standard VESA modes) to create the list to expose through RandR.  That
isn't done yet.
2006-10-31 17:10:08 -08:00
Eric Anholt cc3728be24 Add compat definitions for M_T_PREFERRED and M_T_DRIVER for older X Servers. 2006-10-31 15:00:36 -08:00
Eric Anholt a71f283650 Connect output detection up to RandR. 2006-10-31 14:46:23 -08:00
Eric Anholt 68cef9f4e0 Move output connection detection to a per-output method.
This will be used by RandR, and should let us clean up some of the initial
display configuration, hopefully.

Also, analog hotplug-based detection is now enabled on G965.
2006-10-31 14:32:00 -08:00
Eric Anholt 9fd719fce2 Move SDVOB_PRESERVE_MASK next to SDVOC_PRESERVE_MASK. 2006-10-31 14:29:44 -08:00
Eric Anholt 4f5d4d8870 i830SetLVDSPanelPower is now a static function in i830_lvds.c, so remove it. 2006-10-31 13:37:23 -08:00
Eric Anholt 49bbdf16c0 Fix many inconsistencies in the SDVO code compared to the spec.
Also, fix some struct padding  so that the right bits are sent out.
2006-10-31 11:42:03 -08:00
Eric Anholt e7d546cac0 Remove some dead code from BIOS modesetting. 2006-10-30 11:24:43 -08:00
Eric Anholt 2ca57040b0 Remove GetBIOSVersion().
This info hardly useful now that we don't use the BIOS for mode setting.
2006-10-30 11:19:19 -08:00
Eric Anholt 837b2f6320 Warning fix. 2006-10-30 11:17:55 -08:00
Eric Anholt bca9e6ccbd Remove SetPipeAccess and now-unnecessary VBE reinit. 2006-10-30 11:17:27 -08:00
Eric Anholt 819a47b27c Use the new fields for SDVO pixel multiply on the G965.
This should fix display at resolutions/refresh rates in a different multiplier
class than the console display (generally, high resolution modes).
2006-10-30 11:00:20 -08:00
Eric Anholt 71545db461 Return and use valid status bits for i830_sdvo_get_trained_inputs(). 2006-10-30 09:46:10 -08:00
Eric Anholt c357eca10c Clean up whitespace in i830_randr.c. 2006-10-30 09:44:55 -08:00
Eric Anholt 3ab9f5a4a8 Move vbeInfo out of the driver struct to the one place it's used. 2006-10-25 16:11:06 -07:00
Eric Anholt df14838eb5 Remove dead memsize reporting.
The calculation no longer made sense, as we don't use the BIOS for mode
selection.
2006-10-25 16:11:06 -07:00
Eric Anholt 3a6104ab89 Remove disabled I830DetectMonitorChange().
This used to be called when switching back in to X.  It might make some sense
to detect monitors at this time (it happens to occur at resume time, when
monitors are likely to have changed), but it should probably live in either
userland policy with RandR 1.2 or RandR 1.2 XFree86-DDX generic code.
2006-10-25 16:11:06 -07:00
Eric Anholt 88c12f577f Move LVDS initialization and blacklisting damage to the LVDS support file. 2006-10-25 16:11:05 -07:00
Eric Anholt 2631014e9d Clean up the SDVO code.
The main change is to send SDVO commands using data passed into the send
command function, and receive responses into memory passed into the read
response function, rather than stuff things in/out through dev_priv->sdvo_regs.
This lets us use structures to represent some arguments, which results in a
nice cleanup (and 100% fewer arguments named magicN as a side effect).

Also, the mode set path is changed to not do any preferred input timing
work.  We weren't doing anything legitimate with the results, since we didn't
modify the CRTC timing appropriately, so now we just stuff the CRTC timing into
both and hope for the best.  This should probably be revisited later.
2006-10-25 12:21:57 -07:00
Eric Anholt ddb986e54f Nuke trailing whitespace in SDVO code not already cleaned up. 2006-10-25 12:21:57 -07:00
Eric Anholt cd2f0d948a Clean up SDVO code, moving the private structure internal and cleaning up caps.
All the SDVO code should now be in lower case rather than StudlyCaps.

This also adjusts the I2C setup to create a bus per SDVO output we set up.
The previous setup with shared buses was failing in some circumstances, which
is probably due to the lack of refcounting in xf86i2c.c.
2006-10-25 12:21:57 -07:00
Keith Packard cd9c6e2914 Merge branch 'modesetting-origin' into modesetting 2006-10-24 16:53:46 -07:00
Eric Anholt eec5580cef Merge branch 'overhaul' into modesetting 2006-10-23 14:52:55 -07:00
Eric Anholt a91c0cbab5 Add work-in-progress integrated TV-out support.
This is the TV connector on board for the 915GM and 945GM.

It is currently not hooked up to output initialization as it's entirely
untested.  However, I think this is a reasonable starting point for getting
TV-out actually working.
2006-10-23 14:30:38 -07:00
Eric Anholt 8149681f2e Add a per-output mode-valid method.
This is currently disconnected, but will be used in more overhaul work.
This should be where any output limitations, such as clocks, resolution,
scaling limits, or other options, are validated.  Other limitations, such as
chipset resolution limits, CRTC clock limits, etc. should be elsewhere.
2006-10-16 16:51:04 -07:00
Keith Packard c5cca4c20a Advertise textured video adapter first 2006-10-13 15:31:43 -07:00
Eric Anholt 1838671476 Only disable the output when marked disabled.
Also, remove a couple of dead variables.
2006-10-10 12:41:01 -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 09e3d10b0f Add a function for describing the output connection configuration. 2006-10-09 13:09:39 -07:00