xserver-xorg-video-intel: Changes to 'ubuntu'
ChangeLog | 547 +++++++++++++
NEWS | 7
configure.ac | 9
debian/README.Debian | 13
debian/changelog | 60 +
debian/control | 5
debian/patches/108_sandybridge_disable_Xv.patch | 60 -
debian/patches/libdrm-from-sid-is-ok.diff | 11
debian/patches/series | 2
man/intel.man | 6
src/Makefile.am | 5
src/brw_structs.h | 100 ++
src/common.h | 7
src/i830_reg.h | 2
src/i830_render.c | 2
src/i965_reg.h | 98 ++
src/i965_render.c | 789 ++++++++++++++++--
src/i965_video.c | 794 ++++++++++++++++---
src/intel.h | 31
src/intel_batchbuffer.c | 47 -
src/intel_batchbuffer.h | 13
src/intel_display.c | 8
src/intel_dri.c | 247 ++++-
src/intel_driver.c | 206 +++-
src/intel_driver.h | 78 -
src/intel_hwmc.c | 14
src/intel_memory.c | 40
src/intel_module.c | 113 ++
src/intel_shadow.c | 204 ++++
src/intel_uxa.c | 334 +------
src/intel_video.c | 53 -
src/intel_video.h | 7
src/legacy/i810/i810.h | 3
src/legacy/i810/i810_dri.c | 4
src/render_program/Makefile.am | 45 +
src/render_program/exa_wm_ca.g6b | 4
src/render_program/exa_wm_ca_srcalpha.g6b | 4
src/render_program/exa_wm_mask_affine.g6a | 47 +
src/render_program/exa_wm_mask_affine.g6b | 4
src/render_program/exa_wm_mask_projective.g6a | 63 +
src/render_program/exa_wm_mask_projective.g6b | 12
src/render_program/exa_wm_mask_sample_a.g4a | 3
src/render_program/exa_wm_mask_sample_a.g4b | 3
src/render_program/exa_wm_mask_sample_a.g4b.gen5 | 3
src/render_program/exa_wm_mask_sample_a.g6b | 3
src/render_program/exa_wm_mask_sample_argb.g4a | 3
src/render_program/exa_wm_mask_sample_argb.g4b | 3
src/render_program/exa_wm_mask_sample_argb.g4b.gen5 | 3
src/render_program/exa_wm_mask_sample_argb.g6b | 3
src/render_program/exa_wm_noca.g6b | 4
src/render_program/exa_wm_src_affine.g6a | 47 +
src/render_program/exa_wm_src_affine.g6b | 4
src/render_program/exa_wm_src_projective.g6a | 63 +
src/render_program/exa_wm_src_projective.g6b | 12
src/render_program/exa_wm_src_sample_a.g4a | 3
src/render_program/exa_wm_src_sample_a.g4b | 3
src/render_program/exa_wm_src_sample_a.g4b.gen5 | 3
src/render_program/exa_wm_src_sample_a.g6b | 3
src/render_program/exa_wm_src_sample_argb.g4a | 3
src/render_program/exa_wm_src_sample_argb.g4b | 3
src/render_program/exa_wm_src_sample_argb.g4b.gen5 | 3
src/render_program/exa_wm_src_sample_argb.g6b | 3
src/render_program/exa_wm_src_sample_planar.g4a | 7
src/render_program/exa_wm_src_sample_planar.g4b | 7
src/render_program/exa_wm_src_sample_planar.g4b.gen5 | 7
src/render_program/exa_wm_src_sample_planar.g6b | 5
src/render_program/exa_wm_write.g6a | 77 +
src/render_program/exa_wm_write.g6b | 17
src/render_program/exa_wm_yuv_rgb.g6b | 12
uxa/uxa-glyphs.c | 7
uxa/uxa.c | 3
71 files changed, 3653 insertions(+), 765 deletions(-)
New commits:
commit 3b64a0083fc3ed2ef130c58205edf0d8a9348036
Author: Robert Hooker <sarvatt@ubuntu.com>
Date: Mon Nov 15 12:31:40 2010 -0500
Add libudev-dev to build deps to enable monitor hotplug detection code.
diff --git a/debian/control b/debian/control
index ca415ea..94b56a4 100644
--- a/debian/control
+++ b/debian/control
@@ -30,6 +30,7 @@ Build-Depends:
libxcb-aux0-dev,
libxcb-dri2-0-dev,
# end xvmc
+ libudev-dev [linux-any],
dpkg-dev (>= 1.14.17),
quilt,
automake,
commit 6c3ab23400ae561a02bcf2a79fa8bd15f950b5e4
Author: Robert Hooker <sarvatt@ubuntu.com>
Date: Mon Nov 15 12:28:15 2010 -0500
Drop 108_sandybridge_disable_Xv.patch: Fixed upstream.
diff --git a/debian/patches/108_sandybridge_disable_Xv.patch b/debian/patches/108_sandybridge_disable_Xv.patch
deleted file mode 100644
index 9c3da0c..0000000
--- a/debian/patches/108_sandybridge_disable_Xv.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 66596980133c76e2c1e81a6d76b949fb5cdbd1b1 Mon Sep 17 00:00:00 2001
-From: Matthias Hopf <mhopf@suse.de>
-Date: Thu, 30 Sep 2010 12:48:11 +0200
-Subject: [PATCH] Re-add XVideo option, as XVideo on SandyBridge freezes the chip.
-
----
- man/intel.man | 5 +++++
- src/intel_driver.c | 6 +++++-
- 2 files changed, 10 insertions(+), 1 deletions(-)
-
-diff --git a/man/intel.man b/man/intel.man
-index 31860f2..3f3b6f2 100644
---- a/man/intel.man
-+++ b/man/intel.man
-@@ -187,6 +187,11 @@ performance.
- .IP
- Default: enabled.
- .TP
-+.BI "Option \*qXVideo\*q \*q" boolean \*q
-+Enable XVideo support.
-+.IP
-+Default: Enabled, except on SandyBridge
-+.TP
- .BI "Option \*qXvMC\*q \*q" boolean \*q
- Enable XvMC driver. Current support MPEG2 MC on 915/945 and G33 series.
- User should provide absolute path to libIntelXvMC.so in XvMCConfig file.
-diff --git a/src/intel_driver.c b/src/intel_driver.c
-index 79c850b..487f5f1 100644
---- a/src/intel_driver.c
-+++ b/src/intel_driver.c
-@@ -107,6 +107,7 @@ typedef enum {
- OPTION_DEBUG_FLUSH_BATCHES,
- OPTION_DEBUG_FLUSH_CACHES,
- OPTION_DEBUG_WAIT,
-+ OPTION_XVIDEO,
- } I830Opts;
-
- static OptionInfoRec I830Options[] = {
-@@ -125,6 +126,7 @@ static OptionInfoRec I830Options[] = {
- {OPTION_DEBUG_FLUSH_BATCHES, "DebugFlushBatches", OPTV_BOOLEAN, {0}, FALSE},
- {OPTION_DEBUG_FLUSH_CACHES, "DebugFlushCaches", OPTV_BOOLEAN, {0}, FALSE},
- {OPTION_DEBUG_WAIT, "DebugWait", OPTV_BOOLEAN, {0}, FALSE},
-+ {OPTION_XVIDEO, "XVideo", OPTV_BOOLEAN, {0}, FALSE},
- {-1, NULL, OPTV_NONE, {0}, FALSE}
- };
- /* *INDENT-ON* */
-@@ -883,7 +885,9 @@ I830ScreenInit(int scrnIndex, ScreenPtr screen, int argc, char **argv)
- * Set this so that the overlay allocation is factored in when
- * appropriate.
- */
-- intel->XvEnabled = TRUE;
-+ intel->XvEnabled = xf86ReturnOptValBool(intel->Options,
-+ OPTION_XVIDEO,
-+ !IS_GEN6(intel));
-
- xf86DrvMsg(scrn->scrnIndex,
- intel->pEnt->device->videoRam ? X_CONFIG : X_DEFAULT,
---
-1.6.0.2
-
diff --git a/debian/patches/series b/debian/patches/series
index 8b9a129..dd2a1c8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
101_copy-fb.patch
105_sandybridge_dri_disable.patch
-108_sandybridge_disable_Xv.patch
libdrm-from-sid-is-ok.diff
commit 4996c1ff2936fe58741d97f02bb99b5ef6960822
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Nov 9 15:53:56 2010 +0100
Upload to experimental.
diff --git a/debian/changelog b/debian/changelog
index 54b018e..e5302bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xserver-xorg-video-intel (2:2.13.901-2) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.13.901-2) experimental; urgency=low
* Build against Xserver 1.9.1 rc1.
- -- Cyril Brulebois <kibi@debian.org> Tue, 09 Nov 2010 15:53:31 +0100
+ -- Cyril Brulebois <kibi@debian.org> Tue, 09 Nov 2010 15:53:43 +0100
xserver-xorg-video-intel (2:2.13.901-1) experimental; urgency=low
commit 4cc235ee9ae4215a927e79ee68425b2482eaed6a
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Nov 9 15:53:37 2010 +0100
Build against Xserver 1.9.1 rc1.
diff --git a/debian/changelog b/debian/changelog
index be4cd0f..54b018e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-intel (2:2.13.901-2) UNRELEASED; urgency=low
+
+ * Build against Xserver 1.9.1 rc1.
+
+ -- Cyril Brulebois <kibi@debian.org> Tue, 09 Nov 2010 15:53:31 +0100
+
xserver-xorg-video-intel (2:2.13.901-1) experimental; urgency=low
* New upstream release candidate.
diff --git a/debian/control b/debian/control
index 3d59382..1949e80 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: David Nusinow <dnusinow@debian.org>, Drew Parsons <dparsons@debian.or
Build-Depends:
debhelper (>= 5),
pkg-config,
- xserver-xorg-dev (>= 2:1.7.6.901),
+ xserver-xorg-dev (>= 2:1.9.0.901),
x11proto-core-dev,
x11proto-fonts-dev,
x11proto-xinerama-dev,
commit 83ab9738d89faee01a6d634f269c31a4331479b3
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Nov 9 14:54:26 2010 +0100
Upload to experimental.
diff --git a/debian/changelog b/debian/changelog
index 0a502cc..be4cd0f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-xserver-xorg-video-intel (2:2.13.901-1) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.13.901-1) experimental; urgency=low
* New upstream release candidate.
* Bump build-dep on libdrm-dev: 2.4.22-2 contains some cherry-picked
changes to allow this release candidate to build and run.
* Drop patch: i8xx-shadow.diff
- -- Cyril Brulebois <kibi@debian.org> Tue, 09 Nov 2010 14:22:52 +0100
+ -- Cyril Brulebois <kibi@debian.org> Tue, 09 Nov 2010 14:54:21 +0100
xserver-xorg-video-intel (2:2.13.0-2) unstable; urgency=low
commit d7de7b6e1f6f93b2ae0db4fd8dcbdf4566859e47
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Nov 9 14:54:17 2010 +0100
Drop patch: i8xx-shadow.diff
diff --git a/debian/changelog b/debian/changelog
index 4a630d2..0a502cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xserver-xorg-video-intel (2:2.13.901-1) UNRELEASED; urgency=low
* New upstream release candidate.
* Bump build-dep on libdrm-dev: 2.4.22-2 contains some cherry-picked
changes to allow this release candidate to build and run.
+ * Drop patch: i8xx-shadow.diff
-- Cyril Brulebois <kibi@debian.org> Tue, 09 Nov 2010 14:22:52 +0100
diff --git a/debian/patches/i8xx-shadow.diff b/debian/patches/i8xx-shadow.diff
deleted file mode 100644
index c6df25c..0000000
--- a/debian/patches/i8xx-shadow.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-Index: xserver-xorg-video-intel/src/intel_driver.c
-===================================================================
---- xserver-xorg-video-intel.orig/src/intel_driver.c
-+++ xserver-xorg-video-intel/src/intel_driver.c
-@@ -595,7 +595,6 @@
-
- intel->force_fallback =
- drmCommandNone(intel->drmSubFD, DRM_I915_GEM_THROTTLE) != 0;
-- intel->use_shadow = FALSE;
-
- /* Enable tiling by default */
- intel->tiling = TRUE;
-@@ -608,15 +607,13 @@
- intel->tiling = FALSE;
- }
-
-- if (xf86IsOptionSet(intel->Options, OPTION_SHADOW)) {
-- if (xf86ReturnOptValBool(intel->Options, OPTION_SHADOW, FALSE))
-- intel->force_fallback = intel->use_shadow = TRUE;
-- }
--
-+ intel->use_shadow = xf86ReturnOptValBool(intel->Options, OPTION_SHADOW, IS_I8XX(intel));
- if (intel->use_shadow) {
-- xf86DrvMsg(scrn->scrnIndex, X_CONFIG,
-+ xf86DrvMsg(scrn->scrnIndex,
-+ xf86IsOptionSet(intel->Options, OPTION_SHADOW) ? X_CONFIG : X_DEFAULT,
- "Shadow buffer enabled,"
- " GPU acceleration disabled.\n");
-+ intel->force_fallback = TRUE;
- }
-
- /* SwapBuffers delays to avoid tearing */
diff --git a/debian/patches/series b/debian/patches/series
index 6f457c7..cbe0755 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-i8xx-shadow.diff
libdrm-from-sid-is-ok.diff
commit 5c2f78336b1775ebadab1dea78ee2014e9b65fca
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Nov 9 14:49:43 2010 +0100
Delete symlinks to make dpkg-source happy.
diff --git a/src/render_program/exa_wm_ca.g6a b/src/render_program/exa_wm_ca.g6a
deleted file mode 120000
index a29acb1..0000000
--- a/src/render_program/exa_wm_ca.g6a
+++ /dev/null
@@ -1 +0,0 @@
-exa_wm_ca.g4a
\ No newline at end of file
diff --git a/src/render_program/exa_wm_ca_srcalpha.g6a b/src/render_program/exa_wm_ca_srcalpha.g6a
deleted file mode 120000
index 3503521..0000000
--- a/src/render_program/exa_wm_ca_srcalpha.g6a
+++ /dev/null
@@ -1 +0,0 @@
-exa_wm_ca_srcalpha.g4a
\ No newline at end of file
diff --git a/src/render_program/exa_wm_mask_sample_a.g6a b/src/render_program/exa_wm_mask_sample_a.g6a
deleted file mode 120000
index 9e34bd1..0000000
--- a/src/render_program/exa_wm_mask_sample_a.g6a
+++ /dev/null
@@ -1 +0,0 @@
-exa_wm_mask_sample_a.g4a
\ No newline at end of file
diff --git a/src/render_program/exa_wm_mask_sample_argb.g6a b/src/render_program/exa_wm_mask_sample_argb.g6a
deleted file mode 120000
index b7443bd..0000000
--- a/src/render_program/exa_wm_mask_sample_argb.g6a
+++ /dev/null
@@ -1 +0,0 @@
-exa_wm_mask_sample_argb.g4a
\ No newline at end of file
diff --git a/src/render_program/exa_wm_noca.g6a b/src/render_program/exa_wm_noca.g6a
deleted file mode 120000
index cbf851e..0000000
--- a/src/render_program/exa_wm_noca.g6a
+++ /dev/null
@@ -1 +0,0 @@
-exa_wm_noca.g4a
\ No newline at end of file
diff --git a/src/render_program/exa_wm_src_sample_a.g6a b/src/render_program/exa_wm_src_sample_a.g6a
deleted file mode 120000
index c6e112c..0000000
--- a/src/render_program/exa_wm_src_sample_a.g6a
+++ /dev/null
@@ -1 +0,0 @@
-exa_wm_src_sample_a.g4a
\ No newline at end of file
diff --git a/src/render_program/exa_wm_src_sample_argb.g6a b/src/render_program/exa_wm_src_sample_argb.g6a
deleted file mode 120000
index 2684089..0000000
--- a/src/render_program/exa_wm_src_sample_argb.g6a
+++ /dev/null
@@ -1 +0,0 @@
-exa_wm_src_sample_argb.g4a
\ No newline at end of file
diff --git a/src/render_program/exa_wm_src_sample_planar.g6a b/src/render_program/exa_wm_src_sample_planar.g6a
deleted file mode 120000
index d4e34a1..0000000
--- a/src/render_program/exa_wm_src_sample_planar.g6a
+++ /dev/null
@@ -1 +0,0 @@
-exa_wm_src_sample_planar.g4a
\ No newline at end of file
diff --git a/src/render_program/exa_wm_yuv_rgb.g6a b/src/render_program/exa_wm_yuv_rgb.g6a
deleted file mode 120000
index d34d246..0000000
--- a/src/render_program/exa_wm_yuv_rgb.g6a
+++ /dev/null
@@ -1 +0,0 @@
-exa_wm_yuv_rgb.g4a
\ No newline at end of file
commit e2f94a9cb19d4aa154adfa8b811df1c6d869ae06
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Nov 9 14:26:26 2010 +0100
Bump build-dep on libdrm-dev.
2.4.22-2 contains some cherry-picked changes to allow this release
candidate to build and run.
diff --git a/debian/changelog b/debian/changelog
index 0d8cd4d..4a630d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
xserver-xorg-video-intel (2:2.13.901-1) UNRELEASED; urgency=low
* New upstream release candidate.
+ * Bump build-dep on libdrm-dev: 2.4.22-2 contains some cherry-picked
+ changes to allow this release candidate to build and run.
-- Cyril Brulebois <kibi@debian.org> Tue, 09 Nov 2010 14:22:52 +0100
diff --git a/debian/control b/debian/control
index 8a77241..3d59382 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends:
x11proto-xext-dev,
x11proto-video-dev,
libx11-dev,
- libdrm-dev (>= 2.4.21-1~squeeze3),
+ libdrm-dev (>= 2.4.22-2),
x11proto-xf86dri-dev,
x11proto-gl-dev,
libgl1-mesa-dev | libgl-dev,
commit 9e5ea3a9fbe66dab3e9d14da16d86cdce2ec4973
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Nov 9 14:26:01 2010 +0100
Update changelogs.
diff --git a/ChangeLog b/ChangeLog
index 954e305..a228cf9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,538 @@
+commit 861ee17ae662ffec2269292f92da7833df508b1a
+Author: Carl Worth <cworth@cworth.org>
+Date: Fri Nov 5 12:55:02 2010 -0700
+
+ Update version number to 2.13.901
+
+ In preparation for a snapshot.
+
+commit aaa436b437839a80d340cc5ad598ec4b47ed2eff
+Author: Carl Worth <cworth@cworth.org>
+Date: Fri Nov 5 12:54:16 2010 -0700
+
+ NEWS: Add release notes for 2.13.901 snapshot.
+
+ An intermediate snapshot to capture recent developments.
+
+commit 6b66b45b1ff207b80b81973745f42a776448f764
+Merge: a44a63d 9f232ad
+Author: Carl Worth <cworth@cworth.org>
+Date: Fri Nov 5 12:51:55 2010 -0700
+
+ Merge commit '2.13.0'
+
+ This changes the version number and adds the 2.13.0 release notes,
+ (which were otherwise missing from the master branch).
+
+commit a44a63d2ff6c01c3dc61de6f736dd441ddd25e52
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri Nov 5 09:58:45 2010 +0000
+
+ Wait for any pending rendering before switching modes.
+
+ A perennial problem we have is the accursed WAIT_FOR_EVENT hangs, which
+ occur when we switch the framebuffer before the WAIT_FOR_EVENT completes
+ and upsets the GPU.
+
+ We have tried more subtle approaches to detected these and fix them up in
+ the kernel, to no avail. What we need to do is to delay the framebuffer
+ flip until the WAIT completes, which is quite tricky in the kernel
+ without new ioctls and round-trips. Instead, apply the big hammer from
+ userspace and synchronise all rendering before changing the framebuffer.
+ I expect this not to cause noticeable latency on switching modes (far
+ less than the actual modeswitch) and should stop these hangs once and
+ for all.
+
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=31401 (...)
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 52b32436b9e14a3e13818f80102150ff5bc3c002
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed Nov 3 19:42:26 2010 +0000
+
+ Downgrade tiling allocation failure to a warning
+
+ We emitted this message as an error even though we fallback and attempt
+ to allocate a non-tiled framebuffer before failing (with an appropriate
+ error message).
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 18839aaec505f8bbdb0690fe694162bf09a87d5c
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed Nov 3 18:14:29 2010 +0000
+
+ Fallback to shadow for Sandybridge if we don't have access to the BLT
+
+ If we attempt to emit BLT batches without kernel support, we just end up
+ with EINVAL and no rendering. Prevent this, and avoid uncached
+ rendering, by restoring the shadow fallback paths if there is no BLT
+ support.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 8ff37667bf864b771d16a58fc5041cb48408b6a8
+Author: Eric Anholt <eric@anholt.net>
+Date: Tue Nov 2 10:36:03 2010 -0700
+
+ Remove the intermittent GEM_THROTTLE call.
+
+ This is a holdover from early GEM work when we weren't syncing on the
+ DRI client side. It would keep clients from getting too far ahead and
+ killing their interactivity, by bringing everyone to a halt when
+ anyone was too far ahead.
+
+ Now, GL clients throttle themselves to avoid the problem, and it turns
+ out that in the case that they don't (long rendering to buffers with
+ no swap), this actually reduces X Server interactivity: instead of
+ lagging of X rendering behind input, you get no response for seconds
+ at a time, then a burst of rendering, then nothing again.
+
+ Reported by ajax. Tested with moving a window while running
+ cairo-perf-trace on the GL backend (improvement) and X backend (no
+ significant change in responsiveness).
+
+commit 540c5742186c26c3aeccb7b5d3ff0f374722a20c
+Author: Xiang, Haihao <haihao.xiang@intel.com>
+Date: Tue Nov 2 11:05:32 2010 +0800
+
+ render: use headerless render target write
+
+ It is weird that some rendercheck cases only work fine with headerless write.
+ Need to update intel-gen4asm to support headerless write
+
+ Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
+
+commit 7a3109312e43ce4c2f600a65fe6bc821a8f0ebde
+Author: Xiang, Haihao <haihao.xiang@intel.com>
+Date: Wed Oct 27 16:51:28 2010 +0800
+
+ render: acceleration for composite on Sandybridge
+
+ Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
+
+commit 0ab2c05a291738ee763eb518c46e6dcfe29249a2
+Author: Xiang, Haihao <haihao.xiang@intel.com>
+Date: Wed Oct 27 16:49:26 2010 +0800
+
+ render: fragments for composite on Sandybridge
+
+ Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
+
+commit 21c86548dc2c80632c49ec6ec4da2935a0c99476
+Author: Xiang, Haihao <haihao.xiang@intel.com>
+Date: Wed Oct 27 16:47:36 2010 +0800
+
+ render: fix send instruction used in sampling fragments
+
+ To prepare for composite on Sandybridge
+
+ Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
+
+commit 8d008ca89d44aa10aeb032d631971aaebb388675
+Author: Xiang, Haihao <haihao.xiang@intel.com>
+Date: Mon Oct 25 15:39:39 2010 +0800
+
+ render: set the surface state base address
+
+ It is the same as commit 73d4c7d7
+
+ Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
+
+commit b5ae596a0746e5a37e86f5b0980f9265e0061142
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon Nov 1 11:11:09 2010 +0000
+
+ Flush BLT batches before starting an atomic RENDER batch
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 42363134bd38fb406d90cdb9e5b227836a793912
+Author: Zou Nan hai <nanhai.zou@intel.com>
+Date: Mon Nov 1 13:23:36 2010 +0800
+
+ Support BLT acceleration on gen6
+
+ Signed-off-by: Zou Nan hai <nanhai.zou@intel.com>
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 5bed685f765671d63642b24e17abd70579c40ddf
+Author: Zou Nan hai <nanhai.zou@intel.com>
+Date: Mon Nov 1 13:23:35 2010 +0800
+
+ add BLT ring support
+
+ gen6+ platform has a BLT engine with seperate
+ command streamer to support BLT commands.
+
+ Signed-off-by: Zou Nan hai <nanhai.zou@intel.com>
+ [ickle: merge trivial conflict]
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 6ec3ff134baeac33d9d5821695d5f80843a96c91
+Author: Xiang, Haihao <haihao.xiang@intel.com>
+Date: Fri Oct 15 11:21:09 2010 +0800
+
+ Xv: don't call intel_wait_for_scanline on Sandybridge
+
+ MI_LOAD_SCAN_LINE_INCL command is not available on sandybridge.
+
+ Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
+
+commit 9e73cbd7eea61f2fe69692056ca446a4d95e17c2
+Author: Xiang, Haihao <haihao.xiang@intel.com>
+Date: Fri Oct 15 11:20:22 2010 +0800
+
+ Xv: enable TextureAdaptor for Sandybridge
+
+ Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
+
+commit 3213849907bf1b1468872668d10764054c1034fe
+Author: Xiang, Haihao <haihao.xiang@intel.com>
+Date: Wed Oct 27 09:54:05 2010 +0800
+
+ Xv: setup pipeline for Xv on Sandybridge
+
+ Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
+
+commit 9e4dd27aa848acae1b74b77bbbc0a5bb9f6a502a
+Author: Xiang, Haihao <haihao.xiang@intel.com>
+Date: Thu Oct 21 16:10:14 2010 +0800
+
+ Xv: fragments for xv on Sandybridge.
+
+ Need to update intel-gen4asm to build these fragments
+
+ Signed--off-by: Xiang, Haihao <haihao.xiang@intel.com>
+
+commit e34b3f6ef5811d5e8d156dd6582df8f442e9792e
+Author: Xiang, Haihao <haihao.xiang@intel.com>
+Date: Thu Oct 21 13:15:45 2010 +0800
+
+ Xv: Send instruction doesn't use implied move when sampling YUV surface
+
+ The two fragments will be reused for sampling YUV surface
+ and send doesn't have implied move on Sandybridge
+
+ Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
+
+commit 73d4c7d7b8efc920ac09885dcace5a536f93b70f
+Author: Xiang, Haihao <haihao.xiang@intel.com>
+Date: Wed Oct 13 09:13:50 2010 +0800
+
+ Xv: set the surface state base address
+
+ To prepare for Xv on Sandybridge. It is easy to fill the binding
+ table without relocation and make sure that the pointer to binding
+ table only uses bits[15:0].
+
+ Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
+
+commit 5afc7472b155e8e940f12a38baf80c298dc3b364
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri Oct 29 12:23:59 2010 +0100
+
+ intel: don't pass a dangling pointer to GET_PARAM
+
+ I fail at cut'n'paste.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 6b3ce2e8701e7c3fcd30ca07fc13a2cdcf62560d
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri Oct 29 11:07:50 2010 +0100
+
+ uxa: Enable reduced fence sizes for i915
+
+ Depends on libdrm 362457715faacd3101929e5f0d8ae250d0ad09df (for
+ HAS_RELAXED_FENCING define).
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit b066ddda31e40afa652ae51ffc35025ac3ef6f2a
+Author: Adam Jackson <ajax@redhat.com>
+Date: Sun Oct 3 14:42:56 2010 -0700
+
+ intel: Listen for hotplug uevents (V3)
+
+ This connects the kernel uevent indicating monitor hotplugging to the
+ RandR notification events so that X applications can be notified
+ automatically when monitors are connected or disconnected.
+
+ This also adds a configuration option to disable hotplug events.
+
+ V2: missed a #ifdef HAVE_UDEV around some udev-specific declarations
+
+ V3: document Hotplug option in man page
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit a1c54f69643671ce296c57d132852e9846cc41d3
+Author: Eric Anholt <eric@anholt.net>
+Date: Mon Oct 18 13:28:44 2010 -0700
+
+ Fix violation of gen6 requirements for depthbuffer tiling.
+
+ In general, demoting of tiling of DRI2 buffers seems dubious, as we've
+ got various bits of functionality that won't all work together unless
+ buffers are tiled as expected. This just covers one instance of the
+ problem, caught by assertions in Mesa.
+
+ Fixes:
+ fbo-1d
+ fbo-d24s8.
+ glean/readPixSanity
+ glean/rgbTriStrip
+ glean/scissor
+
+commit 33133a1d38a4dce60d2e135663b545895fc85abc
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sun Oct 17 09:21:06 2010 +0100
+
+ display: do not report failure for setting unrecognised properties
+
+ We need to accept any changes to properties not handled by ourselves -- we
+ can't validate the changes ourselves. Denying those changes breaks EDID
+ reporting, for example.
+
+ Reported-by: Elvis Pranskevichus <el@prans.net>
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 8507ef50ba08061ac158848a7c4c136e1755d87e
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed Oct 13 09:45:59 2010 +0100
+
+ Fix driverName regression for i830 from 4083197a
+
+ Reported-by: Stefan Glasenhardt <stefan@glasen-hardt.de>
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=30808
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 15aab1ef982fb67eb2ea463089f070afd9a2cfe5
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed Oct 13 09:50:25 2010 +0100
+
+ Move EDID_COMPLETE_RAWDATA define to intel.h to avoid redifinition warning
+
+ The compiler was simply warning that we defined the name prior to
+ including the original definition, so reorder.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit d2bc2212f8be746e697a65555d6d83bc66d9ce43
+Author: Stefan Dirsch <sndirsch@suse.de>
+Date: Fri Oct 8 17:48:38 2010 +0200
+
+ Make driver compile for 1.6 Xserver series again. Part deux.
+
+ Signed-off-by: Matthias Hopf <mhopf@suse.de>
+ Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 5472359d6860af655a3c286d30558540376c9fdb
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri Oct 8 15:23:13 2010 +0100
+
+ dri: Check for pixmap privates before dereferencing them
+
+ It is still possible for the pixmap allocator to return a software only
+ pixmap (i.e. without an associated GEM buffer or intel_pixmap), so check
+ before dereferencing.
+
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=30707
+ Reported-by: Matthias Hopf <mhopf@suse.de>
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 4083197a44d1a1a05d33654b3c7d6e96d7472fe7
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Thu Oct 7 12:45:02 2010 +0100
+
+ Include a chipset generation number to clarify device specific paths.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 1444ea35706992a1f094fe029e6a7d9eec0f93c6
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed Oct 6 12:36:30 2010 +0100
+
+ dri+shadow: Only tweak the acceleration of CopyRegion if using shadow.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit f286891d1415fc607f0c1b574e6bce4b3759493e
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed Oct 6 11:38:48 2010 +0100
+
+ dri: Reattach the fake pixmap for the shadow scanout to the drawable.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 23ee926bcd8ddd7a2785786efdf119e4fae75bfd
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed Oct 6 10:20:49 2010 +0100
+
+ uxa: Skip a pixmap lookup if there is no driver finish access function
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 707901bf98073fb56179a0b61c806f85ef8f413c
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed Oct 6 08:47:20 2010 +0100
+
+ uxa: Re-enable acceleration.
+
+ A side-effect of discriminating offscreen based on the devPrivate.ptr
+ was that it broke uxa_finish_access and so after any fallback to s/w on
+ a Pixmap, it remained in software for the reminder of its life.
+
+ Introduce an explicit boolean to mark whether or not hardware
+ acceleration is enabled for a pixmap (with a GEM buffer).
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 54f545e0631a287f421ef6a6f20831624b212cf2
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed Oct 6 08:50:13 2010 +0100
+
+ Revert "Clear pixmap->devPrivate.ptr [regression in 7c7294e]"
+
+ This reverts commit 48b4e224297fa807be0e2bc7a67bf7e94579e8de.
+
+ The better fix is to manually mark the pixmap when acceleration is and
+ is not permitted. Whilst the devPrivate.ptr are invalid upon creation,
+ it is not worth carring code that serves no purpose.
+
+commit d1925deedd70c6c4374e42de5aa44989fe328b58
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed Oct 6 00:17:03 2010 +0100
+
+ Clear pixmap->devPrivate.ptr [regression from 7c7294e]
+
+ ModifyPixmapHeader(pixdata = NULL) does not clear the
+ pixmap->devPrivate.ptr, instead the NULL value is interpreted as meaning
+ to keep the current value. (This is similar to the interpretation of the
+ other invalid values like depth=-1 which also mean not to change the
+ current property). However pixadata=NULL is indeed a valid value, and in
+ 7c7294e, devPrivate.ptr == NULL was used to differentiate a bo pixmap
+ from a system pixmap. Except that we never did clear the ptr as
+ intended, and so X would immediately crash.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 4bf2182bf9ee64795e2bf524fedf7b6c36f3cd03
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Tue Oct 5 09:59:04 2010 +0100
+
+ shadow: Use a cacheable shadow for all generations
+
+ Always avoid direct rendering to the uncached scanout buffer,
+ redirecting all 2D access to the shadow instead. Then for the couple of
+ platforms where either the BLT is not ready or cannot be trusted (i8xx)
+ perform the front buffer fixup using the uncached writes from the CPU.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit b27a521214728052b8b10342aaacbaf1622b8e2c
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon Oct 4 20:31:44 2010 +0100
+
+ shadow: Enable shadow by default on SandyBridge
+
+ SandyBridge 2D support is far from complete, so instead of
+ permanently falling back and always using uncached GTT mapping for
+ rendering, use the shadow buffer instead.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 3e641459f8997f45288cc3cb314e50f2b5a629fd
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon Oct 4 20:31:01 2010 +0100
+
+ shadow: Disable BLT for SandyBridge
+
+ The blitting code is incorrect for SandyBridge so disable until
+ the BLT ring is ready.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 7c7294ec00d6c3a454a17a1b9983d14d0655162c
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon Oct 4 11:56:27 2010 +0100
+
+ shadow+dri2: Allow dri2 to be independently enabled with shadow
+
+ To enable DRI we create GEM buffers for the client to render into with
+ hardware acceleration. In order to maintain coherency between any 2D
+ render operations with the independent 3D clients (this includes the
+ reading of 2D rasterisation by the direct rendering client, e.g.
+ compiz using texture_from_pixmap) we need to replace the shadow pixmap
+ with the GTT mapping. Therefore 2D rendering to a DRI buffer will be to
+ uncached memory and thus penalised -- but the direct rendering clients
+ will have full hardware acceleration.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 16a5d0ee3ca4d41af6a6876a8baf81e3f715781d
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon Oct 4 11:21:17 2010 +0100
+
+ shadow: Map the scanout directly on i8xx
+
+ Even with the minimal use of the BLT to copy from the GTT shadow to the
+ GTT scanout, i830 was still hanging. Just write to the scanout directly.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 516d235c5b3bd51e9533925140d95d3b4533129c
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon Oct 4 11:10:57 2010 +0100
+
+ Split shadow handling routines to their own file.
+
+ This is about to get messy, so separate out the shadow from the normal
+ code.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 455f2939a661764ebb8d1747d44e16a0a8937808
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sat Oct 2 13:32:58 2010 +0100
+
+ Do not claim the PCI device if !KMS
+
+ By returning FALSE whilst probing if we can't find a KMS driver, we
+ allow X to fallback to trying the VESA driver -- rather than failing.
+
+ The initial idea for this was by Julien Cristau.
+
+ Reported-by: Julien Cristau <jcristau@debian.org>
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 97fea2fd0c36d78f4e940b124a7886c4a3f3dfc7
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sat Oct 2 10:05:59 2010 +0100
+
+ legacy/i810: Remove pVisualConfigs
+
+ Completely unused pulling in an undesired glxproto dependency.
+
+ Reported-by: Cyril Brulebois <kibi@debian.org>
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=30554
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 8784c4f5a1524fb979b00c7ce7981cbc1dcf0ec0
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri Oct 1 21:40:36 2010 +0100
+
+ video: Disable TextureAdaptor for Sandybridge
+
+ The acceleration code does not yet exist, so we try to use gen4 shaders
+ which hangs the chip and makes everybody upset. Disable it until such a
+ time as support is written for Sandybridge XVideo.
+
+ Reported-by: Matthias Hopf <mhopf@suse.de>
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=30500
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
commit 9f232ad67c72b7869dcd112207bc41dc01d7d104
Author: Carl Worth <cworth@cworth.org>
Date: Thu Sep 30 08:45:49 2010 -0700
@@ -14,6 +549,18 @@ Date: Thu Sep 30 08:45:15 2010 -0700
Which is functionalliy identical to 2.12.902.
+commit 345c963e443ec325f1ff530512a356ddb318ff70
+Author: Zhenyu Wang <zhenyuw@linux.intel.com>
+Date: Thu Sep 30 10:58:49 2010 +0800
+
+ Always use tiling on Sandybridge
+
+ Sandybridge requires kind of buffer must be tiling, like depth.
+ And we would or have all tiling cases handled fine. So not allow
+ user to turn off tiling on Sandybridge+ may be fine.
+
+ Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
+
Reply to: