Commit Graph

3440 Commits

Author SHA1 Message Date
Keith his master's voice Packard f5fe700b9a Prepare real SF kernel and fake WM kernel 2006-05-26 13:47:39 -07:00
Keith his master's voice Packard 1549accb6f Scale video source vertices. Allocate space for kernels 2006-05-25 16:10:31 -07:00
Eric Anholt c1c46f882f Merge branch 'master' into modesetting
Conflicts:

	man/.gitignore
2006-05-22 10:42:24 -07:00
Lukáš Hejtmanek 1e2da2450d Replace VBE call to do DPMS with native code, and fix screensaver in clone mode. 2006-05-22 10:37:33 -07:00
Eric Anholt 2a1b3cfccb Use RECTLIST instead of TRIFAN for video so we get horizontal shearing instead
of diagonal.  Also remove the unnecessary vertex elements that were being
emitted.
2006-05-22 10:32:13 -07:00
Wang Zhenyu bc42dbe07c fix a typo 2006-05-22 11:22:03 +08:00
Eric Anholt bce209cd3f Put in code for idling accelerator on subsequent cliprects. 2006-05-19 17:13:37 -07:00
Eric Anholt 3640117bd9 Set up the state buffer in framebuffer. 2006-05-19 17:10:04 -07:00
Wang Zhenyu e70d99d51e revert wrong setting for memorySize, which should
be at the range of pI830->Offscreen.
2006-05-19 15:47:19 +08:00
Eric Anholt de06cd70a9 Checkpoint for filling out more 3D state. 2006-05-18 18:27:11 -07:00
Eric Anholt ad7ec6a24b Checkpoint of BW textured video work, filling out vertex submission stuff and
some more other state.
2006-05-18 15:26:28 -07:00
Eric Anholt 291770efc6 Start laying out some of the bits that need to be done for BW textured video.
Headers taken from TG code drop.
2006-05-18 10:43:07 -07:00
Wang Zhenyu b3d79ad9ec oop I830FALLBACK define error 2006-05-18 16:31:40 +08:00
Dave Airlie 1bc2a8f7a2 fixup I830SDVOGetActiveInputs to use return values not args 2006-05-18 16:58:22 +10:00
Wang Zhenyu 33ad959323 Add DEBUG_I830FALLBACK for easier tracking 2006-05-18 11:32:59 +08:00
Wang Zhenyu 52af679c94 Check alignment require in PrepareSolid, noticed by Eric,
as pixmap offset align set is violated in Solid.
2006-05-18 11:31:14 +08:00
Wang Zhenyu fdb52a8c6d Solid planemask in PrepareSolid/Copy might be 0xffffffff
or bits up to the depth. This should save some fallback
case, noticed by Eric.
2006-05-18 11:24:46 +08:00
Eric Anholt bc51d6525a Turn off overlay video on BW until we have stable PCI IDs so we can know whether
the hardware supports overlay.
2006-05-17 13:42:51 -07:00
Dave Airlie f97895efd5 fixup chipid override
This makes the ChipID override work so that we actually override the pci id
that gets used everywhere in the driver.
2006-05-17 14:46:37 +10:00
Wang Zhenyu 011a1c99d4 Fix memorySize to enable offscreen mem manage. 2006-05-17 11:16:00 +08:00
Eric Anholt b0ac5303f3 Merge branch 'textured-video' into broadwater-video
Conflicts:

	src/i830_video.c
2006-05-16 15:21:17 -07:00
Eric Anholt c2cd10e1fb Flag the 3D state as dirty when we draw textured video, which should help
rotation (I have other issues with rotation anyway).
2006-05-16 10:10:33 -07:00
Eric Anholt 63a72e46fa Turn debugging back off. 2006-05-16 10:10:33 -07:00
Eric Anholt 01c043de03 Use linear min/mag blending. 2006-05-16 10:10:32 -07:00
Eric Anholt db3683907d For textured video, disable double buffering and sync before uploading new video
data.  Allows more videos to play simultaneously.
2006-05-16 10:10:32 -07:00
Eric Anholt 29a8e88ed0 Relax the alignment requirements for textured video. 2006-05-16 10:10:32 -07:00
Eric Anholt c9be11459b Enable overlay and/or textured video at runtime according to hardware
capabilities.  Sets up 16 textured-video ports.  Left in one hack (disconnected
but advertised BRIGHTNESS and CONTRAST atoms) which may actually not be
necessary.
2006-05-16 10:10:32 -07:00
Eric Anholt f268979a0c Correct drawing issues with planar formats when top or left != 0, and Y didn't
get its offset.
2006-05-16 10:10:32 -07:00
Eric Anholt b09fd42d70 Fix the planar formats to display correctly in textured mode. Still has issues
with clipping, and some sampling differences between ximagesink and xvimagesink.
2006-05-16 10:10:31 -07:00
Eric Anholt dd48790f46 Divide width by 2 in planar-to-packed conversion loop, since each pass through
the loop writes two source pixels.
2006-05-16 10:10:31 -07:00
Eric Anholt eec5e996ec Merge textured-video-wip to textured-video-planar-full. 2006-05-16 10:10:31 -07:00
Eric Anholt 4154a2f748 Experimental work to use a full pixel shader for planar to YUV conversion, which
also doesn't quite work.
2006-05-16 10:09:26 -07:00
Eric Anholt 3e0a9c9082 Do a separate BEGIN/ADVANCE_LP_RING set in the planar vs packed blocks, so I
can adjust the planar code more easily.
2006-05-16 10:09:26 -07:00
Eric Anholt 3af4a967e7 Add a couple of macros to simplify writing of video pixel shaders. 2006-05-16 10:09:26 -07:00
Eric Anholt 06e62ec521 Commit a WIP implementation of the planar video shader that does the
planar-to-packed conversion for us.  Unfortunately the documentation is unclear,
and I haven't managed to get any implementation of it working correctly.
2006-05-16 10:09:26 -07:00
Eric Anholt b1090a42b2 More magic number reduction in rotation code. 2006-05-16 10:09:26 -07:00
Eric Anholt 3a2d8af214 Add initial textured XV support for i915, which can do YUY2 and UYVY, but fails
on I420 and YV12 currently, doesn't support the composite extension, and should
break XV support on non-i915.
2006-05-16 10:09:25 -07:00
Eric Anholt 66875c1559 Convert magic numbers in i915 rotation 3D state to symbolic names. 2006-05-16 10:09:25 -07:00
Eric Anholt 4c727254da Remove the local, renamed copy of lnx_agp.c. The diff between lnx_agp.c and it
appeared to be removal of bugfixes.
2006-05-12 16:26:58 -07:00
Eric Anholt a115c4b872 Remove the code that changes our behavior based on whether a magic file exists
with magic contents in /tmp (created by some install script).
2006-05-12 16:11:29 -07:00
Eric Anholt 0cb251fadc Do a couple of reverts to get the DRI code building. At this point, the whole
driver builds.
2006-05-12 16:10:02 -07:00
Eric Anholt 78b95386b6 Remove intel_randr.c and stick with the previous code. Broadwater shouldn't be
changing our randr, and the new version didn't compile.
2006-05-12 16:09:40 -07:00
Eric Anholt 2e58aa401d Make the intel_acpi.c code non-modular and make it compile. I think we'll end
up nuking this code anyway, as keithp (and I, as well) disagree about how ACPI
should be handled, but the goal is to compile at the moment.
2006-05-12 15:54:37 -07:00
Eric Anholt 2cd6c8fa23 Revert internal shadow module changes back like master, along with RandR
initialization.  RandR initialization retains the no-rotation setting for BW.
2006-05-12 15:37:44 -07:00
Eric Anholt 88558ebeed Start fixing up the build and remove a regression from master (I think) in
rotation.
2006-05-12 15:00:17 -07:00
Eric Anholt 9e387ef92b Re-add authorship note in i830_driver.c accidentally left out of last commit. 2006-05-12 13:41:38 -07:00
Eric Anholt af2432322b First pass of integrating the Tungsten Graphics driver for Broadwater. This
patch is based off of diffing from the branchpoint to the supplied code, but
with many chunks containing reversions of commits removed.  Won't work yet.
2006-05-12 13:32:38 -07:00
Dave Airlie fbba4312e7 add sdvo capability reading support
This reads the SDVO cap bits and uses them to figure out the input/output
to save/restore
2006-05-12 18:44:27 +10:00
Keith Packard f2967a2f5f Video overlay gamma bounds checking must be done bytewise.
Also, pend bound computations to register writes to allow
updates to individual values that are 'out of spec' so
the client can update multiple values.
(cherry picked from 190f9ad060 commit)
2006-05-09 13:57:23 -07:00
Keith Packard 190f9ad060 Video overlay gamma bounds checking must be done bytewise.
Also, pend bound computations to register writes to allow
updates to individual values that are 'out of spec' so
the client can update multiple values.
2006-05-09 13:51:25 -07:00