Commit Graph

181 Commits

Author SHA1 Message Date
Alan Hourihane 37644293da check for xineramaproto 2006-08-08 14:42:32 +01: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 8e5844bbf9 bump to 1.6.2 to indicate mergedfb support 2006-08-08 11:43:10 +01:00
Alan Hourihane e4f63eaf5e Merge branch 'master' of git+ssh://xorg.freedesktop.org/git/xorg/driver/xf86-video-intel 2006-08-08 11:07:56 +01:00
Alan Hourihane 633a683a4a Ensure palette is updated in mergedfb & clone modes 2006-08-08 10:23:29 +01: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 a91a4f95c6 Fix pipe reversal for Xv 2006-07-27 16:11:48 +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 e26f3e30b3 Fix a build problem 2006-07-26 09:17:52 +01:00
Alan Hourihane b919db75d2 Bump to 1.6.1 2006-07-26 09:07:19 +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 84805167ab Convert i915 rotate code to the new fragment program API. 2006-07-18 18:27:10 -04:00
Eric Anholt 5176d62ba5 Add an API for programming i915 fragment programs. 2006-07-18 18:24:28 -04:00
Eric Anholt 148ef9bdd9 Convert magic numbers to symbolic names in i915 rotate code.
This doesn't cover the fragment shader yet, which we need to make a sensible
set of macros for (at least the basic bits).

Reviewed by:	md5
2006-07-18 17:11:34 -04:00
Alan Hourihane 16d6263e65 whoops, reverse part of that. 2006-07-16 20:39:52 +01:00
Alan Hourihane 2f50f6d1b1 move ContextMem out of XF86DRI 2006-07-16 20:17:38 +01:00
Alan Hourihane b1c2ea6535 whoops, revert some unnecessary changes 2006-07-11 08:13:30 +01:00
Alan Hourihane 8a44a7acfc Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-video-intel 2006-07-11 07:41:27 +01:00
Alan Hourihane 584b544987 Add an additional check before rotating 2006-07-11 07:40:40 +01:00
Eric Anholt e7723a4e57 Merge branch 'origin' 2006-06-26 16:04:33 +02:00
Eric Anholt 5111b88348 Turn on extra warning flags for GCC, and clean up the resulting fallout. 2006-06-26 14:53:10 +02:00
Alan Coopersmith dae9cb7712 Provide definitions of __FUNCTION__ for non-gcc compilers 2006-06-22 15:07:16 -07:00
Alan Hourihane 5a1b68993f Fix build without DRI 2006-06-21 08:41:16 +01:00
Matthieu Herrb 16b310823b Fix build without DRI 2006-06-21 00:12:27 +02: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 1fe3dd38eb Set some invarient state, cures some problems with
rotation at startup.

This mimicks the 3D drivers setup.
2006-06-19 11:27:28 +01:00
Alan Hourihane 3592b432b4 fix 8bpp & 16bpp rotation modes for i8xx
series chips
2006-06-13 21:42:53 +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
Keith Packard f2967a2f5f Video overlay gamma bounds checking must be done bytewise.
Also, pend bound computations to register writes to allow
updates to individual values that are 'out of spec' so
the client can update multiple values.
(cherry picked from 190f9ad060 commit)
2006-05-09 13:57:23 -07:00
Matthieu Herrb 99b0e53244 Fix non-dri build. 2006-05-01 10:47:09 +02:00
Matthieu Herrb 86f0119f47 Fix non-dri build. 2006-05-01 10:41:10 +02:00
Alan Hourihane 1dbb19059f fix bug 6365 2006-04-20 10:43:19 +01:00
Ian Romanick a85be82003 Add missing new-line character in log message. 2006-04-17 12:52:30 -07:00
Alan Hourihane 3c9bc19db6 fix typo 2006-04-12 21:54:50 +01:00
Wang Zhenyu a797a6626a Fix a broken test that resulted in page flipping always being enabled, not just
when the user enabled it.
2006-04-11 16:44:42 -07:00
Eric Anholt 66d216da3b Replace .cvsignore with .gitignore. 2006-04-11 16:37:10 -07:00
Adam Jackson 692a4a4baf Bump to 1.6.0. 2006-04-10 11:27:25 -07:00
Aaron Plattner 43c93057c0 Add a DrawablePtr argument to the XV functions to pave the way for redirected
video.
2006-04-10 11:26:33 -07:00
Alan Hourihane 39bdfbb4c2 x86_64 warning fixes 2006-04-10 11:26:06 -07:00
Dave Airlie 35e4756645 Fix some argument inversions in xf86DrvMsg function calls 2006-04-05 07:12:00 +00: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