Commit Graph

1801 Commits

Author SHA1 Message Date
Wang Zhenyu 4737955a62 move i830 default coord set into I830EmitInvarientState 2006-07-21 01:02:38 +08:00
Wang Zhenyu a7e30bb051 Take from i915, blend ctl code cleanup. 2006-07-21 00:56:58 +08:00
Wang Zhenyu ac34a37cb6 Take instruction fixes into i830, with indent changes. 2006-07-21 00:52:59 +08:00
Wang Zhenyu 3e86bf4273 remove i915 default ctx setup. 2006-07-20 13:43:27 +08:00
Wang Zhenyu 5c945bf9eb Revert "Fix several size error with STATE3D_LOAD_STATE_IMMEDIATE cmd."
This reverts commit 433cb6ba82.
2006-07-20 13:40:39 +08:00
Eric Anholt d5243d1b35 The height and width of texture maps are one more than the programmed values. 2006-07-19 19:27:53 -04:00
Eric Anholt 13e372c209 Fix the texture map pitch setting as documented, and as used by the 3d driver. 2006-07-19 17:25:10 -04:00
Eric Anholt da5efb09d5 Fix the alignment padding fix (didn't bump BEGIN_LP_RING count). 2006-07-19 16:36:52 -04:00
Eric Anholt 36aa43bf73 Force texture alpha channels to 1 if not present. 2006-07-19 16:22:46 -04:00
Eric Anholt adce6bd0fc Add a trailing MI_NOOP to frag shader output for alignment if necessary. 2006-07-19 16:21:49 -04:00
Eric Anholt 4e409ea441 The map bits per pixel must come from the drawable, not the visible screen. 2006-07-19 15:57:09 -04:00
Eric Anholt 449e4be503 Correct the DWORD count of several 3D instructions. 2006-07-19 13:34:06 -04:00
Eric Anholt f1b62d890c Replace hand register setting with new i915 fragmet program API. 2006-07-19 13:02:24 -04:00
Eric Anholt 76a316d0ce Merge branch 'master' into exa
Conflicts:

	src/Makefile.am
2006-07-19 12:31:36 -04:00
Eric Anholt baf65ce98a Re-convert i915 video to new fragment shader API.
Although in the history of this branch it had happened before, this time it's
for real.
2006-07-18 19:47:45 -04:00
Eric Anholt bb81e8d6c7 Merge branch 'master' into textured-video
This moves the i915 textured video implementation into i915_video.c to avoid
conflicts in register definitions with i830_reg.h when we use i915_reg.h.
This also means that i810_reg.h's i915 3D regs definitions are removed and
replaced with i915_reg.h usage.

Conflicts:

	src/i830_rotate.c
2006-07-18 19:23:21 -04:00
Eric Anholt 84805167ab Convert i915 rotate code to the new fragment program API. 2006-07-18 18:27:10 -04:00
Eric Anholt 5176d62ba5 Add an API for programming i915 fragment programs. 2006-07-18 18:24:28 -04:00
Eric Anholt 148ef9bdd9 Convert magic numbers to symbolic names in i915 rotate code.
This doesn't cover the fragment shader yet, which we need to make a sensible
set of macros for (at least the basic bits).

Reviewed by:	md5
2006-07-18 17:11:34 -04:00
Wang Zhenyu 433cb6ba82 Fix several size error with STATE3D_LOAD_STATE_IMMEDIATE cmd.
Issue texture coord set with proper scale value.
2006-07-18 17:00:50 +08:00
Wang Zhenyu 855a9f13cb fallback in 'repeat' case for now 2006-07-18 10:02:47 +08:00
Keith Packard a6d438ebe3 Disable spread spectrum clock usage.
The spread spectrum clock generator that improves EMI characteristics for
laptop screens lives in an external chip that is programmed over an i2c bus.
Without correct programming, attempts to use this mode for the LVDS can
result in a DC signal being sent to the panel.

Until we find programming information for this external chip, we should
leave this mode disabled.
2006-07-17 14:11:19 -04:00
Alan Hourihane 16d6263e65 whoops, reverse part of that. 2006-07-16 20:39:52 +01:00
Alan Hourihane 2f50f6d1b1 move ContextMem out of XF86DRI 2006-07-16 20:17:38 +01:00
Eric Anholt c7083a2672 Bug #7404: Only save/restore VGA fonts and not other VGA regs.
This fixes a hang on the i945 during restore.  It appears that saving/restoring
the VGA registers is not important, as we're correctly saving/restoring the
registers we touch within the driver anyway.
2006-07-14 14:28:03 -07:00
Eric Anholt 49b8276056 Add a register restore implementation so we don't crash on LeaveVT.
We shouldn't ever need to save/restore the hi/lo frequency regs, as they're
read-only.
2006-07-14 14:26:16 -07:00
Eric Anholt 6a92a77964 Don't try to probe on more pipes than we really have. 2006-07-14 14:20:41 -07:00
Wang Zhenyu 04d1584737 Current exa render implement for i830 and i915, test on
865GM and 915G. There is issue in picture 'repeat' support.
And also stop recursive behavior in I830WaitLpRing to allow
server to abort instead of system hang.
2006-07-14 16:14:18 +08:00
Adam Jackson de470aaf5c In I830xf86SortModes, catch cases where two modes are equal in only one
dimension, by comparing the areas of the modes.  Otherwise, 800x600 would
sort before 1024x600 if it was added later.
2006-07-13 19:10:11 -04:00
Adam Jackson 22843830eb Fix a thinko; would only inject the FP native mode if a mode list was already
found, which is never the case when there's no xorg.conf.
2006-07-13 17:20:17 -04:00
Eric Anholt 05bcbadd13 Avoid NULL dereference if cursor position changes during a mode change. 2006-07-11 14:05:38 -07:00
Eric Anholt b65f18b05a Bug #7443: Respect the user's Modes configuration, and make it more useful.
Now, mode names generated by DDC get names of the form "WIDTHxHEIGHTxREFRESH".
The matching for user Modes lines takes the user Modes as the prefix that
needs to match, rather than an exact string match or "WIDTHxHEIGHT" match.  So
one can, for example, specify "1024x768" to get any old 1024x768, or
1024x768x60 to get one of the modes named 1024x768x60.
2006-07-11 13:30:24 -07:00
Eric Anholt 5a2e04bd1b Fix crash with DDC when there are no user modes to add. 2006-07-11 10:21:51 -07:00
Luká\u0161 Hejtmánek f9499a68da Make gamma settings apply to the cursor as well, and fix clone-mode gamma. 2006-07-11 10:13:18 -07:00
Luká\u0161 Hejtmánek 7068468ac1 Add support for adjusting saturation value of overlay video. 2006-07-11 09:51:26 -07:00
Alan Hourihane b1c2ea6535 whoops, revert some unnecessary changes 2006-07-11 08:13:30 +01:00
Alan Hourihane 8a44a7acfc Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-video-intel 2006-07-11 07:41:27 +01:00
Alan Hourihane 584b544987 Add an additional check before rotating 2006-07-11 07:40:40 +01:00
Eric Anholt b912bf5673 Clean up warnings in sil164 module. 2006-07-10 18:35:20 -07:00
Eric Anholt d75490701c Hook up SiI164 mode setting (just a matter of turning the chip on).
Also adds register dumping in case this turns out to not be enough, and fixes
a couple of prototypes.
2006-07-10 18:21:04 -07:00
Eric Anholt 426d26ea44 Fix prototype for SaveRegs. 2006-07-10 18:19:51 -07:00
Eric Anholt 8d7987d002 Move to 4-space indents in sil164. 2006-07-10 17:53:06 -07:00
Eric Anholt f5a01a2ef0 Make DVO code light up my sil164-based DVI output, when already set up by BIOS. 2006-07-10 17:19:19 -07:00
Eric Anholt 23a0ee73bc Fix modelist with a configured monitor to not begin with all unvalidated modes. 2006-07-10 17:16:18 -07:00
Eric Anholt 48ba9273dd Fix validation when the first mode is thrown out, and print hsync in modelines. 2006-07-10 15:01:51 -07:00
Eric Anholt 3924ffb7d7 Merge branch 'dvo-merge' into modesetting
Conflicts:

	src/i830_driver.c
2006-07-10 12:12:38 -07:00
Eric Anholt f76f94a743 Supply proper NULL-terminated symbol lists to avoid crashing. 2006-07-10 12:04:09 -07:00
Eric Anholt 5a8f6a486d Improve output bus setup to include LVDS setup for pre-i915. 2006-07-08 15:26:19 -07:00
Eric Anholt df333cc9a8 Initial add of DVO support code. Probes my sil164.
This is a mostly-untested merge of airlied's work.  The I2C modules are intended
to be moved into the core server or a separate driver module when they're
functional and we're happy with the API.
2006-07-07 13:41:33 -07:00
Eric Anholt e1064f52b0 Don't try to probe modes on an SDVO device with NULL sdvo_drv. 2006-07-05 16:00:03 -07:00