Commit Graph

84 Commits

Author SHA1 Message Date
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
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
Alan Hourihane 5a1b68993f Fix build without DRI 2006-06-21 08:41:16 +01:00
Keith Packard 8a6edba332 Set vblank interrupt configuration to match pipe configuration
New i915 drm ioctl (in version 1.5) allows the X server to select
which pipe drives vblank interrupts. Use this to drive from the 'preferred'
pipe. Yes, per-window vblanks would be nice in a shared fb environment.
Maybe someday.
(cherry picked from 2fb375b665 commit)
2006-06-19 13:47:28 -07:00
Alan Hourihane a73ab7f0e6 additions for rotation fixes 2006-06-19 11:35:42 +01:00
Alan Hourihane a50610b771 Use 800x600 mode to double check 2006-06-12 13:53:20 +01:00
Alan Hourihane f02268b209 Don't rely on register check to find out
if we're resuming - it's not reliable.

But then, neither is the BIOS, but it's
the best we can hope for until Eric's work
is complete.

Try setting another mode to cater for some
broken BIOS' too.
2006-06-12 12:16:58 +01:00
Alan Hourihane 672c3d18db Only mark rotation flags after initial screen setup.
Fixes bug #7053
2006-06-12 10:02:06 +01:00
Dave Airlie 6812b53820 intel: fix VT switch DRI locking
The DRI locking is incorrect at VT switch, due to reference counting
inside the driver. Just call the DRI directly.
2006-06-02 12:22:14 +10:00
Dave Airlie f97895efd5 fixup chipid override
This makes the ChipID override work so that we actually override the pci id
that gets used everywhere in the driver.
2006-05-17 14:46:37 +10:00
Eric Anholt 4c727254da Remove the local, renamed copy of lnx_agp.c. The diff between lnx_agp.c and it
appeared to be removal of bugfixes.
2006-05-12 16:26:58 -07:00
Eric Anholt a115c4b872 Remove the code that changes our behavior based on whether a magic file exists
with magic contents in /tmp (created by some install script).
2006-05-12 16:11:29 -07:00
Eric Anholt 2e58aa401d Make the intel_acpi.c code non-modular and make it compile. I think we'll end
up nuking this code anyway, as keithp (and I, as well) disagree about how ACPI
should be handled, but the goal is to compile at the moment.
2006-05-12 15:54:37 -07:00
Eric Anholt 2cd6c8fa23 Revert internal shadow module changes back like master, along with RandR
initialization.  RandR initialization retains the no-rotation setting for BW.
2006-05-12 15:37:44 -07:00
Eric Anholt 88558ebeed Start fixing up the build and remove a regression from master (I think) in
rotation.
2006-05-12 15:00:17 -07:00
Eric Anholt 9e387ef92b Re-add authorship note in i830_driver.c accidentally left out of last commit. 2006-05-12 13:41:38 -07:00
Eric Anholt af2432322b First pass of integrating the Tungsten Graphics driver for Broadwater. This
patch is based off of diffing from the branchpoint to the supplied code, but
with many chunks containing reversions of commits removed.  Won't work yet.
2006-05-12 13:32:38 -07:00
Alan Hourihane 39bdfbb4c2 x86_64 warning fixes 2006-04-10 11:26:06 -07:00
Kristian Høgsberg 6e5f9b0263 Add more missing #include's, in particular assert.h. 2006-04-04 18:22:32 +00:00
Kristian Høgsberg fdfce49c54 Drop libc wrapper; don't include xf86_ansic.h and add includes now missing. 2006-03-22 23:24:03 +00:00
Alan Hourihane ab4c2f3bf4 Check the version of shadow being used and turn off rotation if it isn't the
right one.
Bump the Xvideo resolution support from 1920x1080 to 1920x1088.
2006-03-03 16:27:37 +00:00
Alan Hourihane 076971b95e When going dual head only take a portion of memory for the second head
instead of doubling the requirements.
2006-01-25 22:22:42 +00:00
Alan Hourihane 77d1c579f3 Fix a glitch in a dual head fix from #3105 2006-01-25 22:17:00 +00:00
Alan Hourihane d8d7490809 Bump version to 1.5.0.0
Add Intel 945GM support
Add RandR rotation support (full 3D acceleration, HWcursor & Xvideo rotated too)
Remove shadow framebuffer rotation code
Add a new LinearAlloc option to allow more offscreen memory to be allocated
for XVideo applications. This allows HDTV movies to be played via Xvideo.
2006-01-24 15:20:34 +00:00
Alan Hourihane 6fda4e886c Bug #4353: Fix lockup when suspend and resume when playing video.
Shutdown the overlay on LeaveVT.
2005-10-03 09:39:17 +00:00
Alan Hourihane 154724cc4b Put back the print code to display the DDC information, and remove some bogus
DDC messages.
2005-09-27 08:58:23 +00:00
Alan Hourihane 50f0bf51a6 fix another possible crash 2005-09-08 14:51:40 +00:00
Alan Hourihane 521e357c18 Fix a crash situation 2005-09-08 09:31:04 +00:00
Alan Hourihane e8c46c8975 Fix DirectColor visual colormap issues at 16bpp in the i830 driver. 2005-09-06 10:31:33 +00:00
Alan Hourihane bf6fef4193 Sync the accelerator before calling AdjustFrame to avoid lockups. 2005-09-06 10:23:57 +00:00
Daniel Stone 219beaca91 Fix typo in debug ErrorF. 2005-08-21 06:26:33 +00:00
Alan Hourihane 7476d0413f Enable gamma correction bit even for 8bit modes.
The pipeconf register handles the real enablement.
2005-08-08 09:17:06 +00:00
Alan Hourihane fd6d7d7f7e Adjust newPipe code for BIOS's starting at 1200 2005-08-02 16:22:42 +00:00