Commit Graph

40 Commits

Author SHA1 Message Date
Wang Zhenyu 1329c86f2a [PATCH] EXA state mem for G965
Not split offscreen mem for exa, but alloc a dedicated one
for G965 states.

Signed-off-by: Keith Packard <keithp@neko.keithp.com>
2007-01-06 14:37:29 -08:00
Eric Anholt 4ed79a2ba6 Relax tiling requirements on G965.
For the 965, we can tile with the pitch at any integer multiple of a tile size
(128 or 512B), up to 128KB.
2006-12-29 12:19:41 -08:00
Eric Anholt bedab1654e Remove 8MB/32MB default VideoRam limits.
With modern monitors and increased XV and EXA memory requirements, these small
limits were resulting in DRI and other initialization failures because we
wouldn't allow them enough memory.  Instead, allow each piece of the system
(DRI, EXA, XAA, etc) to request as much memory as it wants, and choose the
actual videoRam to be used for laying out the memory afterwards.

With this change, in the absence of a VideoRam option, 32MB will be allocated
for textures.
2006-12-28 16:44:30 -08:00
Eric Anholt 46df75ccd4 Bug #7524: Major improvements to EXA/XAA static memory allocation.
With this, we no longer allocate XV through the XF86 linear allocator in the
EXA case.  We also no longer allocate extra space for the XF86 2D allocator
that we don't use in EXA mode, or space for the EXA allocator in XAA mode.
The EXA offscreen allocator now gets enough space for several screenfuls of
pixmaps plus one 1920x1088 movie.

A large duplicated section of code for allocating each framebuffer in the old
dual-screen mode was also factored out.
2006-12-27 13:54:22 -08:00
Eric Anholt b94b7c4bcf Merge branch 'exa' of ../xf86-video-intel into modesetting
Conflicts:

	man/i810.man
	src/Makefile.am
	src/i830.h
	src/i830_driver.c
	src/i830_rotate.c
	src/i830_video.c
2006-11-30 09:15:30 -08:00
Eric Anholt 9948d8377d Merge branch 'master' into modesetting
Conflicts:

	src/i830.h
	src/i830_cursor.c
	src/i830_dri.c
	src/i830_driver.c
	src/i830_video.c
2006-11-16 19:47:24 -08:00
Thomas Hellstrom c0ee50c4ee Add support for the new DRM memory manager.
Some code are duplicated with the new libdrm.
Once this code has been released with xserver,
it can be removed.

See the man page for new options and backwards
3D driver compatibility.
2006-10-27 19:13:33 +02: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
Wang Zhenyu f272f0d811 Merge branch 'master' into exa 2006-09-25 14:15:21 +08:00
Alan Hourihane 6500a3aa13 When in MergedFB mode, fix offscreen memory allocation. 2006-09-07 17:45:28 +01:00
Wang Zhenyu 078af29fa6 Merge branch 'master' into exa
Conflicts:

	man/i810.man
	src/Makefile.am
	src/i830_accel.c
	src/i830_dga.c
	src/i830_driver.c
2006-08-24 10:23:22 +08: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 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 b85f268051 Fix remaining warning. 2006-06-26 16:26:58 +02:00
Wang Zhenyu 011a1c99d4 Fix memorySize to enable offscreen mem manage. 2006-05-17 11:16:00 +08: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 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
Eric Anholt a66f2c01f7 Stop doing the BIOS memory size tweaking now that we don't ask the BIOS about
what modes are available.
2006-05-01 12:35:21 -07:00
Eric Anholt 941a49f91e Commit what applied from Jesse Barnes's i830-exa-latest.patch. 2006-04-28 14:57:03 -07:00
Dave Airlie 35e4756645 Fix some argument inversions in xf86DrvMsg function calls 2006-04-05 07:12:00 +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 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 461d43be78 Egbert's 64bit fixes for mixed 32/64bit clients 2005-08-15 07:30:05 +00:00
Adam Jackson ac920dae7c Prep for modular builds by adding guarded #include "config.h" everywhere. 2005-07-11 02:29:51 +00:00
Alan Hourihane 27feb0f347 Add Intel(R) 945G support 2005-05-31 17:58:26 +00:00
Alan Hourihane 8bc9b0d7da Fix some bad alignment problems when allocating memory from
the end of AGP space.
Bugzilla #2764 (https://bugs.freedesktop.org/show_bug.cgi?id=2764)
2005-03-21 18:57:39 +00:00
Alan Hourihane 076c5116ae Add:
- Intel i915GM support to 2D DDX and 3D Mesa drivers.
- PanelID identification
- DRI suspend/resume support
- Detection of monitor changes on VT switches
- Support custom video modes if available in the Video BIOS
- 3D enhancements:
	* GL_ARB_texture_cube_map
	* GL_EXT_blend_equation_separate
	* GL_ATI_blend_equation_separate
	* GL_ARB_point_parameters
	* GL_NV_blend_square
	* GL_EXT_cull_vertex
	* GL_ARB_depth_texture
	* GL_SGIX_depth_texture
	* GL_ARB_shadow
	* GL_EXT_shadow_funcs
	* GL_3DFX_texture_compression_FXT1
By Tungsten Graphics, Keith Whitwell & Alan Hourihane.
2005-01-06 14:43:14 +00:00
Markus Kuhn 59cecb714b Encoding of numerous files changed to UTF-8 2004-12-04 00:43:09 +00:00
Egbert Eich 88714c3b22 Change order of SetDisplayDevice(), HWRestore(), UnbindGART() and
RestoreBIOSMemSize() to be exactly opposite to the Save procedure in EnterVT()
(Matthias Hopf, Alan Hourihane).
Fixed server crash on reset when a structure allocated in PreInit() was freed on
CloseScreen().
Fixed ring buffer lock ups that happened because the structure that contained
ringbuffer data was not zeroed after allocation.
Fixed numerous warnings due to signed unsigned comparisons.
2004-10-12 19:13:43 +00:00
Egbert Eich 986bc24892 Increase default video RAM size to 16MB when DRI is enabled and more than 128MB
are available (Egbert Eich).
Fixed lockups during mode switch. Problem was introduced when attempting to copy
the behavior during LeaveVT()/EnterVT() but but forgetting to call
I810DRILeave() before I810DRIEnter(). The entire DRILeave()/Enter() scenario has
been commented out as it didn't seem to be necessary (Egbert Eich).
Fix TweakMemorySize() (tested with i855/i865) (Egbert Eich).
2004-07-06 14:37:47 +00:00
Alan Hourihane 5ed7e6f842 i915 support
Dual Head support for i830, i855, i915.
ARGB cursor support (including i810) for all chipsets.
2004-06-22 14:28:46 +00:00
Eric Anholt c5b1972b50 DRI XFree86-4_3_99_12-merge import 2004-06-16 09:23:18 +00:00
Egbert Eich 41eba03d0d Merging XORG-CURRENT into trunk 2004-04-23 19:35:55 +00:00
Egbert Eich e27494f2a9 Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004 2004-03-14 08:33:22 +00:00
Egbert Eich 5ece535dc7 Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004 2004-03-03 12:12:19 +00:00
Egbert Eich ba904078dd readding XFree86's cvs IDs 2004-02-26 13:35:53 +00:00
Egbert Eich 13ea363db3 Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004 2004-02-26 09:23:19 +00:00
Kaleb Keithley 72063c52b8 XFree86 4.3.99.16
Bring the tree up to date for the Cygwin folks
2003-11-25 19:28:37 +00:00
Kaleb Keithley 3ad0d9a73b Initial revision 2003-11-14 16:48:55 +00:00