Commit Graph

868 Commits

Author SHA1 Message Date
Wang Zhenyu 89a42d489b [PATCH] shut up warning
Signed-off-by: Keith Packard <keithp@neko.keithp.com>
2007-01-06 14:37:31 -08:00
Wang Zhenyu 01bfa4fa6f [PATCH] fix alpha blending state
Signed-off-by: Keith Packard <keithp@neko.keithp.com>
2007-01-06 14:37:30 -08:00
Wang Zhenyu 79018bb47c [PATCH] Add in sf/wm program for mask picture without CA
Signed-off-by: Keith Packard <keithp@neko.keithp.com>
2007-01-06 14:37:30 -08:00
Wang Zhenyu a5b9b43846 [PATCH] misc cleanup for G965 vs/sf/wm states
Signed-off-by: Keith Packard <keithp@neko.keithp.com>
2007-01-06 14:37:30 -08:00
Wang Zhenyu b7c1e1656f [PATCH] WM kernel needs scratch space
Signed-off-by: Keith Packard <keithp@neko.keithp.com>
2007-01-06 14:37:30 -08:00
Wang Zhenyu db9cfaa35a [PATCH] Setup default border color for our samplers
Signed-off-by: Keith Packard <keithp@neko.keithp.com>
2007-01-06 14:37:30 -08:00
Wang Zhenyu 70276e4e9a [PATCH] fix vertex buffer size
Signed-off-by: Keith Packard <keithp@neko.keithp.com>
2007-01-06 14:37:30 -08:00
Wang Zhenyu e8a4cbdeff [PATCH] clean up issue cmd to ring buffer
Make it easy to track different part of ring state, and
use rectlist primitive instead.

Signed-off-by: Keith Packard <keithp@neko.keithp.com>
2007-01-06 14:37:30 -08:00
Wang Zhenyu 42534474fd [PATCH] remove wrong scale_units
Signed-off-by: Keith Packard <keithp@neko.keithp.com>
2007-01-06 14:37:30 -08:00
Wang Zhenyu 05e8a7989d [PATCH] Rename exa sf/wm program files
Also fix some minors in wm program.

Signed-off-by: Keith Packard <keithp@neko.keithp.com>
2007-01-06 14:37:30 -08:00
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
Wang Zhenyu f9c3ef4010 [PATCH] Mark current ps kernel is experimential with little test.
Signed-off-by: Keith Packard <keithp@neko.keithp.com>
2007-01-03 22:23:54 -08:00
Wang Zhenyu ef2f25e5c6 [PATCH] Use sf_prog.h instead
Signed-off-by: Keith Packard <keithp@neko.keithp.com>
2007-01-03 22:23:52 -08:00
Wang Zhenyu ca608028c5 [PATCH] Fix picture's transform checking
Signed-off-by: Keith Packard <keithp@neko.keithp.com>
2007-01-03 22:23:50 -08:00
Wang Zhenyu 848368d5d0 [PATCH] Fallback in mask picture for now
Do it later after finish wm kernel program.

Signed-off-by: Keith Packard <keithp@neko.keithp.com>
2007-01-03 22:23:48 -08:00
Wang Zhenyu df23624eeb [PATCH] Fix compile, add wm header file.
Signed-off-by: Keith Packard <keithp@neko.keithp.com>
2007-01-03 22:23:44 -08:00
Wang Zhenyu fc944859b1 [PATCH] Add simplest wm kernel program for no mask picture composite
This is a try to use new gen4asm language, and will finish
composite program for mask picture with or without CA case later.

Signed-off-by: Keith Packard <keithp@neko.keithp.com>
2007-01-03 22:23:41 -08:00
Wang Zhenyu acdc2da77b [PATCH] Add mask sampler state
Signed-off-by: Keith Packard <keithp@neko.keithp.com>
2007-01-03 22:23:39 -08:00
Wang Zhenyu 926d7fb09a [PATCH] change some src sampler states
sampler for mask should also be set up, and fix
default border texel.

Signed-off-by: Keith Packard <keithp@neko.keithp.com>
2007-01-03 22:23:33 -08:00
Wang Zhenyu ed73bbaf5c [PATCH] Add file for i965 exa composite
This does not include ps program, which will be added
in g4a form.

Signed-off-by: Keith Packard <keithp@neko.keithp.com>
2007-01-03 22:23:27 -08:00
Keith Packard 5a793b0dcf Merge branch 'modesetting-origin' into modesetting 2007-01-03 21:54:05 -08:00
Keith Packard f188525030 Add interlace defines for pipeconf regs 2007-01-03 21:53:07 -08:00
Eric Anholt 394124ceaa Add per-CRTC gamma control support for RandR.
This makes the CRTCs now always run in gamma-enabled mode, rather than having
flaky logic for switching modes.  Also, it should clear up issues with the LUTs
being uninitialized when outputs are first brought up.
2007-01-03 09:56:19 -08:00
Keith Packard 69f250af60 Merge branch 'modesetting-origin' into modesetting 2007-01-03 00:39:15 -08:00
Keith Packard 232e209432 Allow initial position to be set in config file. Increase 965 max size.
Add relative and absolute position configuration code, using per-output
monitor sections. Options include:

	PreferredMode	selects a preferred mode for this output by name
	Position	absolute position, x and y in a single string.

	Below		relative positions; argument names other monitor.
	RightOf
	Above
	LeftOf

	Enable		force the monitor to be disabled by setting
	Disable		enable to no or disable to yes.

	MinClock	Set valid clock ranges
	MaxClock

Monitor sections can also include sync ranges, physical size and mode lines
as documented in xorg.conf(5).

Monitors are associated with outputs through options in the Device section:

	Option "monitor-VGA" "My VGA Monitor"

Output named 'VGA' will use monitor section "My VGA Monitor".
2007-01-03 00:38:34 -08:00
Keith Packard 58e797b2ca Sync dspbase/dspsurf registers by re-reading them.
This seems to eliminate base/surf value confusion during EnterVT.
2007-01-03 00:04:58 -08:00
Jesse Barnes d960deab39 Various sparse cleanups:
NULL vs. 0
    remove redundant pScrn in I830DRISwapContext
    make I830DRISwapContext static
2007-01-02 20:23:37 -08:00
Dave Airlie 5057769d3a Use correct variable to initialize DVO I2C bus.
intel_output->pI2CBus isn't initialized until the output is all happy and
running, so using it before that is rather unlikely to do much good.
2007-01-02 19:25:08 -08:00
Keith Packard 2bb9bb951e Typo disabled new DRI MM on all chips.
Detection for new DRI MM wasn't converted to #define correctly because of a
typo.
2007-01-02 14:04:10 -08:00
Keith Packard 5080307230 Fix driver to build on RandR 1.2 systems again.
Changes to move initial config code to RandR 1.1/1.2 common path broke
code required only for RandR 1.2.
2007-01-02 00:16:41 -08:00
Keith Packard 237847007a Make driver build and run on Xorg 7.1. Delay DSP*BASE setting until last.
Autodetect libdrm version, disable new memory manager on older libraries.
Move new M_T_ defines from i830.h to i830_xf86Crtc.h. Add many system
headers to define functions. Use i830PipeSetBase at end of mode setting
code to set DSP*BASE and flush changes. Don't duplicate PipeSetBase call
from screen init function. Make initial RandR configuration code usable on
older versions of extension so the server doesn't start in a panning mode.
Use xfree instead of free in i830_tv.c.
2007-01-02 00:09:35 -08:00
Keith Packard 25d5a89231 Elide identical modes from reported list.
Where two modes would produce precisely the same crtc settings and have the
same name, remove the latter mode from the mode list.
2006-12-31 15:39:20 -08:00
Keith Packard feeefc92e4 Replace author-specific license with generic license.
This file retained the old MIT license with the embedded author name.
Replace that with the version that uses generic 'copyright holders' instead.
2006-12-31 14:22:53 -08:00
Keith Packard 5e456251f0 Replace author-specific license with generic license.
This file retained the old MIT license with the embedded author name.
Replace that with the version that uses generic 'copyright holders' instead.
2006-12-31 14:21:12 -08:00
Keith Packard 2330b341c9 Prune default modes to EDID clock limit.
Pick out the EDID max clock value and use that to elide default modes which
are too fast.
2006-12-30 22:47:58 -08:00
Keith Packard c70e7bc701 Merge branch 'modesetting-origin' into modesetting 2006-12-30 21:58:36 -08:00
Keith Packard 8b6c456e16 Detect in ProbeModes. Let get_modes set edid. Prune interlace/dblscan.
Move output connection status detection from RandR code up to ProbeModes so
it is done before mode sets are built. Otherwise, the mode building code
will elide all modes the first time through as it ignores outputs that are
disconnected.

Most get_modes functions fetch EDID data; make sure that any
EDID changes are used in the ProbeModes filtering of default modes.
Otherwise, stale EDID data will be used.

Allow outputs to advertise support for interlaced and double scan modes;
prune such modes from the default mode list when outputs do not support them.
2006-12-30 21:57:42 -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
Keith Packard b8692e6462 Lack of configured monitor implies no configured modes.
Missing check for missing monitor configuration would result in segfault.
2006-12-28 22:23:16 -08:00
Keith Packard 973da65421 Sync ranges from EDID/default should not limit configured modelines.
Limit the effect of sync ranges so that sync ranges found via EDID will not
eliminate modes explicitly added by the user. Limit default sync range to
eliminating only default modes, not configured or EDID modes.
2006-12-28 22:22:22 -08:00
Keith Packard f7b1d4c1f7 Belinea 10 15 55 monitor quirk - override preferred mode with largest @60Hz
Belinea 10 15 55 model monitor reports a preferred mode of 640x350, when in
fact it wants a 1024x768 mode @ 60Hz. Add an edid quirk that selects the
largest size mode, preferring those closer to 60hz among equal sized modes.
2006-12-28 22:18:57 -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
Keith Packard 4cc5dcf6d7 Oops, dont use symlinks for stolen xf86 header files 2006-12-28 16:43:39 -08:00
Keith Packard 86da0d05e4 Add stolen xf86 header files to driver source 2006-12-28 16:40:54 -08:00
Keith Packard 2b0a997e5b Merge branch 'modesetting-origin' into modesetting 2006-12-28 16:34:38 -08:00
Keith Packard bb238a8fc2 Configuration support: per-output mode lines, preferred mode.
Add the modelines specified in the per-output monitor and all of the default
modes to the list to each output. Prune the resulting list to specified sync
limits and virtual sizes. Sort the resulting mode list on
preferred/size/refresh.
2006-12-28 16:27:22 -08:00
Eric Anholt 9cfbf1ceda In EXA mode, force backing pixmaps into memory when doing XV to them. 2006-12-28 12:59:37 -08:00
Eric Anholt e889bde13d Draw textured video to the backing pixmap in the composited case.
Currently, when the backing pixmap is not in framebuffer, we just BadAlloc
rather than drawing garbage to the front buffer.  This can be fixed with EXA.
2006-12-28 12:49:24 -08:00
Eric Anholt c7083a6f30 Add WIP CH7017 LVDS driver. This is disconnected because it's untested. 2006-12-28 12:16:48 -08:00
Eric Anholt 778db49616 Add WIP IVCH (i82807aa) driver.
It is not currently hooked up as it hasn't been tested.  The hardware that this
was written for decided to stop working.
2006-12-28 11:45:52 -08:00