Commit Graph

1042 Commits

Author SHA1 Message Date
Michel Dänzer 1b54ee493f Merge remote branch 'origin/master' into i830-pageflip
Conflicts:

	src/i830_dri.c
2007-03-09 15:13:50 +01:00
Keith Packard 81722a21d2 Remove usage of 'shadow' module. Use xf86CrtcScreenInit.
With the new mode setting code, rotation is handled outside of the driver,
so the old usage of the 'shadow' module is no longer needed. Code to
initialize the crtc structures has been moved out of the driver and into the
modes code.
2007-03-06 23:17:55 -08:00
Eric Anholt 04f50961e2 Bug #9898: Fix a crash with NoAccel set. 2007-03-06 14:23:06 -08:00
Eric Anholt b07dfbba5d Remove leftover code that was disabling tiling after we set it up. 2007-03-06 13:59:14 -08:00
Eric Anholt 94c37f3587 Make the depth buffer X tiled instead of Y, and fix a Y tiling nit on 945.
The previous code claimed to set the depth buffer up as Y tiled, but due to
lack of implementation in SetFence, it ended up being X tiled.  Actually
setting the Y tiling flag in the new version broke the depth buffer, so just
switch the depth buffer to X tiling, which appears to work fine.
2007-03-06 13:57:31 -08:00
Eric Anholt 30bb719ca0 Continue to allocate the legacy texture pool by default.
This is a partial revert of 7358642e64

If we don't allocate it now, when the DRM version is too low there won't be any
memory allocated and DRI will fail.  Instead, waste the memory in the i915tex
case for now, and leave fixing it right (check DRM version up front and decide
which memory manager to set up) to later.
2007-03-06 12:23:43 -08:00
Michel Dänzer e972265261 Fix build failure.
Not sure how I missed this before... Thanks to Todd Merrill for reporting.
2007-03-06 16:54:16 +01:00
Michel Dänzer 1e1b45fa6e Fix reduced DRI memory manager size.
pI830->mmSize is in kB.
2007-03-06 10:28:41 +01:00
Michel Dänzer 3c08bc7d69 Fix some conditionals related to triple buffering.
Guard code that dereferences pI830->third_buffer with tests for that instead of
pI830->TripleBuffer. It could happen that we want to enable triple buffering
but (temporarily) can't because the third buffer couldn't be allocated.
2007-03-06 10:14:47 +01:00
Michel Dänzer c25cfafbe1 Unify allocation of back buffers. 2007-03-06 10:00:12 +01:00
Michel Dänzer e787d7b698 Remove warnings about potential artifacts with page flipping and mixed 2D/3D.
The artifacts only seemed to occur when EXA was falling back to software for
the front buffer.
2007-03-06 09:35:42 +01:00
Michel Dänzer 6c299aea8e Merge remote branch 'origin/master' into i830-pageflip
Conflicts:

	src/i830_display.c
	src/i830_driver.c
2007-03-06 09:28:52 +01:00
Keith Packard 4042b27f01 Move EnterVT mode setting code to xf86SetDesiredModes.
Make the application of crtc desiredModes generic code instead of
per-driver by creating xf86SetDesiredModes from the code that was in EnterVT
and calling it.

Also, move the frame buffer clear until just before mode setting to make
sure things are mapped correctly.
2007-03-05 22:34:13 -08:00
Wang Zhenyu 55ee46aebb Merge branch 'master' of git://proxy.ims.intel.com:9419/git/xorg/driver/xf86-video-intel 2007-03-06 12:45:08 +08:00
Wang Zhenyu 5c720147e2 EXA: try to always alloc exa i965 state buffer in stolen mem
I think this is a safe way to work around any possible chip
error.
2007-03-06 12:44:04 +08:00
Keith Packard 50aa09425f Merge branch 'modesetting' 2007-03-05 11:28:46 -08:00
Keith Packard c2c62559e7 Move single mode setting code to X server.
Code to drive the global configuration from a single mode setting operation
(from RandR 1.1, XFree86-VidModeExtension or XFree86-DGA) has been included
in the X server now, so remove it from this driver.
2007-03-05 10:37:03 -08:00
Michel Dänzer 330815251d Merge remote branch 'origin/master' into i830-pageflip
Conflicts:

	src/i830.h
	src/i830_dri.c
	src/i830_dri.h
	src/i830_driver.c
	src/i830_memory.c
	src/i830_xaa.c
2007-03-05 13:05:20 +01:00
Michel Dänzer d717d9d566 Fix DRM memory manager initialization.
It takes the offset and size in pages, not bytes.
2007-03-05 12:57:21 +01:00
Michel Dänzer 7358642e64 Fix handling of new vs. old texture pools.
Only one of them can be active.
2007-03-05 12:06:51 +01:00
Michel Dänzer 50ba1fff88 Be more verbose when page flipping can't be enabled for various reasons. 2007-03-05 10:22:07 +01:00
Eric Anholt 015027034e Merge branch 'modesetting'
Conflicts:

	configure.ac
	src/i830_driver.c
	src/i830_modes.c
	src/i830_video.c
2007-03-04 22:06:32 -08:00
Keith Packard af565872a4 Set version number to 2.0 RC1 (1.9.91). 2007-03-04 21:20:33 -08:00
Keith Packard bc20b54c34 Support new CRTC/Output prepare/commit hooks.
New hooks replace explicit invocation of DPMS functions to manage mode
setting sequencing.
2007-03-04 19:36:32 -08:00
Eric Anholt b27fa2c257 Fix a crash with XAA and DRI disabled after the allocation rework. 2007-03-04 17:18:48 -08:00
Eric Anholt fc7d43c2b6 Use -f for ln of server source. Otherwise, changing paths didn't take effect. 2007-03-04 17:18:48 -08:00
Eric Anholt b7b6063e62 Add a little BIOS dumper program.
This isn't actually tested yet as libpciaccess doesn't do rom access on
non-linux yet.
2007-03-04 17:18:48 -08:00
Keith Packard 6aeb855b9d Shadow pixmaps use fixed offset of 0.
Shadow pixmap contents are copied from the main frame buffer and contain
only the bits displayed by the crtc, not the whole frame buffer. The crtc
origin is always interpreted by the shadow copying code, the frame buffer
itself doesn't move.
2007-03-04 17:11:40 -08:00
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
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
Eric Anholt d5df52be59 Actually add the files for reg_dumper. 2007-03-01 08:35:13 -08: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
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
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