Commit Graph

1801 Commits

Author SHA1 Message Date
Keith Packard 7d08f720a9 Merge branch 'modesetting-origin' into modesetting 2007-03-03 23:13:03 -08:00
Keith Packard 435d35558d Update for Aaron's xserver changes.
Add xf86CrtcConfigFuncs to xf86CrtcConfigInit
Add canGrow option to xf86InitialConfiguration
2007-03-03 22:46:31 -08:00
Keith Packard c0f99b4962 LVDS dither control moved from PFIT to LVDS register for Crestline
The LVDS register now contains lots of new controls for dual-channel LVDS control
along with dither enabling. The PFIT register has a lot fewer controls as a result.
2007-03-03 22:36:46 -08:00
Keith Packard 0fa3d4f51b Merge branch 'modesetting' into crestline 2007-03-03 21:02:17 -08:00
Nian Wu 0ed5a2fdcf Merge branch 'modesetting' of git://proxy01.pd.intel.com:9419/git/xorg/driver/xf86-video-intel into crestline 2007-03-03 09:00:20 -05:00
Eric Anholt fd52d63560 Add a WIP UploadToScreen implementation. This almost displays right. 2007-03-02 13:44:57 -08:00
Eric Anholt ca0fa875e8 Move EXA offscreen memory back after framebuffer to avoid fallbacks.
Without this, the EXA code decides that the framebuffer is not in video
memory because it's not located between the start of video memory and the end
of EXA allocator memory.  We should either have EXA let the driver decide if a
pointer is in video memory, or add a new field for "end of video memory" (not
just end of EXA offscreen allocation), but this fixes things for now.
2007-03-02 11:53:31 -08:00
Eric Anholt 5a73624b9b Fix a crash when an ARGB cursor allocation had failed. 2007-03-02 11:03:16 -08:00
Nian Wu 7ba80cc3a5 Merge branch 'modesetting' of git://proxy01.pd.intel.com:9419/git/xorg/driver/xf86-video-intel into crestline 2007-03-02 09:01:46 -05:00
Eric Anholt d5df52be59 Actually add the files for reg_dumper. 2007-03-01 08:35:13 -08:00
Nian Wu 9796cb7ac4 Merge branch 'modesetting' of git://proxy01.pd.intel.com:9419/git/xorg/driver/xf86-video-intel into crestline 2007-03-01 09:02:22 -05:00
Eric Anholt 1f5d1666c8 Add a non-installed command line tool using libpciaccess to dump registers.
This reuses the i830_debug.c code, so we can run that from the console or from
the BIOS-based X server to debug some remaining issues.
2007-02-28 16:27:55 -08:00
Eric Anholt cd1d4b398e Many fixes to mode_get, mode_set, clock limits, and register dumps on i855.
This should fix a number of issues with i855s, particularly with integrated
LVDS panels.
2007-02-28 10:10:03 -08:00
Michel Dänzer 36cad3fcb6 Update vblank pipe setup when setting a mode. 2007-02-28 17:52:42 +01:00
Michel Dänzer b5316fb262 I830DRIClipNotify: Fix initialization of crtcBox[1].[xy]2. 2007-02-28 17:50:56 +01:00
Nian Wu 42deb1e10f Merge branch 'modesetting' of git://proxy01.pd.intel.com:9419/git/xorg/driver/xf86-video-intel into crestline 2007-02-28 09:00:24 -05:00
Nian Wu 76aac38265 Merge branch 'modesetting' of git://proxy01.pd.intel.com:9419/git/xorg/driver/xf86-video-intel into crestline 2007-02-27 14:42:42 -05:00
Wang Zhenyu 3e8e75e5d8 Revert "EXA: enlarge 965 exa state buffer size"
This reverts commit 1ac83f51ee.
oops, current exa state + kernel program size + scratch space
is actually ~36KB.
2007-02-27 16:48:48 +08:00
Wang Zhenyu 1ac83f51ee EXA: enlarge 965 exa state buffer size
Origin size seems break all render, be sure to assign enough
mem. 80k works fine for me.
2007-02-27 13:58:47 +08:00
Wang Zhenyu acd9f3e28f Fix typo when assign overlay reg mem pointer 2007-02-27 13:56:31 +08:00
Eric Anholt 5b765065c0 Consolidate shared structure allocation to the start of ScreenInit.
Previously, the structures would get allocated unnecessarily once, and
wouldn't get reallocated in time at server regen.
2007-02-26 17:25:57 -08:00
Eric Anholt 6ed28c5aa3 Fix XV issues on 965 after the allocation rework 2007-02-26 17:12:44 -08:00
Eric Anholt 36bfeb890a Move the initial EnterVT to after we've set up acceleration.
This fixes a crash with initial rotation and EXA due to EXA not being
initialized in time for the shadow pixmap setup.
2007-02-26 16:58:33 -08:00
Eric Anholt 732885c08d Bug #9604: Align the sizes of allocations to page increments as well.
Without this, the 965 DRI driver fell over when pitch * height wasn't
page-size aligned.  Since the allocator only allocates at page-aligned offsets
anyway this shouldn't hurt us at all.
2007-02-26 15:04:56 -08:00
Eric Anholt 0bfaeaab28 Fix physical memory allocations, including description in log. 2007-02-26 11:11:56 -08:00
Eric Anholt 5732dd7221 Fix some texture memory allocation issues. 2007-02-26 09:54:04 -08:00
Eric Anholt aeeae1b40f Fix a crash in startup monitor detect. 2007-02-26 09:13:17 -08:00
Zou Nan hai 10655c4674 for merge with external tree 2007-02-26 09:23:14 +08:00
Zou Nan hai 9417af8630 fix conflict with external branch 2007-02-26 08:02:50 +08:00
Nian Wu 42fc06c85a Merge branch 'modesetting' of git://proxy01.pd.intel.com:9419/git/xorg/driver/xf86-video-intel into crestline 2007-02-25 12:53:47 -08:00
Eric Anholt 84a7429730 Always allocate logical_context, since we use it in emitting invariants. 2007-02-23 14:59:24 -08:00
Eric Anholt 7bb725dee9 Improve logging of memory allocation passes, and clean the code up a bit. 2007-02-23 14:56:58 -08:00
Eric Anholt 54198b26e8 Move memory allocation to ScreenInit rather than PreInit.
This lets us do memory allocation just once rather than having several passes
(as long as things succeed), avoids trouble with zaphod mode, and will let us
do better automatic sizing of allocations soon.
2007-02-23 14:17:07 -08:00
Eric Anholt 828deff645 Fix fence allocations on 965. 2007-02-23 13:18:50 -08:00
Eric Anholt d3ac440e12 Rework the video memory allocation.
The previous allocator worked in multiple passes, with (at least) one of
setting up allocations, another to attempt to adjust those for tiling, and
then a pass to set up the offsets and fix them in memory.

The new allocator is simpler, allocating memory immediately if possible,
setting up tiling up front, and choosing offsets immediately.  AGP memory
is only allocated to back actual memory used, saving some memory that would
have been allocated for padding previous. It will also allow dynamic freeing
and reallocation of memory, which will be useful for framebuffer resizing.
2007-02-23 12:50:49 -08:00
Eric Anholt a61a6b1db6 Reformat to 4-space indents, no trailing whitespace, and 80 columns.
I'm in the process of rewriting this file, and wanted to separate my whitespace
changes.
2007-02-22 17:56:19 -08:00
Keith Packard dd24d2a082 Remove copied X server headers from driver.
These two headers were copied during mode setting development; as that code
is now inside the server, these files are no longer needed here.
2007-02-22 11:46:44 -08:00
Keith Packard 681966ce65 Disable unused functions after configuring the remaining resources.
This eliminates an unsightly flash of the hardware cursor during X server
startup.
2007-02-22 11:45:43 -08:00
Michel Dänzer f5ab9e0ad3 I830DRISwapContext: Some cleanups.
Also call I830EmitFlush() when entering/leaving the server context. Doesn't
seem to help for artifacts with page flipping and mixed 2D/3D unfortunately.
2007-02-22 18:57:23 +01:00
Michel Dänzer 8cce74f195 Do not sync DRI windows between pages when possible. 2007-02-22 18:27:59 +01:00
Michel Dänzer f346549183 intel.man: Fix typo. 2007-02-21 09:19:54 +01:00
Keith Packard 3bce8bf0e9 Pre-965 hardware had fixed pipe 1 for panel fitter.
The pipe mode setting code needs to disable the panel fitter when using the
pipe for things other than LVDS output. The driver was checking for panel
fitter conflicts using bits that the 965 chipset defines for selecting which
pipe the panel fitter is connected to. However, on pre-965 hardware, the
panel fitter works only with pipe 1 and those bits returned 0.

The result was that when pipe 1 was using the panel fitter, configuring pipe
0 would disable the panel fitter.

The fix provided uses a model-specific test for the panel fitter pipe.
2007-02-20 23:10:17 -08:00
Michel Dänzer 0bee64f4bc Add support for triple buffering using a third static buffer.
Need to bump the DRI DDX version minor for the added SAREA fields.
2007-02-20 19:09:37 +01:00
Michel Dänzer 2212baa845 Don't mark page flipping as active when it really isn't. 2007-02-20 18:39:13 +01:00
Michel Dänzer fac8f2eb49 Document Option "PageFlip". 2007-02-20 18:38:40 +01:00
Keith Packard 5a1a04649c Make distcheck fixes. Distribute all sources needed even for older servers.
Always allow (but do not require) link to server sources so that needed
files can be included in the generated tar files.

Add remaining .g4a files and assembly output to distributed file lists.
2007-02-17 17:01:04 -08:00
Keith Packard 0ca926e63c Check for presence of xf86Modes.h file.
xf86Modes.h file signals the availability of the new modes API in the
server; use that instead of counting on X server version numbers.
Also, finish eliminating use of local copies of those header files.
2007-02-16 02:19:10 -08:00
Keith Packard 972f1109d2 Remove common code that has moved to xserver/hw/xfree86/modes 2007-02-16 01:07:20 -08:00
Keith Packard 20e146a09e Change rotation pixmap creation API to permit start-time rotation.
Start time rotation requires that the pixmap be created after the server has
initialized the screens. Delay the pixmap creation until the first block
handler invocation.
2007-02-16 00:57:44 -08:00
Keith Packard 17e38e39a4 Enable mode setting function renames from shared code. 2007-02-15 23:09:43 -08:00