Commit Graph

290 Commits

Author SHA1 Message Date
Alan Hourihane d6ca9feb78 Fix bug #7943 where video flickers when changing
attributes. This code was a leftover from testing lockups
and shouldn't be needed anymore.
2006-09-25 12:03:27 +01:00
Alan Hourihane 564c830a91 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-video-intel 2006-09-13 16:34:10 +01:00
root bf49084ad7 bump max Xvideo height to 1088 to cope with some players. 2006-09-13 16:32:39 +01: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
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 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
Eric Anholt 38e7e48418 Fix README typos from in the generated file. 2006-08-10 15:38:14 -07:00
Eric Anholt 975e602610 Bug #7829: Fix reported driver version.
The driver now reports itself as the PACKAGE_VERSION from autoconf.  The DRI
DDX -> client interface version is dissociated from this so that we can do
appropriate major/minor versioning of the interface that's not tied to the
package version.  Bumped the i830 ddx dri version patchlevel to note the
fix in the previous commit.
2006-08-10 13:49:43 -07:00
Eric Anholt 820e9a22fd Bug #7835: Restore unused fields in I830DRIRec to avoid i915 DRI breakage.
As it was, 1.6.4 broke compatibility with the released DRI driver.
2006-08-10 13:37:18 -07:00
Eric Anholt caa3b35cd7 Correct typos in README source. 2006-08-09 16:11:30 -07:00
Eric Anholt 2a7426cf13 Clean up warnings. 2006-08-09 15:47:09 -07:00
Eric Anholt 24e59a0daa Merge branch 'textured-video', bringing in fixed-up i915 textured video.
Conflicts:

	src/i830_video.c
2006-08-09 14:19:06 -07:00
Eric Anholt bb6080735e Bump to 1.6.4 for release. 2006-08-09 12:21:16 -07:00
Keith Packard 3ca14275d1 Add missing headers to i810_drv_la_SOURCES 2006-08-09 10:35:57 -07:00
Keith Packard 309374f78d Use double quotes to avoid sgml syntax error 2006-08-09 10:30:41 -07:00
Keith Packard dca9f856ca Reformat README 2006-08-09 10:29:59 -07:00
Eric Anholt b19ea22272 Update the README.sgml file for the upcoming release. 2006-08-09 10:01:29 -07:00
Keith Packard f8b47f6072 Update manual page to include i945 and later details.
(cherry picked from 7833d0733bc146cf1ae7f588516c49797886b396 commit)
2006-08-08 16:23:59 -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
Eric Anholt bc5f565680 Intel bug #49: Fix video output at 32bpp by using B8G8R8A8 instead of B8G8R8X8.
While here, don't overallocate video memory for the i965G state.
2006-08-08 15:48:04 -07:00
Alan Hourihane c3b3d47978 Intel bug #35: Fix accelerator syncing with DGA.
Fixes glitches seen with Mark Vojkovich's "texture" demo.
2006-08-08 15:28:56 -07:00
Wang Zhenyu bc12208f6e Disable error register dumping in dri TransitionTo2d. This's for
debug which might confuse QA.
2006-08-08 15:28:52 -07:00
Alan Hourihane bb65a4dc55 bump to 1.6.3 2006-08-08 14:51:18 +01:00
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
Eric Anholt 0fd4831fdc Disable dynamic front buffer mapping on i965.
Moving front buffers should only be necessary for rotation.  Currently, the
server isn't ready for it, and the method attempted to work around it caused
crashes with DRI.  Since i965 doesn't support rotation yet, this should be
harmless for now.
2006-08-04 00:21:05 -07:00
Eric Anholt 8d0a513850 Add parenthesis so that IS_I965G doesn't make the test pass for 8-bit. 2006-08-03 19:16:59 -07:00
Eric Anholt aa69018c01 Turn off video debugging now that it appears to work fine. 2006-08-03 19:12:15 -07:00
Eric Anholt d15f871108 Merge branch 'broadwater-video-rehash' into i965
The previous merge wasn't done on a synced-up tree, and missed necessary
changes.
2006-08-03 19:09:10 -07: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
Eric Anholt d56ffa5f35 Bump PS_MAX_THREADS to 32 now that the program doesn't fail. 2006-08-03 16:03:50 -07:00
Eric Anholt 4525379d95 Make the sampler's payload be the WM payload rather than uninitialized data.
The sampler's payload happens to be in the same format as the WM payload,
though most of the fields are ignored.

This appears to fix the program in the presence of multiple PS threads.
2006-08-03 16:03:15 -07:00
Eric Anholt ad2c70b412 Remove some stale XXX-prefixed comments. 2006-08-03 12:47:19 -07:00