ChangeLog | 705 +++++++++++++++++++++++++++++++-
configure.ac | 3
debian/changelog | 7
debian/control | 22
debian/xserver-xorg-video-intel.install | 4
src/xvmc/Makefile.am | 2
src/xvmc/intel_xvmc.c | 1
7 files changed, 724 insertions(+), 20 deletions(-)
New commits:
commit 0e749c6e1027e01e8c7091c05fa8dfc0b4c9c947
Author: Julien Cristau <jcris...@debian.org>
Date: Thu Jun 11 18:52:13 2009 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 8a957f4..8f515b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xserver-xorg-video-intel (2:2.7.99.901-2) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.7.99.901-2) experimental; urgency=low
* Pull upstream fix for xvmc build.
* Update build-depends, and reenable xvmc.
- -- Julien Cristau <jcris...@debian.org> Thu, 11 Jun 2009 18:07:33 +0200
+ -- Julien Cristau <jcris...@debian.org> Thu, 11 Jun 2009 18:52:10 +0200
xserver-xorg-video-intel (2:2.7.99.901-1) experimental; urgency=low
commit b0e1e52ee926b8925a3c2cb71fd075ed8ead85c3
Author: Julien Cristau <jcris...@debian.org>
Date: Thu Jun 11 18:15:22 2009 +0200
Update changelog and reenable xvmc
Also update build-deps
diff --git a/ChangeLog b/ChangeLog
index 7609512..8d63f68 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,654 @@
+commit 6d062e9e9fc4ac92a5dc2941b4ed0251a1dc6e11
+Author: Julien Cristau <jcris...@debian.org>
+Date: Thu Jun 11 17:15:04 2009 +0200
+
+ Fix xvmc build
+
+ If we don't find xext.pc, disable xvmc instead of failing configure
+ Also add dependencies on xfixes and dri2proto (src/xvmc/dri2.h includes
+ <X11/extensions/Xfixes.h> and <X11/extensions/dri2tokens.h>).
+
+commit 9d3c3b056c1d4da6ef7afd3f71a5994fad810632
+Author: Carl Worth <cwo...@cworth.org>
+Date: Wed Jun 10 15:30:45 2009 -0700
+
+ Increment version to 2.7.99.901
+
+ This is the first release candidate for 2.8.0
+
+commit e2622045155f5aa79bacbec8f81c1231194f3033
+Author: Carl Worth <cwo...@cworth.org>
+Date: Wed Jun 10 15:30:09 2009 -0700
+
+ NEWS: Summarize new developments for 2.7.99.901
+
+commit e5bfa2702a31566fa94fa75f7289d7cbe9825420
+Author: Lukasz Kurylo <lukasz.kur...@gmail.com>
+Date: Wed Jun 10 07:55:31 2009 -0700
+
+ DRI2 copyregion: don't wait for scanlines that won't happen
+
+ In some configurations, it's possible to wait for a scanline outside of
+ a given CRTC range. Make sure that can't happen to fix multihead cases
+ with dead space.
+
+ Fixes fdo bug #22203.
+
+ Signed-off-by: Lukasz Kurylo <lukasz.kur...@gmail.com>
+
+commit cda5561716891484aa6f1c4a234be8d88f17f659
+Author: Zou Nan hai <nanhai....@intel.com>
+Date: Wed Jun 10 16:43:30 2009 +0800
+
+ add missing files for previous commit
+
+commit 6d500be3cdecd7617dc6119b58ae273eea478af7
+Author: Zou Nan hai <nanhai....@intel.com>
+Date: Wed Jun 10 15:53:24 2009 +0800
+
+ enable MC on g45 for player without vld patch
+
+commit 88da9b48737229b305da4423e9aa43a09ccdcfac
+Author: Zhenyu Wang <zhen...@linux.intel.com>
+Date: Wed Jun 10 10:45:51 2009 +0800
+
+ Add new chipset register dumps
+
+ Signed-off-by: Zhenyu Wang <zhen...@linux.intel.com>
+
+commit 0d56ef94be0592aec9aa83e4a5e4ff13348640c2
+Author: Zhenyu Wang <zhen...@linux.intel.com>
+Date: Fri Jun 5 12:59:07 2009 +0800
+
+ Disable composite on new chipset for now
+
+ This depends on updated intel-gen4asm be ready for new chip.
+
+ Signed-off-by: Zhenyu Wang <zhen...@linux.intel.com>
+
+commit 440ccc44f51d3a5d6f46c28cfcc576cad155fbbc
+Author: Zhenyu Wang <zhen...@linux.intel.com>
+Date: Fri Jun 5 12:56:04 2009 +0800
+
+ Add new register definitions
+
+ Signed-off-by: Zhenyu Wang <zhen...@linux.intel.com>
+
+commit 0d8a9e2c6f58115b9b8449de52e795699ed032af
+Author: Zhenyu Wang <zhen...@linux.intel.com>
+Date: Fri Jun 5 12:51:51 2009 +0800
+
+ Update intel_gtt utility for new chipset GTT check
+
+ Signed-off-by: Zhenyu Wang <zhen...@linux.intel.com>
+
+commit fb524caa3e2f1f516717669642bb4b2244f9e7e4
+Author: Zhenyu Wang <zhen...@linux.intel.com>
+Date: Mon Jun 8 10:22:14 2009 +0800
+
+ Remove fixed MMIO size
+
+ Use pci resource size instead, which will get the correct MMIO range.
+ New chipset uses obviously larger MMIO range.
+
+ Signed-off-by: Zhenyu Wang <zhen...@linux.intel.com>
+
+commit 4f40b33ef4b069b18a6a18406da83a23ca6e1127
+Author: Zhenyu Wang <zhen...@linux.intel.com>
+Date: Fri Jun 5 11:57:57 2009 +0800
+
+ Add new chipsets PCI ids
+
+ Desktop and mobile version of new chipsets are added.
+ Also do memory config like Intel 4 series chipset.
+
+ Signed-off-by: Zhenyu Wang <zhen...@linux.intel.com>
+
+commit accdbd23676d812d2345f86d8e3ee62f108841ff
+Author: Carl Worth <cwo...@cworth.org>
+Date: Fri May 29 15:34:20 2009 -0700
+
+ UXA: Rasterize trapezoids to system memory, not a pixmap
+
+ Since we're only doing software rasterization right now, anyway, it
+ makes more sense to just rasterize to system memory and then upload
+ to a pixmap once complete. This avoids expensive read-modify-write
+ cycles.
+
+ This results in a 2.4x speedup for a real-world test case that's
+ heavy on trapezoids, which is swfdec running on the following file:
+
+ http://michalevy.com/wp-content/uploads/Giant%20Steps%202007.swf
+
+ Many thanks to Chris Wilson for his cairo-traces repository and
+ cairo-perf-trace tool which makes it so easy to measure things
+ like this.
+
+commit b5e32c9cf896a0b93d193d797a8e83b4aa4691fb
+Author: Carl Worth <cwo...@cworth.org>
+Date: Fri May 1 13:51:39 2009 -0700
+
+ Rename i830_exa.c to i830_uxa.c
+
+ It was just confusing otherwise, (since the EXA code has all been
+ removed now).
+
+commit ee539e58c3bf39766c560d625f6e4158d419e64e
+Author: Kristian Høgsberg <k...@redhat.com>
+Date: Mon Jun 8 21:14:14 2009 -0400
+
+ Fall back to fb pixmaps for backing glyph pictures
+
+ GEM pads pixmaps to 512 byte stride and backs them with a kernel side
+ buffer objects. We typically don't render out of glyph pictures, so
+ we're incurring a lot of overhead per glyph by allocating a GEM pixmap
+ per glyph. By looking at the usage hint, we can fall back to
+ fbCreatePixmap for pixmaps backing glyph pictures, which gives us
+ a nice tight malloced pixmap. The fast path for text rendering is
+ compositing from the glyph cache pixmap to the destination, which
+ shouldn't be significantly affected.
+
+ Quick bit of testing:
+ (firefox-20090601)
+ xlib-rgba-before 384512.49: 1.01x
+ xlib-rgba-after 389633.94: 1.00x
+ The difference being within the margin of error for the benchmark.
+
+ Signed-off-by: Eric Anholt <e...@anholt.net>
+ Tested-by: Chris Wilson <ch...@chris-wilson.co.uk>
+
+commit 4698b3bd79452ae2066a3d195cf58dd5e30c93f3
+Author: Xiang, Haihao <haihao.xi...@intel.com>
+Date: Fri Jun 5 10:43:50 2009 +0800
+
+ xvmc: don't include xf86dri.h
+
+commit 4d9f3a21ab9b2737fe7a5a088c2da1b0c2be7f04
+Merge: b8e360b 52054b6
+Author: root <r...@hdmi.sh.intel.com>
+Date: Thu Jun 4 10:27:41 2009 +0800
+
+ Merge branch 'xvmc-vld'
+
+commit b8e360bf2b77d28559d15a7c0f9c766848eb6ced
+Author: Eric Anholt <e...@anholt.net>
+Date: Wed Jun 3 10:12:25 2009 +0000
+
+ Fix segfault in DRI2 vblank syncing if the region isn't onscreen.
+
+ Also, fix some weirdness in the checking for whether the target was the
+ screen.
+
+commit 5901a67fc85ac80fabfa98b78202a388445275c3
+Author: Eric Anholt <e...@anholt.net>
+Date: Wed Jun 3 10:00:50 2009 +0000
+
+ Fix some drawable abuse in i830_dri.c
+
+ We were casting pixmaps to drawables even if they weren't pixmaps. They
did
+ happen to work out since we only used the drawable record out of them.
+
+commit 5e48146777921b693c828af9566a77422cc4f85f
+Author: Eric Anholt <e...@anholt.net>
+Date: Wed Jun 3 09:57:10 2009 +0000
+
+ Replace some pixmap-related idioms with inline functions to do so.
+
+commit ea0b00e675281b2914450992501566122f9affe0
+Author: Ma Ling <ling...@intel.com>
+Date: Mon Jun 1 17:13:53 2009 +0800
+
+ Provide mode line from VBT to xorg.
+
+ If sdvo get modes function can't find modes from EDID,
+ transmit sdvo lvds modes from VBT to xorg.
+
+ Signed-off-by: Ma Ling <ling...@intel.com>
+
+commit 9e7ee50bea5f65003f1d70cc06d8c1ace1282548
+Author: Ma Ling <ling...@intel.com>
+Date: Mon Jun 1 17:13:22 2009 +0800
+
+ Fetch mode line from VBT, then keep it.
+
+ Parse SDVO LVDS option section, then according to panel type
+ fetch fixed mode line from SDVO LVDS DTDS section .
+
+ Signed-off-by: Ma Ling <ling...@intel.com>
+
+commit 88f766be008008d76c150e3ac16f09d4ecbb6d53
+Author: Ma Ling <ling...@intel.com>
+Date: Fri May 15 15:22:11 2009 +0800
+
+ Wait doubled regis to be stable for load pipe detection
+
+ We have two approaches for VGA detections: hot plug detection for 945G
onwards
+ and load pipe detection for Pre-945G. load pipe detection will get one free
+ pipe ,and set border color as red and blue, then check CRT status by
+ swf register. Because pipe registers in hires mode are double buffered,
+ once set force border bit in pipeconf register, we have to wait for
+ a vblank until it is effective, otherwise result is unstable.
+
+ It fixed freedesktop bug #20463
+
+ Signed-off-by: Ma Ling <ling...@intel.com>
+
+commit 6a635be5ea2b2df9d6b9a8006325244394038474
+Author: Ma Ling <ling...@intel.com>
+Date: Fri May 15 14:01:18 2009 +0800
+
+ Set activation periods as 64 cdclk sync up with KMS
+
+ We use force CRT detect trigger bit(1 << 3) to detect VGA in hot plug mode,
+ which triggers a CRT hotplug/unplug detection cycle independent of the
+ interrupt enable bit(1 << 9), so keep bit 9.
+ And although spec says CRT_HOTPLUG_ACTIVATION_PERIOD_64(1 << 8) is only
useful
+ for mobile platform, it is also required to detect vga on G4x platform
correctly.
+ Tested the patch on G45/G43/Q45 platforms with no regressions
+
+ It fixed freedesktop.org bug #21120 and part of bug #21210.
+
+ Signed-off-by: Ma Ling <ling...@intel.com>
+
+commit ec2fde7c8250fdc30984f16c8a1d3587d70b0144
+Author: Jesse Barnes <jbar...@virtuousgeek.org>
+Date: Tue Jun 2 16:42:56 2009 +0100
+
+ Sync DRI2 CopyRegion to vertical retrace
+
+ Akin to the Xv code, wait for the scanline to be outside the range to be
+ copied by the DRI2 CopyRegion hook.
+
+ Fixes fdo bug #20664.
+
+ Reviewed-by: Eric Anholt <e...@anholt.net>
+ Signed-off-by: Jesse Barnes <jbar...@virtuousgeek.org>
+
+commit 704771f1c595df481d244a6f074e9f5620d4a720
+Author: Adam Jackson <a...@redhat.com>
+Date: Thu May 28 15:03:45 2009 -0400
+
+ Remove useless loader symbol lists.
+
+commit 8e942b70cb9a784b3f1311affd6fc74c4bcf68bb
+Author: Carl Worth <cwo...@cworth.org>
+Date: Thu May 21 13:12:52 2009 -0700
+
+ Revert "Rely on BO pixmaps being present in acceleration paths."
+
+ This reverts commit 4653a7db622ad54a3182d93c81331765d930db34.
+
+ Eric was getting a little too ambitious about our brave, new world.
+ We do still want the driver to work with old, non-GEM kernels
+ after all.
+
+commit 1a039f4371bec455cad43f0fb7b329f2ee09a974
+Author: Eric Anholt <e...@anholt.net>
+Date: Mon Apr 27 17:45:02 2009 -0700
+
+ Fold GEM detection into DRM master open.
+
+ We don't have anything to do with the DRM unless it's GEM-enabled, unless
+ we were to support GEM-but-not-DRI2, which doesn't seem useful.
+
+ Compilation fixes by Carl Worth <cwo...@cworth.org>
+
+commit a04a51c9bb6066454e0fda3c7897f97dab436358
+Author: Eric Anholt <e...@anholt.net>
+Date: Mon Apr 27 17:29:36 2009 -0700
+
+ Open the DRM and keep the handle throughout server startup to finish.
+
+ This will let us configure the server from start to finish with the
+ most pertinent information available (KMS vs UMS, DRI2 vs non-DRI). Also,
+ we now close the DRI2 fd at terminate, which we didn't before.
+
+ This duplicates some code from DRI1 for getting a master FD like I'd done
in
+ DRI2, but given that we weren't loading DRI1 ourselves, this is also a
+ bogosity cleanup, and avoids allocating the extra DRI1 private.
+
+commit c3bf8b980134a2761701e4bc18235695a1cb07a4
+Author: Eric Anholt <e...@anholt.net>
+Date: Thu May 21 11:05:01 2009 -0700
+
+ Fix backwards logic on whether to sync to vblank or not.
+
+ Thanks to Michel Dänzer for catching it.
+
+commit ad2128825ba28551cfef203da017151e2eac32ef
+Author: Kristian Høgsberg <k...@redhat.com>
+Date: Wed May 20 12:32:10 2009 -0400
+
+ Only return FALSE when dri_bo_map() fails
+
+ Small typo in the previous commit.
+
+commit 09beee378cecd1079e7a9fa6eee8f084d680d37e
+Author: Eric Anholt <e...@anholt.net>
+Date: Mon May 18 18:01:05 2009 -0700
+
+ Don't do GTT maps on objects bigger than half the available aperture size.
+
+ The basic problem is that software fallbacks will do single instructions
that
+ copy from one GTT-mapped BO into another GTT-mapped BO. If we can't get
both
+ of them bound simultanously, we fault one in, retry the instruction, fault
the
+ other in (kicking out #1), retry the instruction, fault #1 back in
+ (kicking out #2), etc.
+
+ Note that we'll still get into a nasty spot if you do a composite operation
+ with a mask where all 3 are big-but-less-than-half-available-aperture,
where
+ you'll thrash. It at least means you'll make progress, though, since each
+ instruction will only be operating on two BOs at at time, and the situation
+ seems unlikely.
+
+ Bug #20152 (3/3)
+
+commit 52054b6a4c1ca5117c9750361f71aedd91220c39
+Author: Li Shao Hua <shaohua...@intel.com>
+Date: Tue May 19 16:27:32 2009 +0800
+
+ switch XvMC to gem
+
+commit 34660fd2df5d61b77ed7041d32ac29053fc94f5a
+Author: Eric Anholt <e...@anholt.net>
+Date: Fri May 15 23:21:05 2009 -0700
+
+ Only sync XV to vblank when drawing to the frontbuffer.
+
+ This fixes emitting syncs to random pipes with boxes bigger than that
+ pipe's vertical, leading to GPU hangs.
+
+ Bug #21738
+
+commit b622860429e00d6ab4407980232659c283a8fe8d
+Author: Xiang Hai hao <haihao.xi...@intel.com>
+Date: Mon May 18 17:12:30 2009 +0800
+
+ DRI2 for XvMC
+
+commit 50c10ededba15dd0c118f1b65756362061491090
+Merge: 13c730e 87332a7
+Author: Zou Nan hai <nanhai....@intel.com>
+Date: Mon May 18 17:11:28 2009 +0800
+
+ Merge branch 'master' into xvmc-vld
+
+commit 87332a7cc16af82aa47e07fbf90da3635b071dbf
+Author: Keith Packard <kei...@keithp.com>
+Date: Mon May 11 13:52:00 2009 -0700
+
+ Use drm_intel_bo_disable_reuse API to flag scanout and cursor buffers
+
+ Buffers referenced by the kernel for scanout or cursor display should not
be
+ reused by the driver. Use the new drm API to disable reuse of these
buffers.
+
+ Signed-off-by: Keith Packard <kei...@keithp.com>
+
+commit ebe05200df381c0e6ee636f0f83440bfedea9bcb
+Author: Jesse Barnes <jbar...@virtuousgeek.org>
+Date: Fri May 15 08:50:17 2009 -0700
+
+ Add --enable-debug flag to configure
+
+ Defaults to enabled.
+
+commit 04772b6c09a88f0483c2a7efc48029967c77b9bc
+Author: Keith Packard <kei...@keithp.com>
+Date: Thu May 14 16:57:11 2009 -0700
+
+ If DRM can't figure out which pipe to sync on, then don't sync at all.
+
+ Syncing to the wrong pipe can wedge the hardware if the exclusion area is
+ larger than the vtotal
+
+ Signed-off-by: Keith Packard <kei...@keithp.com>
+
+commit 128c1c3b7d57b157604788f82bf9fd389839068f
+Author: Carl Worth <cwo...@cworth.org>
+Date: Wed Apr 29 14:43:56 2009 -0700
+
+ Use libdrm to lookup pipe for tear-free sync of XV
+
+ Previously, the code was trying to examine a driver_private field,
+ but those fields are only set by the userland-modesetting code so
+ would fail in the case of KMS. This fixes bug #21076:
+
+ [945GME] [KMS] XV_SYNC_TO_VBLANK does not prevent tearing of xv video
+ https://bugs.freedesktop.org/show_bug.cgi?id=21076
+
+commit 2572fcc6196aff7a2f1095d211fd85d8668647ca
+Author: Wu Fengguang <fengguang...@intel.com>
+Date: Thu Apr 30 19:51:26 2009 +0800
+
+ README: kill an evil dot
+
+ To make copy and paste a more pleasure.
+
+ Signed-off-by: Wu Fengguang <fengguang...@intel.com>
+ Signed-off-by: Eric Anholt <e...@anholt.net>
+
+commit b9462516d18bc57be5f33f57adb6c3e8beede5ff
+Author: Eric Anholt <e...@anholt.net>
+Date: Tue May 12 18:53:27 2009 -0700
+
+ Remove dead "avail" variable from XAA stuff.
+
+commit 1c68bc376a9cb3c0a010c8e28f69a776755c8f64
+Author: Jesse Barnes <jbar...@virtuousgeek.org>
+Date: Wed May 13 13:19:53 2009 -0700
+
+ Add new have_gem flag
+
+ Prior to this patch, code that wanted to check whether GEM was present
+ would look at pI830->memory_manager. This turned out to be occasionally
+ problematic in the KMS case, since memory_manager didn't always get set
+ correctly. So add a new pI830->have_gem flag to make things clear in
+ the various code paths, and set it after GEM initializes or when KMS is
+ detected.
+
+ Reviewed-by: Eric Anholt <e...@anholt.net>
+ Tested-by: Magnus Kessler <magnus.kess...@gmx.net>
+ Signed-off-by: Jesse Barnes <jbar...@virtuousgeek.org>
+
+commit 52367847087206b92f18c40d356d36ab9ee89d39
+Author: Keith Packard <kei...@keithp.com>
+Date: Thu May 7 14:58:02 2009 -0700
+
+ Load i915 and fbcon when checking for KMS
+
+ Signed-off-by: Keith Packard <kei...@keithp.com>
+ Signed-off-by: Eric Anholt <e...@anholt.net>
+
+commit ff7494b4c4b1bd8bb6f169402a9edbe9780787bb
+Author: Keith Packard <kei...@keithp.com>
+Date: Thu May 7 14:58:01 2009 -0700
+
+ Add DP link and GMCH M and N registers
+
+ Signed-off-by: Eric Anholt <e...@anholt.net>
+
+commit e54a23bff068416ccbdb75d538dc7dcd40a6c95c
+Author: Keith Packard <kei...@keithp.com>
+Date: Thu May 7 16:35:19 2009 -0700
+
+ Fallback when VT inactive
+
+ While the VT is inactive, pI830->batch_bo will be NULL, so use that as a
+ simple check for when to not use the accelerator. The alternative is to
+ ignore VT switch and just keep drawing, which would also be fine.
+
+ Bug #21468.
+
+ Signed-off-by: Keith Packard <kei...@keithp.com>
+ [anholt: Removed extra return FALSE -- I830FALLBACK does that.]
+ Signed-off-by: Eric Anholt <e...@anholt.net>
+
+commit 660bd745c21c56e330d844fe4c8eaae862a77483
+Author: Wu Fengguang <fengguang...@intel.com>
+Date: Thu Apr 30 18:42:18 2009 +0800
+
+ Remove the offset parameter from i830_allocator_init()
+
+ offset is redundant. i830_allocator_init() is only called
+ in one place with offset=0.
+
+ Acked-by: Magnus Kessler <magnus.kess...@gmx.net>
+ Signed-off-by: Wu Fengguang <fengguang...@intel.com>
+ Signed-off-by: Eric Anholt <e...@anholt.net>
+
+commit b1f5cc3349f6811ff4d8dc64cc291788d6726372
+Author: Carl Worth <cwo...@cworth.org>
+Date: Tue May 12 11:45:03 2009 -0700
+
+ RELEASING: Better instructions for where to send announcements
+
+ The xorg-announce list doesn't need to hear about development
+ snapshots and release candidates. The intel-gfx list is good for
+ that.
+
+commit f16ee218845ec48940ea457b921d34896d80a807
+Author: Alan Coopersmith <alan.coopersm...@sun.com>
+Date: Sun May 10 16:25:24 2009 -0700
+
+ Fix "Unkown" typo in two FatalError messages
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@sun.com>
+
+commit 8d27247829fe4f55691ce68f9f4b14810fb34b32
+Author: Stijn van Drongelen <tinctor...@gmail.com>
+Date: Tue May 5 16:37:06 2009 +0200
+
+ Fix typo in (unused) INTEL_BIOS_32 macro
+
+ Debian bug#527062 <http://bugs.debian.org/527062>
+
+ [jcristau: fix same typo in bios_reader.c]
+ Signed-off-by: Julien Cristau <jcris...@debian.org>
+
+commit a8a771a853478e5f45f71d0eff3c4d55bf24d0ad
+Author: Arkadiusz Miśkiewicz <ar...@maven.pl>
+Date: Wed Apr 29 00:21:18 2009 +0200
+
+ Restore CFLAGS after tests.
+
+ Reverts single line of broken commit
e5133a94dc78411eaef324131ea8056aeb81779e.
+
+ Signed-off-by: Eric Anholt <e...@anholt.net>
+
+commit 8255cca2c9092f7ecb798944aa8f03fa3efcfa6c
+Author: Keith Packard <kei...@keithp.com>
+Date: Fri May 1 18:34:43 2009 -0700
+
+ Split i915 textured video commands to fit into batch buffers.
+
+ i915 textured video commands are quite long, but must be contained in the
+ same batch buffer as the 3D setup commands. When the number of clip rects
+ for the video becomes too large for the associated commands to fit in the
+ same batch buffer, this change breaks the sequence into pieces, ensuring
+ that each batch contains the necessary setup sequence.
+
+ Signed-off-by: Keith Packard <kei...@keithp.com>
+
+commit e5e0fb846bda3e1757b89e50d5244d28457b9fe3
+Author: Keith Packard <kei...@keithp.com>
+Date: Fri May 1 12:26:04 2009 -0700
+
+ Call down to lower CloseScreen before shutting down DRM allocator
+
+ Lower level functions will destroy objects that are managed by the DRM
+ allocator, so make sure those are done before the allocator shuts down.
+
+ Signed-off-by: Keith Packard <kei...@keithp.com>
+
+commit cfb98f3da936907945f48dad4c2345930f7beb60
+Author: Keith Packard <kei...@keithp.com>
+Date: Fri May 1 12:23:32 2009 -0700
+
+ Revert "Leave allocator running until lower-level CloseScreens are done"
+
+ Uh, oops -- the FD used to talk to the kernel is closed before the
+ allocator_fini function is called now.
+
+ This reverts commit 1872869e6ffcc8e6cab820c508fe5404d7e8ff9c.
+
+commit 11a853bd8e5d907fe7f5bd907453bcdac9032861
+Author: Keith Packard <kei...@keithp.com>
+Date: Fri May 1 11:51:13 2009 -0700
+
+ Hold reference to video binding table until all rects are painted.
+
+ The optimization of unreferencing the binding table when the relocation is
+ posted causes the object to be dereferenced for each box in the clip list,
+ causing general chaos in the buffer manager. It's easier to just hold a
+ reference to the object until all of the boxes are painted and then drop
it.
+
+ Signed-off-by: Keith Packard <kei...@keithp.com>
+
+commit ed492131c13715b73c14d328d0668120acb58b40
+Author: Keith Packard <kei...@keithp.com>
+Date: Fri May 1 11:50:17 2009 -0700
+
+ 3D_STATE_VERTEX_BUFFERS takes four 32-bit values, not three.
+
+ The spec says this command takes an extra (mbz) 32-bit value, so let's
+ provide it with one.
+
+ Signed-off-by: Keith Packard <kei...@keithp.com>
+
+commit 66d1536a2ecc7a3d44da4c0dbe6c85aaa4e05791
+Author: Keith Packard <kei...@keithp.com>
+Date: Fri May 1 11:48:51 2009 -0700
+
+ Don't bother to enable VF statistics during 965 video playback
+
+ This was used while bringing up the driver to debug vertext fetches.
+
+ Signed-off-by: Keith Packard <kei...@keithp.com>
+
+commit 1872869e6ffcc8e6cab820c508fe5404d7e8ff9c
+Author: Keith Packard <kei...@keithp.com>
+Date: Fri May 1 11:46:51 2009 -0700
+
+ Leave allocator running until lower-level CloseScreens are done
+
+ The lower level close screen functions will free allocated objects, causing
+ a crash if the allocator isn't still available.
+
+ Signed-off-by: Keith Packard <kei...@keithp.com>
+
+commit 1142353b487c155a31011923fbd08ec67e60f505
+Author: Keith Packard <kei...@keithp.com>
+Date: Fri May 1 11:44:13 2009 -0700
+
+ intel_batch_start_atomic: fix size passed to intel_batch_require_space (*4)
+
+ intel_batch_start_atomic takes an argument in 32-bit units, and so it must
+ multiply that by 4 before passing it to intel_batch_require_space, which
+ takes an argument in bytes.
+
+ We should figure out what units we want to use and use the same
everywhere...
+
+ Signed-off-by: Keith Packard <kei...@keithp.com>
+
+commit 8232177a005127a0001af4b14c3beb766958ef11
+Author: Keith Packard <kei...@keithp.com>
+Date: Thu Apr 30 15:30:05 2009 -0700
+
+ Allow cursors to roam past 2048x2048 limit.
+
+ There's no reason to clip cursor positions to an artificial limit; the
+ hardware cursor limits always mirror the hardware display limits.
+
+ Signed-off-by: Keith Packard <kei...@keithp.com>
+
+commit 417f3784b7fae8de3559c7607a2de60661a6a448
+Author: Carl Worth <cwo...@cworth.org>
+Date: Tue Apr 28 20:42:22 2009 -0700
+
+ Add doltlibtool to DISTCLEANFILES
+
+ Otherwise make distcheck fails.
+
commit bc9a688476f02233450eb05dfb40acbf337d679b
Author: Carl Worth <cwo...@cworth.org>
Date: Tue Apr 28 20:37:13 2009 -0700
@@ -674,6 +1325,14 @@ Date: Fri Apr 3 11:15:18 2009 -0700
Reviewed-by: Eric Anholt <e...@anholt.net>
Signed-off-by: Jesse Barnes <jbar...@virtuousgeek.org>
+commit 13c730e003e805e19deee0996b2af30f69e54c4d
+Author: Zou Nan hai <nanhai....@intel.com>
+Date: Wed Apr 1 15:12:55 2009 +0800
+
+ fix
+ 1.multiple instance
+ 2.memory leak
+
commit fad714c40078d22fff82dc0692a344f66ddf9680
Author: Zhenyu Wang <zhenyu.z.w...@intel.com>
Date: Wed Apr 1 10:11:35 2009 +0800
@@ -782,24 +1441,39 @@ Date: Wed Mar 25 11:13:52 2009 +0800
As wider tests showed that this doesn't work for all VBIOS, so
disable it for now and reenable it after we get reliable method.
+commit defa6971c6b639ab72d9d4c85c4607d5f852b2b0
+Author: Zou Nan hai <nanhai....@intel.com>
+Date: Thu Mar 26 15:24:29 2009 +0800
+
+ enable UV half pixel
+
commit 69c84f2c8204771b68f40ed64e64657237b54546
Author: Zhenyu Wang <zhenyu.z.w...@intel.com>
Date: Thu Mar 26 13:52:05 2009 +0800
gitignore intel_lid
-commit b5b377806422c9538fa9f846819ad253c1a50846
-Author: Ma, Ling <ling...@intel.com>
-Date: Wed Mar 25 14:39:46 2009 +0800
+commit fe96e517699e37cc990a14dfb48b9611a02254ed
+Author: Zhenyu Wang <zhenyu.z.w...@intel.com>
+Date: Thu Mar 26 10:54:02 2009 +0800
- disable center mode for 965GM and G4X platform
+ xvmc: add missed vld g4i sources in Makefile and fix distcheck
- When disabling VGA mode, usually we don't need to touch VGA center mode.
- However because of hardware reason, for Cresline, Cantiga & Eaglelake
platform,
- we have to disable center mode as well. The patch fixed bug- TV Out
strobing regression,
- reported by Robert Lowery in intel-...@lists.freedesktop.org mailing list.
+ Don't miss the vld shader programs for dist.
+
+commit 91886f82a1155ca24eb895f77678ea1edfccf9fe
+Author: Zhenyu Wang <zhenyu.z.w...@intel.com>
+Date: Thu Mar 26 10:51:05 2009 +0800
+
+ xvmc: move 965 mc media programs to shader/mc directory
- Signed-off-by: Ma Ling <ling...@intel.com>
+ Also include some missed g4i files in Makefile.am, fix shader build.
+
+commit ebcb64fdc8a45105f529d5e15c335514ecaf1a05
+Author: Zou Nan hai <nanhai....@intel.com>
+Date: Wed Mar 25 16:11:33 2009 +0800
+
+ XvMC VLD extension support for G4X
commit e6af995b24767815ab30364385768867e80605c2
Author: Zhenyu Wang <zhenyu.z.w...@intel.com>
@@ -813,6 +1487,19 @@ Date: Mon Mar 23 19:19:58 2009 +0800
Signed-off-by: Zhenyu Wang <zhenyu.z.w...@intel.com>
+commit b5b377806422c9538fa9f846819ad253c1a50846
+Author: Ma, Ling <ling...@intel.com>
+Date: Wed Mar 25 14:39:46 2009 +0800
+
+ disable center mode for 965GM and G4X platform
+
+ When disabling VGA mode, usually we don't need to touch VGA center mode.
+ However because of hardware reason, for Cresline, Cantiga & Eaglelake
platform,
+ we have to disable center mode as well. The patch fixed bug- TV Out
strobing regression,
+ reported by Robert Lowery in intel-...@lists.freedesktop.org mailing list.
+
+ Signed-off-by: Ma Ling <ling...@intel.com>
+
commit 74d0713e002a9781ed00fdd10eb6f75907ae796c
Author: Kalev Lember <ka...@smartlink.ee>
Date: Fri Mar 20 02:21:41 2009 +0200
diff --git a/debian/changelog b/debian/changelog
index 501c4a7..8a957f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-intel (2:2.7.99.901-2) UNRELEASED; urgency=low
+
+ * Pull upstream fix for xvmc build.
+ * Update build-depends, and reenable xvmc.
+
+ -- Julien Cristau <jcris...@debian.org> Thu, 11 Jun 2009 18:07:33 +0200
+
xserver-xorg-video-intel (2:2.7.99.901-1) experimental; urgency=low
* New upstream release candidate.
diff --git a/debian/control b/debian/control
index ca2f3f5..8377bb9 100644
--- a/debian/control
+++ b/debian/control
@@ -7,18 +7,25 @@ Build-Depends:
debhelper (>= 5),
pkg-config,
xserver-xorg-dev (>= 2:1.5.99.901),
- x11proto-gl-dev,
- x11proto-video-dev,
- libgl1-mesa-dev | libgl-dev,
-# libxvmc-dev (>= 1:1.0.1),
x11proto-core-dev,
x11proto-fonts-dev,
- x11proto-randr-dev (>= 1.2),
- x11proto-render-dev,
x11proto-xinerama-dev,
+ x11proto-randr-dev,
+ x11proto-render-dev,
+ x11proto-xext-dev,
+ x11proto-video-dev,
+ libx11-dev,
libdrm-dev (>= 2.4.11),
x11proto-xf86dri-dev,
+ x11proto-gl-dev,
+ libgl1-mesa-dev | libgl-dev,
libpciaccess-dev (>= 0.8.0+git20071002),
+# following are only needed for xvmc:
+ x11proto-dri2-dev,
+ libxvmc-dev (>= 1:1.0.1),
+ libxext-dev,
+ libxfixes-dev,
+# end xvmc
dpkg-dev (>= 1.14.17),
automake,
libtool,
@@ -38,6 +45,9 @@ Description: X.Org X server -- Intel i8xx, i9xx display driver
of chipsets, including i810, i815, i830, i845, i855, i865, i915, i945
and i965 series chips.
.
+ This package also provides XvMC (XVideo Motion Compensation) drivers
+ for i810/i815 and i9xx and newer chipsets.
+ .
More information about X.Org can be found at:
<URL:http://www.X.org>
<URL:http://xorg.freedesktop.org>
diff --git a/debian/xserver-xorg-video-intel.install
b/debian/xserver-xorg-video-intel.install
index 3c34bf3..c4ac13e 100644
--- a/debian/xserver-xorg-video-intel.install
+++ b/debian/xserver-xorg-video-intel.install
@@ -1,3 +1,3 @@
usr/lib/xorg/modules/drivers/*.so
-#usr/lib/libI810XvMC.so*
-#usr/lib/libIntelXvMC.so*
+usr/lib/libI810XvMC.so*
+usr/lib/libIntelXvMC.so*
commit 6d062e9e9fc4ac92a5dc2941b4ed0251a1dc6e11
Author: Julien Cristau <jcris...@debian.org>
Date: Thu Jun 11 17:15:04 2009 +0200
Fix xvmc build
If we don't find xext.pc, disable xvmc instead of failing configure
Also add dependencies on xfixes and dri2proto (src/xvmc/dri2.h includes
<X11/extensions/Xfixes.h> and <X11/extensions/dri2tokens.h>).
diff --git a/configure.ac b/configure.ac
index c40818f..0864d7c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -152,8 +152,7 @@ if test "$VIDEO_DEBUG" = yes; then
fi
if test "$XVMC" = yes; then
- PKG_CHECK_MODULES(XVMCLIB, [xvmc], [XVMC=yes], [XVMC=no])
- PKG_CHECK_MODULES(XEXT, [xext])
+ PKG_CHECK_MODULES(XVMCLIB, [xvmc xext xfixes dri2proto], [XVMC=yes],
[XVMC=no])
fi
AC_MSG_CHECKING([whether to include XvMC support])
AC_MSG_RESULT([$XVMC])
diff --git a/src/xvmc/Makefile.am b/src/xvmc/Makefile.am
index fc402bb..6cbba6a 100644
--- a/src/xvmc/Makefile.am
+++ b/src/xvmc/Makefile.am
@@ -31,4 +31,4 @@ libIntelXvMC_la_SOURCES = intel_xvmc.c \
libIntelXvMC_la_CFLAGS = @XORG_CFLAGS@ @DRM_CFLAGS@ @DRI_CFLAGS@ \
@XVMCLIB_CFLAGS@ -I$(top_srcdir)/src -DTRUE=1 -DFALSE=0
libIntelXvMC_la_LDFLAGS = -version-number 1:0:0
-libIntelXvMC_la_LIBADD = @DRI_LIBS@ @DRM_LIBS@ @XVMCLIB_LIBS@ @XEXT_LIBS@
-lpthread -ldrm_intel
+libIntelXvMC_la_LIBADD = @DRI_LIBS@ @DRM_LIBS@ @XVMCLIB_LIBS@ -lpthread
-ldrm_intel
diff --git a/src/xvmc/intel_xvmc.c b/src/xvmc/intel_xvmc.c
index 6f55902..06763ae 100644
--- a/src/xvmc/intel_xvmc.c
+++ b/src/xvmc/intel_xvmc.c
@@ -25,6 +25,7 @@
*
*/
#include "intel_xvmc.h"
+#include "dri2.h"
/* global */
struct _intel_xvmc_driver *xvmc_driver = NULL;
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
