Commit Graph

2728 Commits

Author SHA1 Message Date
Keith Packard 16e01b117b Oops. Don't try to use xf86RandR names, use xf86RandR12 instead.
Attempts to override functions in core server fail, so use
new names instead.
2006-11-30 11:55:29 -08:00
Keith Packard bcf206ff17 Merge branch 'restructure-outputs-origin' into restructure-outputs 2006-11-30 11:39:56 -08:00
Keith Packard 27ca1c17aa Rename I830 randr functions to xf86 as they are becoming generic.
Change function names, create separate i830_randr.h header file
to contain definitions.
2006-11-30 11:39:37 -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 b6fc8df9a5 Properly detect the GTT size on the G965.
In the past, the GTT has always been sized just large enough to map the whole
graphics aperture.  However, apparently on the G965 that isn't the case, and
it is actually 512KB on hardware with a 256MB aperture.  This resulted in X
not bothering to allocate memory for 256KB that it thought was already mapped
into stolen memory, and thus garbage rendering (particularly visible in large
video modes that displayed this unallocated memory).  The kernel happens to
get the right answer by hardwiring a 512KB GTT size already, but that may not
be true on future hardware.

Instead, we use a convenient field in PGETBL_CTL that's specifically for the
GTT size rather than the aperture size, which gets us the answer we want.
2006-11-29 15:06:32 -08:00
Eric Anholt 359dc81c07 Revert "Don't allocate stuff in the first 256K of video memory (GATT?)"
This reverts commit 997e8c9bb4.

The GTT is definitely located at the end of stolen memory.  This commit
apparently worked around mis-estimation of the GTT size.
2006-11-29 15:02:45 -08:00
Wang Zhenyu db391e8e4c shut up warning 2006-11-29 17:16:46 +08:00
Wang Zhenyu 290f15cd4c fix alpha blending state 2006-11-29 17:14:55 +08:00
Wang Zhenyu 3d4edd325f Add in sf/wm program for mask picture without CA 2006-11-29 17:05:32 +08:00
Wang Zhenyu a704120b15 misc cleanup for G965 vs/sf/wm states 2006-11-29 16:52:44 +08:00
Wang Zhenyu e3c70c68e3 WM kernel needs scratch space 2006-11-29 16:40:15 +08:00
Wang Zhenyu aa515c54f0 Setup default border color for our samplers 2006-11-29 16:37:06 +08:00
Wang Zhenyu b6eba96584 fix vertex buffer size 2006-11-29 16:30:53 +08:00
Wang Zhenyu 453842c9ff clean up issue cmd to ring buffer
Make it easy to track different part of ring state, and
use rectlist primitive instead.
2006-11-29 16:24:24 +08:00
Wang Zhenyu 18ad7d5cf0 remove wrong scale_units 2006-11-29 16:04:16 +08:00
Wang Zhenyu 3d5bd0c14e Rename exa sf/wm program files
Also fix some minors in wm program.
2006-11-29 16:02:16 +08:00
Wang Zhenyu a06beb5f80 EXA state mem for G965
Not split offscreen mem for exa, but alloc a dedicated one
for G965 states.
2006-11-29 15:47:19 +08:00
Eric Anholt 9e4e7d4fa2 Conditionally compile old-server compatibility code in.
This also replaces calls to compat code with the real names of the functions,
and slips #defines to an i830-namespaced version in when doing compat.
The current server version (7.1.99.2) is still left as requiring compat code,
since the version hasn't been bumped yet.

This also fixes some failures to call the compat code, and some failures to
actually compile the compat code.  Oops.
2006-11-28 16:37:46 -08:00
Eric Anholt 8d9ba2405d sparse cleanups (use NULL instead of 0 for pointers) 2006-11-28 15:44:06 -08:00
Eric Anholt dbb8135e10 Remove printing of the XFree86 screen mode list, and some other detritus. 2006-11-28 13:21:31 -08:00
Eric Anholt e8fb40ab10 Replace custom DDC mode list code with a copy of the X Server's.
The X Server now has most of the mode helper functions we want, and we can
start removing compilation of our copies when the server is new enough.
2006-11-28 11:17:21 -08:00
Keith Packard 2c8c310bd8 Driver-independent code tracks num_crtc itself, don't do it in driver.
Now that driver-independent code manages array of crtcs, let it track
the count and just have the driver compute how many there are in
a separate variable.
2006-11-27 22:18:59 -08:00
Keith Packard c421724d81 Move #include "randrstr.h" from i830.h to i830_xf86Crtc.h
As part of the separation of driver-dependent from driver-independent code,
the interactions with RandR are moving entirely out of the driver, which
means the driver shouldn't even know about RandR, while the
driver-independent code does.
2006-11-27 22:15:40 -08:00
Keith Packard e8d1db3263 Move crtc/output config to sub-structure.
Place crtc/output in separate structure at head
of driver private structure. Use this from the config code
to make it driver-independent. Still lots of effectively driver
independent code that continues to use driver dependent stuff,
but that will change.
2006-11-27 12:01:47 -08:00
Eric Anholt 72692ba2e0 Postpone SDVO DDC bus creation until we've detected the SDVO device.
This reduces log noise for those of us with no SDVO devices.
2006-11-27 11:23:55 -08:00
Eric Anholt 5f38bc3e2a Reduce the severity of many informational log messages. 2006-11-27 11:06:50 -08:00
Eric Anholt 85f404bc67 Re-indent ch7xxx driver. 2006-11-27 09:38:38 -08:00
Keith Packard a0518f5a44 Remove mode setting from load detect CRTC allocation.
To share load-detect CRTC allocation with TV driver,
move it to the output driver
2006-11-26 19:44:38 -08:00
Keith Packard a47c549df0 Clean up reworked data structure code so the server actually starts.
Use i830GeLoadDetectPipe again (instead of missing xf86AllocCrtc).  Actually
create new Crtc structures. Fix a few other NULL pointer dereferences.
2006-11-26 18:26:26 -08:00
Keith Packard 2529863a1a Start output/crtc restructuring work. It compiles.
Outputs and Crtcs are now split between 'generic'
and 'driver specific' pieces in the hope that more code
will be able to migrate to the xf86-generic layer.

Right now, the code remains tangled together, significant
work remains to tease the pieces apart. First the code
needs to be made to actually work as-is though.
2006-11-26 16:44:17 -08:00
Keith Packard 9aca4e2074 Remove custom configuration code (which was #ifdef'd out).
Multi-screen configuration is moving to generic code.
2006-11-22 15:52:32 -08:00
Keith Packard 850e3652f4 Note which pipe has failed to be configured for VBlank interrupt 2006-11-22 15:36:43 -08:00
Keith Packard 659e3db925 Set up maximum screen size for clone instead of panorama.
This avoids heading past the 8Kbyte stride limit of DRI so
that 3D will be available by default.
2006-11-22 15:35:59 -08:00
Keith Packard 03c12f8665 Limit DRI use to cases when pitch < 8Kbytes, not 4096 pixels.
3D rendering pipeline is limited to pitch of 8Kbytes and not 4096
pixels, which rather makes a difference at 32bpp.
2006-11-22 15:34:03 -08:00
Alan Hourihane 6781575f73 Be a little more verbose when rejecting modes. 2006-11-22 16:51:18 +00:00
Alan Hourihane e065324661 update port attributes immediately when overlay is on. 2006-11-22 16:51:18 +00:00
Keith Packard a0a9d1ea2a Set configured values for screen virtual size and initial frame.
Computation for virtual size and initial frame origin is quite
broken in xf86 common code.
2006-11-20 17:25:00 -08:00
Keith Packard d6a0f917e6 Enable second SDVO channel.
Rework SDVO support so that it can deal with two channels correctly,
also save/restore all connected output timings.
2006-11-20 15:17:32 -08:00
Eric Anholt 08b6569dc6 Enable TV output on Crestline (untested). 2006-11-19 16:15:45 -08:00
Eric Anholt 05202cabbd Merge branch 'modesetting-origin' into crestline 2006-11-19 16:14:18 -08:00
Keith Packard b945a650e9 Fix TV color key.
Subcarrier defines were incorrect in header file leaving one of the
DDA phases disabled.
2006-11-19 00:54:30 -08:00
Keith Packard 28224af3d9 Preliminary 945 TV output. Color key is broken. Fixed mode.
TV output is generating video with this patch, but the color burst
signal is incorrect somehow.
2006-11-19 00:40:46 -08:00
Eric Anholt ee502dd92a Merge branch 'crestline-origin' into crestline 2006-11-17 14:57:41 -08:00
Eric Anholt 15ff17c756 Merge branch 'modesetting' into crestline
This works for analog, but SDVO output appears to not work yet.

Conflicts:

	src/i830_driver.c
2006-11-17 14:50:22 -08:00
Eric Anholt 816fc1a76a Merge branch 'modesetting-origin' into modesetting 2006-11-17 00:05:53 -08:00
Keith Packard 7a7bb331e1 Don't dereference null DisplayModePtr on disabled output.
During initial configuration, outputs which are disabled have null
modes.
2006-11-16 21:19:20 -08:00
Wang Zhenyu 2fe6107ac6 Rotation support for 965GM 2006-11-17 13:11:36 +08:00
Keith Packard c4508c1cad RandR-based initial output configuration.
Using pre-init computed RandR information, make reasonable
default choices for the output configuration at startup time.
Either some preferred size or a size which yields 96dpi is chosen,
from which other monitors are set to a similar size. The largest
size sets the screen size.

This needs to be extended to respect config file settings, but
those have not been defined yet.
2006-11-16 21:09:23 -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
Eric Anholt 9cc2f3313d Replace broken PCI resource size detection with pciGetBaseSize() call. 2006-11-16 15:23:56 -08:00