300e893cec
Merge branch 'crestline' of git://otc-graphics.jf.intel.com/git/xorg/driver/xf86-video-intel into crestline
2007-03-21 08:55:50 +08:00
0202399866
Whitespace and symbolic reg names cleanup in i830_panel_fitter_pipe().
2007-03-21 00:01:08 -07:00
3e9ec78b4f
Set the panel fitter to the right pipe on Crestline.
2007-03-20 23:58:48 -07:00
a500096041
Merge branch 'master' into crestline
...
Conflicts:
src/i810_reg.h
src/i830_display.c
2007-03-20 23:32:19 -07:00
223944878c
Attempt to fix single/dual-channel issues on i9xx LVDS panels.
...
- Use the existing single/dual-channel state when available, as changing it
doesn't appear to work out.
- Set the power state of the CLKB and B0-B3 pairs according to whether
choose to go dual-channel or not.
- Restore the LVDS register at the appropriate point (before DPLLs are
re-programmed.
2007-03-20 14:33:53 -07:00
96e86994f3
Merge branch 'crestline' of git://otc-graphics.jf.intel.com/git/xorg/driver/xf86-video-intel into crestline
2007-03-20 13:11:09 +08:00
0a612e7115
Merge branch 'master' of git://proxy.ims.intel.com:9419/git/xorg/driver/xf86-video-intel into crestline
...
Conflicts:
src/i830_display.c
Change LVDS output and postread like upstream. This might
need to be retested on 965GM LVDS.
2007-03-20 11:34:40 +08:00
4c4faf260e
Set the CURSOR_SIZE register when present.
...
Failure to do so gets you a lot of pretty colors.
2007-03-19 13:36:37 -07:00
64c1420445
Print the mode actually being set per pipe.
2007-03-19 13:35:43 -07:00
3ce802414a
Add debug output for ADPA.
2007-03-19 11:35:11 -07:00
c21b88d838
Fix build when DAMAGE is not defined.
2007-03-19 10:45:58 +01:00
991719c21a
Make i830_sdvo_write_sdvox write everything twice.
...
For some reason, certain chips don't correctly enable the SDVO hardware when
this register is written only once. We're following what the BIOS code does
and writing it twice now, but with extra posting reads to boot. Yes, this is
cult-and-paste, but it fixes problems found on deployed hardware.
2007-03-18 23:05:33 -07:00
9118122a23
Allocate 4 separate buffers for HW Cursors on Linux.
...
Linux cannot allocate a large fixed buffer for the HW cursors as needed for
FreeBSD; instead, allocate four separate buffers. The code now prefers to
allocate one buffer (less overhead) and falls back to separate buffers only
when necessary.
2007-03-17 21:34:03 -07:00
62a5399d70
Elide I830DRIClipNotify for older DRI versions.
...
I830DRIClipNotify is passed to newer versions of DRI; don't include it in
the server when building against older versions.
2007-03-17 21:32:36 -07:00
05e0021147
Cast ARGB cursor address to CARD32 * to eliminate warning.
...
While we're just doing a memcpy, it's nice for the two argument types to
match.
2007-03-17 21:31:04 -07:00
d05bb5362e
Increase DDC I2C RiseFallTime to handle older monitors
...
Changing this value slows the entire I2C bus down, making it far more
reliable on older monitors. Note the same change has been made in the core X
server code; this change is included here to ensure that older X servers
work reliably with this driver.
2007-03-17 20:21:59 -07:00
44d1b544ce
Build fix for pre-XF86DRI_MM environments.
...
Misplaced brace broke builds with older DRM libraries.
2007-03-17 17:20:30 -07:00
a58befe9d2
Remove extra (and incorrect) I2C ByteTimeout setting.
...
Setting the value correctly and then immediately breaking it caused many I2C
transactions to timeout with slow monitors. Oops.
2007-03-17 17:20:30 -07:00
9d6d9ace4b
Move vendor ID check in the utils to after pci_device_probe.
...
Even current libpciaccess seems to require this.
2007-03-16 19:41:54 -07:00
a117bc9e3e
Add the (afaict) correct ch7017 I2C slave address.
2007-03-16 19:39:53 -07:00
29446cdb4f
Fix compile failure due to needed types being in inttypes.h on Linux.
2007-03-16 19:18:37 -07:00
213394fbaa
Fix crashes and other failures when a cursor allocation fails.
...
Now, we allocate one single block of memory for cursors, and either succeed or
fail once, rather than trying to support partial fallback modes that generally
resulted in pain due to being untested. In particular, this fixes cursors on
FreeBSD, which only allowed one large physically-contiguous allocation.
2007-03-15 19:13:28 -07:00
316ee682d3
Don't reload the cursors if we haven't set up the screen yet.
...
This avoids a crash during preinit if we set a mode for load detecting.
2007-03-15 18:53:55 -07:00
8b06ab50bb
Fix sparse warnings about using 0 for NULL.
2007-03-15 16:02:36 -07:00
8ae6ad9332
Use new driver-independent CRTC-based cursor layer.
...
This eliminates all of the cursor rotation code and other cursor management
infrastructure, leaving a fairly simple hardware layer in its place.
2007-03-15 00:01:39 -07:00
9fbef2de9e
Bump to 1.9.92 for RC2.
2007-03-14 12:34:34 -07:00
555b801a75
Make sure the legacy texture area is there when needed.
...
This currently only matters when the DRM memory manager is not available and
Option "Legacy3D" "off" is specified, but that hasn't always been the case and
might change again in the future.
2007-03-14 11:41:50 +01:00
66fdb08c83
Refine the i855 LVDS clock code. In particular, p2 is always 14.
...
This gets correct clocks detected on most harware. The SSC is always assumed
to be 66Mhz, which may not be true, but we'll fix that when we find example
hardware.
2007-03-13 17:07:10 -07:00
44708bdd9e
Get SDVO DPMS working on the Mac Mini by writing SDVOB and SDVOC together.
...
Also, add code for setting the encoder power state like the BIOS does, but this
doesn't appear to work. We do much more than the BIOS does in powering things
down, so perhaps that's interfering somehow.
2007-03-13 16:59:38 -07:00
5135b3a79f
Use a POSTING_READ(reg) macro instead of using the (void)INREG(reg) pattern.
2007-03-13 16:59:38 -07:00
578da7ca70
Add PCI write posting protection to i2c putbits.
2007-03-13 16:59:38 -07:00
cf33abe43b
Add write posting protection for the SDVO DPMS-on path.
2007-03-13 16:59:38 -07:00
9d30f00072
Replace #if 0ed LVDS register setting with updated comment.
2007-03-13 16:59:38 -07:00
9c17c6e9c6
Add write posting protections to relevant register writes in the mode-set path.
2007-03-13 16:59:38 -07:00
2824ec7ccb
Fix uninitialized string use in SDVO non-TMDS case.
2007-03-13 16:59:37 -07:00
f465c23750
Merge git://proxy01.pd.intel.com:9419/git/xorg/driver/xf86-video-intel into crestline
2007-03-13 17:00:44 +08:00
1ed3843f73
Make the 965 use Y-major tiling for the depth buffer, as required by the spec.
...
An example of the failure can be seen with the reflect demo when set to
depth buffer mode.
Reported by: Haihao Xiang <haihao.xiang@intel.com>
2007-03-12 17:47:32 -07:00
7aa2571546
Fix build against released libdrm.
2007-03-12 19:00:14 +01:00
7c561956a2
Defer flipping pages back to normal until the end of the DRI block handler.
...
Doing it earlier can result in the wrong page being visible, giving the
appearance of a frozen X server.
2007-03-12 18:55:27 +01:00
fe59ab9f56
Disable page flipping if the DRM is older than 1.9.
...
Older versions don't support the functionality we need.
2007-03-12 13:03:47 +01:00
ba55ff15df
Fix attempt to flip pages back to normal when the last 3D window disappears.
...
When this succeeds, 2D rendering does not have to be synchronized to back
buffers until the next 3D window appears.
2007-03-12 13:01:00 +01:00
c4a23c5ef8
Remove unused have3DWindows from pI830.
2007-03-12 10:59:21 +01:00
d33e8daa68
Merge git://proxy01.pd.intel.com:9419/git/xorg/driver/xf86-video-intel into crestline
2007-03-12 09:03:52 +08:00
797aa6fcb1
fixup missing assert includes
2007-03-11 12:58:50 +11:00
43a80ef909
fixup brace alignment for older X.org
2007-03-11 12:58:26 +11:00
0d33fd3d03
add XMODES flags to the i2c drivers
2007-03-11 12:58:02 +11:00
3c2d6e07bd
Don't crash when the SAREA pointer is NULL.
2007-03-09 23:49:46 +01:00
7518b8959e
Revert change accidentally included in previous commit.
2007-03-09 19:50:03 +01:00
1991a90ae9
Update SAREA pipe sizes in i830_crtc_dpms instead of i830PipeSetBase.
...
This allows setting the size to 0 when a pipe gets disabled.
2007-03-09 19:47:13 +01:00
aef1618530
Merge remote branch 'origin/master' into i830-pageflip
2007-03-09 15:14:48 +01:00
Nian Wu
Eric Anholt
Wang Zhenyu
Michel Dänzer
Keith Packard
Keith Packard
Dave Airlie