ChangeLog | 2474 +++++++++++++++
Makefile.am | 4
NEWS | 32
configure.ac | 114
debian/changelog | 24
debian/patches/121_fdo-28798-fix.patch | 307 -
debian/patches/series | 1
debian/rules | 3
debian/xserver-xorg-video-intel.install | 2
man/intel.man | 28
src/Makefile.am | 6
src/brw_structs.h | 124
src/i965_3d.c | 438 ++
src/i965_reg.h | 132
src/i965_render.c | 578 ++-
src/i965_video.c | 578 ++-
src/intel.h | 45
src/intel_batchbuffer.c | 13
src/intel_batchbuffer.h | 2
src/intel_display.c | 16
src/intel_dri.c | 466 ++-
src/intel_driver.c | 26
src/intel_driver.h | 9
src/intel_module.c | 660 +---
src/intel_video.c | 1
src/legacy/i810/i810_dri.c | 1
src/render_program/Makefile.am | 50
src/render_program/exa_wm_affine.g6i | 35
src/render_program/exa_wm_mask_affine.g6a | 8
src/render_program/exa_wm_mask_affine.g7a | 41
src/render_program/exa_wm_mask_affine.g7b | 4
src/render_program/exa_wm_mask_projective.g7a | 63
src/render_program/exa_wm_mask_projective.g7b | 12
src/render_program/exa_wm_mask_sample_a.g7a | 49
src/render_program/exa_wm_mask_sample_a.g7b | 3
src/render_program/exa_wm_mask_sample_argb.g7a | 49
src/render_program/exa_wm_mask_sample_argb.g7b | 3
src/render_program/exa_wm_sample_planar.g4i | 64
src/render_program/exa_wm_src_affine.g6a | 8
src/render_program/exa_wm_src_affine.g7a | 41
src/render_program/exa_wm_src_affine.g7b | 4
src/render_program/exa_wm_src_projective.g7a | 63
src/render_program/exa_wm_src_projective.g7b | 12
src/render_program/exa_wm_src_sample_a.g7a | 48
src/render_program/exa_wm_src_sample_a.g7b | 3
src/render_program/exa_wm_src_sample_argb.g4a | 18
src/render_program/exa_wm_src_sample_argb.g4i | 44
src/render_program/exa_wm_src_sample_argb.g7a | 38
src/render_program/exa_wm_src_sample_argb.g7b | 3
src/render_program/exa_wm_src_sample_planar.g4a | 36
src/render_program/exa_wm_src_sample_planar.g7a | 38
src/render_program/exa_wm_src_sample_planar.g7b | 5
src/render_program/exa_wm_write.g6a | 38
src/render_program/exa_wm_write.g6i | 61
src/render_program/exa_wm_write.g7a | 41
src/render_program/exa_wm_write.g7b | 17
src/render_program/exa_wm_yuv_rgb.g7b | 12
src/sna/Makefile.am | 101
src/sna/README | 30
src/sna/blt.c | 73
src/sna/gen2_render.c | 2314 ++++++++++++++
src/sna/gen2_render.h | 795 +++++
src/sna/gen3_render.c | 3716 ++++++++++++++++++++++++
src/sna/gen3_render.h | 1479 +++++++++
src/sna/gen4_render.c | 2839 ++++++++++++++++++
src/sna/gen4_render.h | 2643 +++++++++++++++++
src/sna/gen5_render.c | 2842 ++++++++++++++++++
src/sna/gen5_render.h | 2730 +++++++++++++++++
src/sna/gen6_render.c | 2891 ++++++++++++++++++
src/sna/gen6_render.h | 1598 ++++++++++
src/sna/gen7_render.c | 3036 +++++++++++++++++++
src/sna/gen7_render.h | 1716 +++++++++++
src/sna/kgem.c | 1978 ++++++++++++
src/sna/kgem.h | 337 ++
src/sna/kgem_debug.c | 408 ++
src/sna/kgem_debug.h | 31
src/sna/kgem_debug_gen2.c | 60
src/sna/kgem_debug_gen3.c | 1620 ++++++++++
src/sna/kgem_debug_gen4.c | 711 ++++
src/sna/kgem_debug_gen5.c | 687 ++++
src/sna/kgem_debug_gen6.c | 1099 +++++++
src/sna/sna.h | 581 +++
src/sna/sna_accel.c | 3435 ++++++++++++++++++++++
src/sna/sna_blt.c | 1361 ++++++++
src/sna/sna_composite.c | 738 ++++
src/sna/sna_damage.c | 971 ++++++
src/sna/sna_damage.h | 109
src/sna/sna_display.c | 2145 +++++++++++++
src/sna/sna_dri.c | 1748 +++++++++++
src/sna/sna_driver.c | 1037 ++++++
src/sna/sna_glyphs.c | 1177 +++++++
src/sna/sna_gradient.c | 352 ++
src/sna/sna_io.c | 446 ++
src/sna/sna_module.h | 3
src/sna/sna_reg.h | 108
src/sna/sna_render.c | 1154 +++++++
src/sna/sna_render.h | 550 +++
src/sna/sna_render_inline.h | 119
src/sna/sna_stream.c | 99
src/sna/sna_tiling.c | 264 +
src/sna/sna_transform.c | 139
src/sna/sna_trapezoids.c | 2387 +++++++++++++++
src/sna/sna_video.c | 585 +++
src/sna/sna_video.h | 129
src/sna/sna_video_hwmc.c | 252 +
src/sna/sna_video_hwmc.h | 74
src/sna/sna_video_overlay.c | 731 ++++
src/sna/sna_video_textured.c | 437 ++
test/.gitignore | 13
test/Makefile.am | 31
test/README | 3
test/basic-copyarea-size.c | 102
test/basic-copyarea.c | 301 +
test/basic-fillrect.c | 263 +
test/basic-putimage.c | 283 +
test/basic-stress.c | 155 +
test/mixed-stress.c | 208 +
test/render-composite-solid.c | 255 +
test/render-copyarea-size.c | 115
test/render-copyarea.c | 324 ++
test/render-fill-copy.c | 279 +
test/render-fill.c | 247 +
test/render-trapezoid-image.c | 615 +++
test/render-trapezoid.c | 434 ++
test/test.h | 118
test/test_display.c | 150
test/test_image.c | 217 +
test/test_log.c | 17
test/test_render.c | 149
uxa/uxa-accel.c | 411 --
uxa/uxa-glyphs.c | 10
131 files changed, 66748 insertions(+), 1812 deletions(-)
New commits:
commit d99e1ceb15f0cbe694aae8a3db6d009ff62963ef
Author: Robert Hooker <sarv...@ubuntu.com>
Date: Mon Aug 1 12:22:52 2011 -0400
Bump changelog.
diff --git a/debian/changelog b/debian/changelog
index 38d8be7..61e196d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+xserver-xorg-video-intel (2:2.15.901-1ubuntu1) UNRELEASED; urgency=low
+
+ * Merge from debian-experimental, remaining changes:
+ - 101_copy-fb.patch
+ + Plymouth integration patch
+ - 120_check_privates.patch
+ + Check for null privates pointer on render_dest_picture.
+ - debian/xserver-xorg-video-intel.preinst.in:
+ - debian/xserver-xorg-video-intel.postinst.in:
+ + Remove obsolete /etc/modprobe.d/i915-kms.conf file on upgrades.
+ KMS is the kernel default.
+ * Dropped patches:
+ - 121_fdo-28798-fix.patch (upstream)
+
+ -- Robert Hooker <sarv...@ubuntu.com> Mon, 01 Aug 2011 12:20:10 -0400
+
xserver-xorg-video-intel (2:2.15.901-1) experimental; urgency=low
* Re-enable XvMC.
commit 42c6bd4a49d96e754e59e74fddfd041d21a818f2
Author: Robert Hooker <sarv...@ubuntu.com>
Date: Mon Aug 1 12:12:21 2011 -0400
Drop 121_fdo-28798-fix.patch (upstream)
diff --git a/debian/patches/121_fdo-28798-fix.patch
b/debian/patches/121_fdo-28798-fix.patch
deleted file mode 100644
index 769cca8..0000000
--- a/debian/patches/121_fdo-28798-fix.patch
+++ /dev/null
@@ -1,307 +0,0 @@
-Description: Remove the use of the 3D pipeline for core rendering
-Origin/Author:
http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/commit/?id=855ced5a4eb67e287001ae22cb6489639c548cfa
-Bug: http://bugs.freedesktop.org/show_bug.cgi?id=28798
-Index: xserver-xorg-video-intel-2.14.0/uxa/uxa-accel.c
-===================================================================
---- xserver-xorg-video-intel-2.14.0.orig/uxa/uxa-accel.c 2011-06-28
13:01:38.351466833 +0200
-+++ xserver-xorg-video-intel-2.14.0/uxa/uxa-accel.c 2011-06-28
13:01:35.463452510 +0200
-@@ -36,24 +36,6 @@
- #include "uxa.h"
- #include "mipict.h"
-
--static CARD32
--format_for_depth(int depth)
--{
-- switch (depth) {
-- case 1: return PICT_a1;
-- case 4: return PICT_a4;
-- case 8: return PICT_a8;
-- case 15: return PICT_x1r5g5b5;
-- case 16: return PICT_r5g6b5;
-- default:
-- case 24: return PICT_x8r8g8b8;
--#if XORG_VERSION_CURRENT >= 10699900
-- case 30: return PICT_x2r10g10b10;
--#endif
-- case 32: return PICT_a8r8g8b8;
-- }
--}
--
- static void
- uxa_fill_spans(DrawablePtr pDrawable, GCPtr pGC, int n,
- DDXPointPtr ppt, int *pwidth, int fSorted)
-@@ -61,17 +43,13 @@
- ScreenPtr screen = pDrawable->pScreen;
- uxa_screen_t *uxa_screen = uxa_get_screen(screen);
- RegionPtr pClip = fbGetCompositeClip(pGC);
-- PixmapPtr dst_pixmap, src_pixmap = NULL;
-+ PixmapPtr dst_pixmap;
- BoxPtr pextent, pbox;
- int nbox;
- int extentX1, extentX2, extentY1, extentY2;
- int fullX1, fullX2, fullY1;
- int partX1, partX2;
- int off_x, off_y;
-- xRenderColor color;
-- PictFormatPtr format;
-- PicturePtr dst, src;
-- int error;
-
- if (uxa_screen->swappedOut || uxa_screen->force_fallback)
- goto fallback;
-@@ -83,129 +61,6 @@
- if (!dst_pixmap)
- goto fallback;
-
-- if (pGC->alu != GXcopy || !UXA_PM_IS_SOLID(pDrawable, pGC->planemask))
-- goto solid;
--
-- format = PictureMatchFormat(screen,
-- dst_pixmap->drawable.depth,
--
format_for_depth(dst_pixmap->drawable.depth));
-- dst = CreatePicture(0, &dst_pixmap->drawable, format, 0, 0,
serverClient, &error);
-- if (!dst)
-- goto solid;
--
-- ValidatePicture(dst);
--
-- uxa_get_rgba_from_pixel(pGC->fgPixel,
-- &color.red,
-- &color.green,
-- &color.blue,
-- &color.alpha,
-- format_for_depth(dst_pixmap->drawable.depth));
-- src = CreateSolidPicture(0, &color, &error);
-- if (!src) {
-- FreePicture(dst, 0);
-- goto solid;
-- }
--
-- if (!uxa_screen->info->check_composite(PictOpSrc, src, NULL, dst, 0,
0)) {
-- FreePicture(src, 0);
-- FreePicture(dst, 0);
-- goto solid;
-- }
--
-- if (!uxa_screen->info->check_composite_texture ||
-- !uxa_screen->info->check_composite_texture(screen, src)) {
-- PicturePtr solid;
-- int src_off_x, src_off_y;
--
-- solid = uxa_acquire_solid(screen, src->pSourcePict);
-- FreePicture(src, 0);
-- if (!solid) {
-- FreePicture(dst, 0);
-- goto solid;
-- }
--
-- src = solid;
-- src_pixmap = uxa_get_offscreen_pixmap(src->pDrawable,
-- &src_off_x, &src_off_y);
-- if (!src_pixmap) {
-- FreePicture(src, 0);
-- FreePicture(dst, 0);
-- goto solid;
-- }
-- }
--
-- if (!uxa_screen->info->prepare_composite(PictOpSrc, src, NULL, dst,
src_pixmap, NULL, dst_pixmap)) {
-- FreePicture(src, 0);
-- FreePicture(dst, 0);
-- goto solid;
-- }
--
-- pextent = REGION_EXTENTS(pGC->screen, pClip);
-- extentX1 = pextent->x1;
-- extentY1 = pextent->y1;
-- extentX2 = pextent->x2;
-- extentY2 = pextent->y2;
-- while (n--) {
-- fullX1 = ppt->x;
-- fullY1 = ppt->y;
-- fullX2 = fullX1 + (int)*pwidth;
-- ppt++;
-- pwidth++;
--
-- if (fullY1 < extentY1 || extentY2 <= fullY1)
-- continue;
--
-- if (fullX1 < extentX1)
-- fullX1 = extentX1;
--
-- if (fullX2 > extentX2)
-- fullX2 = extentX2;
--
-- if (fullX1 >= fullX2)
-- continue;
--
-- nbox = REGION_NUM_RECTS(pClip);
-- if (nbox == 1) {
-- uxa_screen->info->composite(dst_pixmap,
-- 0, 0, 0, 0,
-- fullX1 + off_x,
-- fullY1 + off_y,
-- fullX2 - fullX1, 1);
-- } else {
-- pbox = REGION_RECTS(pClip);
-- while (nbox--) {
-- if (pbox->y1 > fullY1)
-- break;
--
-- if (pbox->y1 <= fullY1) {
-- partX1 = pbox->x1;
-- if (partX1 < fullX1)
-- partX1 = fullX1;
--
-- partX2 = pbox->x2;
-- if (partX2 > fullX2)
-- partX2 = fullX2;
--
-- if (partX2 > partX1) {
--
uxa_screen->info->composite(dst_pixmap,
-- 0,
0, 0, 0,
--
partX1 + off_x,
--
fullY1 + off_y,
--
partX2 - partX1, 1);
-- }
-- }
-- pbox++;
-- }
-- }
-- }
--
-- uxa_screen->info->done_composite(dst_pixmap);
-- FreePicture(src, 0);
-- FreePicture(dst, 0);
-- return;
--
--solid:
- if (uxa_screen->info->check_solid &&
- !uxa_screen->info->check_solid(pDrawable, pGC->alu, pGC->planemask))
- goto fallback;
-@@ -1040,7 +895,7 @@
- PixmapPtr pixmap;
- int xoff, yoff;
- int nbox;
-- BoxPtr pBox, extents;
-+ BoxPtr pBox;
- Bool ret = FALSE;
-
- pixmap = uxa_get_offscreen_pixmap(pDrawable, &xoff, &yoff);
-@@ -1051,105 +906,22 @@
-
- nbox = REGION_NUM_RECTS(pRegion);
- pBox = REGION_RECTS(pRegion);
-- extents = REGION_EXTENTS(screen, pRegion);
--
-- /* Using GEM, the relocation costs outweigh the advantages of the
blitter */
-- if (nbox == 1 || (alu != GXcopy && alu != GXclear) ||
!UXA_PM_IS_SOLID(&pixmap->drawable, planemask)) {
--try_solid:
-- if (uxa_screen->info->check_solid &&
-- !uxa_screen->info->check_solid(&pixmap->drawable, alu,
planemask))
-- goto err;
--
-- if (!uxa_screen->info->prepare_solid(pixmap, alu, planemask,
pixel))
-- goto err;
--
-- while (nbox--) {
-- uxa_screen->info->solid(pixmap,
-- pBox->x1, pBox->y1,
-- pBox->x2, pBox->y2);
-- pBox++;
-- }
--
-- uxa_screen->info->done_solid(pixmap);
-- } else {
-- PicturePtr dst, src;
-- PixmapPtr src_pixmap = NULL;
-- xRenderColor color;
-- int error;
--
-- dst = CreatePicture(0, &pixmap->drawable,
-- PictureMatchFormat(screen,
-- pixmap->drawable.depth,
--
format_for_depth(pixmap->drawable.depth)),
-- 0, 0, serverClient, &error);
-- if (!dst)
-- goto err;
--
-- ValidatePicture(dst);
--
-- uxa_get_rgba_from_pixel(pixel,
-- &color.red,
-- &color.green,
-- &color.blue,
-- &color.alpha,
--
format_for_depth(pixmap->drawable.depth));
-- src = CreateSolidPicture(0, &color, &error);
-- if (!src) {
-- FreePicture(dst, 0);
-- goto err;
-- }
-
-- if (!uxa_screen->info->check_composite(PictOpSrc, src, NULL,
dst,
-- extents->x2 -
extents->x1,
-- extents->y2 -
extents->y1)) {
-- FreePicture(src, 0);
-- FreePicture(dst, 0);
-- goto try_solid;
-- }
--
-- if (!uxa_screen->info->check_composite_texture ||
-- !uxa_screen->info->check_composite_texture(screen, src)) {
-- PicturePtr solid;
-- int src_off_x, src_off_y;
--
-- solid = uxa_acquire_solid(screen, src->pSourcePict);
-- FreePicture(src, 0);
-- if (!solid) {
-- FreePicture(dst, 0);
-- goto err;
-- }
--
-- src = solid;
-- src_pixmap = uxa_get_offscreen_pixmap(src->pDrawable,
-- &src_off_x,
&src_off_y);
-- if (!src_pixmap) {
-- FreePicture(src, 0);
-- FreePicture(dst, 0);
-- goto err;
-- }
-- }
--
-- if (!uxa_screen->info->prepare_composite(PictOpSrc, src, NULL,
dst, src_pixmap, NULL, pixmap)) {
-- FreePicture(src, 0);
-- FreePicture(dst, 0);
-- goto err;
-- }
-+ if (uxa_screen->info->check_solid &&
-+ !uxa_screen->info->check_solid(&pixmap->drawable, alu, planemask))
-+ goto err;
-
-- while (nbox--) {
-- uxa_screen->info->composite(pixmap,
-- 0, 0, 0, 0,
-- pBox->x1,
-- pBox->y1,
-- pBox->x2 - pBox->x1,
-- pBox->y2 - pBox->y1);
-- pBox++;
-- }
-+ if (!uxa_screen->info->prepare_solid(pixmap, alu, planemask, pixel))
-+ goto err;
-
-- uxa_screen->info->done_composite(pixmap);
-- FreePicture(src, 0);
-- FreePicture(dst, 0);
-+ while (nbox--) {
-+ uxa_screen->info->solid(pixmap,
-+ pBox->x1, pBox->y1,
-+ pBox->x2, pBox->y2);
-+ pBox++;
- }
-
-+ uxa_screen->info->done_solid(pixmap);
- ret = TRUE;
-
- err:
diff --git a/debian/patches/series b/debian/patches/series
index acb63c7..d890ef3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,3 @@
# Ubuntu patches
101_copy-fb.patch
120_check_privates.patch
-121_fdo-28798-fix.patch
commit 0bb55535c7dfc5ccdc8d19c645e27ce23c63ce53
Author: Julien Cristau <jcris...@debian.org>
Date: Mon Aug 1 01:38:20 2011 +0200
Upload to experimental
diff --git a/debian/changelog b/debian/changelog
index b081992..692093e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xserver-xorg-video-intel (2:2.15.901-1) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.15.901-1) experimental; urgency=low
* Re-enable XvMC.
* New upstream snapshot.
* Build against xserver 1.10.99.x.
- -- Julien Cristau <jcris...@debian.org> Mon, 01 Aug 2011 01:29:49 +0200
+ -- Julien Cristau <jcris...@debian.org> Mon, 01 Aug 2011 01:37:49 +0200
xserver-xorg-video-intel (2:2.15.0-3) unstable; urgency=high
commit f83a65af08081bbcdaee204ff67c9237319c4978
Author: Julien Cristau <jcris...@debian.org>
Date: Mon Aug 1 01:34:51 2011 +0200
Delete symlink that makes dpkg-source unhappy
diff --git a/src/render_program/exa_wm_yuv_rgb.g7a
b/src/render_program/exa_wm_yuv_rgb.g7a
deleted file mode 120000
index d34d246..0000000
--- a/src/render_program/exa_wm_yuv_rgb.g7a
+++ /dev/null
@@ -1 +0,0 @@
-exa_wm_yuv_rgb.g4a
\ No newline at end of file
commit 9d2f70b9d7154d081c520a95370135c2dce9c3e6
Author: Julien Cristau <jcris...@debian.org>
Date: Mon Aug 1 01:31:15 2011 +0200
Build against xserver 1.10.99.x.
diff --git a/debian/changelog b/debian/changelog
index 6715004..b081992 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xserver-xorg-video-intel (2:2.15.901-1) UNRELEASED; urgency=low
* Re-enable XvMC.
* New upstream snapshot.
+ * Build against xserver 1.10.99.x.
-- Julien Cristau <jcris...@debian.org> Mon, 01 Aug 2011 01:29:49 +0200
diff --git a/debian/control b/debian/control
index 927d9cb..89bc58f 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends:
debhelper (>= 8),
dh-autoreconf,
pkg-config,
- xserver-xorg-dev (>= 2:1.9.4),
+ xserver-xorg-dev (>= 2:1.10.99),
x11proto-core-dev,
x11proto-fonts-dev,
x11proto-xinerama-dev,
commit ed2b1ec88480f9e7e18bd24cbb9144fff21a1e02
Author: Julien Cristau <jcris...@debian.org>
Date: Mon Aug 1 01:30:08 2011 +0200
Bump changelogs
diff --git a/ChangeLog b/ChangeLog
index 7128372..66295b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,2477 @@
+commit 7976f5144d42a03ccd027908252a600db2631054
+Author: Chris Wilson <ch...@chris-wilson.co.uk>
+Date: Sat Jul 30 09:21:36 2011 +0100
+
+ NEWS: 2.15.901 snapshot
+
+ Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk>
+
+commit 2cfb703bbe7ec043d443452f4fa94f06b1ff7266
+Author: Chris Wilson <ch...@chris-wilson.co.uk>
+Date: Sat Jul 30 09:23:22 2011 +0100
+
+ Fix typos for distcheck
+
+ Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk>
+
+commit 6f919264da69ed8bce6f2573629d89962a670783
+Author: Chris Wilson <ch...@chris-wilson.co.uk>
+Date: Sat Jul 30 09:00:06 2011 +0100
+
+ sna: Mark the stencil as untiled
+
+ In reality, Mesa will be treating it as W-tiling, only we have no way of
+ communicating that requirement to the kernel (as not only does the
+ kernel not understand W-tiling, but also the GTT is incapable of fencing
+ a W-tiled region.).
+
+ Ported from Chad Versace's 3e55f3e88.
+
+ Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk>
+
+commit 326a84e832c43cc200a32e091b4e60b8b6a4a7c8
+Author: Chris Wilson <ch...@chris-wilson.co.uk>
+Date: Fri Jul 22 11:10:26 2011 +0100
+
+ sna: Port IVB acceleration code (Xrender + Xv)
+
+ Based on the superlative work by Kenneth Graunke and Xiang, Haihao.
+
+ Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk>
+
+commit 10790921570fea21d6b2bcc07a0204ef315c9182
+Author: Chris Wilson <ch...@chris-wilson.co.uk>
+Date: Sat Jul 30 08:46:19 2011 +0100
+
+ sna: Include the pixmap size in the debug info for moving to cpu
+
+ Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk>
+
+commit 5691c8cdec2a5264b8552f096b4a34b97afe4ae5
+Author: Kenneth Graunke <kenn...@whitecape.org>
+Date: Thu Jul 14 10:14:53 2011 -0700
+
+ render: Enable RENDER acceleration on Ivybridge.
+
+ Signed-off-by: Kenneth Graunke <kenn...@whitecape.org>
+ Acked-by: Eric Anholt <e...@anholt.net>
+ Acked-by: Chris Wilson <ch...@chris-wilson.co.uk>
+
+commit 0d92612b2a2782f80196a08eb9a17af906169f18
+Author: Kenneth Graunke <kenn...@whitecape.org>
+Date: Thu Jul 14 00:30:09 2011 -0700
+
+ render: Update pixel shader state for Ivybridge.
+
+ Signed-off-by: Kenneth Graunke <kenn...@whitecape.org>
+ Acked-by: Eric Anholt <e...@anholt.net>
+ Acked-by: Chris Wilson <ch...@chris-wilson.co.uk>
+
+commit 7460ee73d1fd22e6b02ce125f11ac38efff743ce
+Author: Kenneth Graunke <kenn...@whitecape.org>
+Date: Thu Jul 14 00:16:54 2011 -0700
+
+ render: Use Ivybridge variants for 3D pipeline setup.
+
+ Signed-off-by: Kenneth Graunke <kenn...@whitecape.org>
+ Acked-by: Eric Anholt <e...@anholt.net>
+ Acked-by: Chris Wilson <ch...@chris-wilson.co.uk>
+
+commit e3a09608716c1dee2554e8fc26d6f77aeec684bd
+Author: Kenneth Graunke <kenn...@whitecape.org>
+Date: Thu Jul 14 00:04:31 2011 -0700
+
+ render: Refactor to use newly shared pipeline setup code in i965_3d.c.
+
+ Slightly generalize the shared SF and CC code to accomodate both.
+
+ Signed-off-by: Kenneth Graunke <kenn...@whitecape.org>
+ Acked-by: Eric Anholt <e...@anholt.net>
+ Acked-by: Chris Wilson <ch...@chris-wilson.co.uk>
+
+commit 682a690bfeeabae710b1392282163eab35b58eed
+Author: Kenneth Graunke <kenn...@whitecape.org>
+Date: Wed Jul 13 22:52:52 2011 -0700
+
+ Xv: Refactor out pipeline setup functions for future reuse in render.
+
+ While we're at it, make the functions simply take an intel_screen_private
+ pointer directly instead of having to fetch it from ScrnInfoPtr.
+
+ Also coalesce some gen6/gen7 functions that were 98% identical.
+
+ Signed-off-by: Kenneth Graunke <kenn...@whitecape.org>
+ Acked-by: Eric Anholt <e...@anholt.net>
+ Acked-by: Chris Wilson <ch...@chris-wilson.co.uk>
+
+commit 54b3222658a285d26b7800bdc5f8343c918a804e
+Author: Kenneth Graunke <kenn...@whitecape.org>
+Date: Wed Jul 13 22:27:37 2011 -0700
+
+ render: Update 3DPRIMITIVE for Ivybridge.
+
+ Signed-off-by: Kenneth Graunke <kenn...@whitecape.org>
+ Acked-by: Eric Anholt <e...@anholt.net>
+ Acked-by: Chris Wilson <ch...@chris-wilson.co.uk>
+
+commit 4e491a1f6d7a15009904cb79e2c0b13cf2d9d6ec
+Author: Kenneth Graunke <kenn...@whitecape.org>
+Date: Wed Jul 13 22:19:21 2011 -0700
+
+ render: Set Address Modify Enable in 3DSTATE_VERTEX_BUFFERS on Gen7.
+
+ Signed-off-by: Kenneth Graunke <kenn...@whitecape.org>
+ Acked-by: Eric Anholt <e...@anholt.net>
+ Acked-by: Chris Wilson <ch...@chris-wilson.co.uk>
+
+commit 2787cd66f0d2907110f774392370537df63a96fa
+Author: Kenneth Graunke <kenn...@whitecape.org>
+Date: Wed Jul 13 22:10:17 2011 -0700
+
+ render: Update SAMPLER_STATE for Ivybridge.
+
+ Signed-off-by: Kenneth Graunke <kenn...@whitecape.org>
+ Acked-by: Eric Anholt <e...@anholt.net>
+ Acked-by: Chris Wilson <ch...@chris-wilson.co.uk>
+
+commit 1a7e541d0d33727953fa69f1e29fa4eda665a0d9
+Author: Kenneth Graunke <kenn...@whitecape.org>
+Date: Wed Jul 13 21:53:27 2011 -0700
+
+ render: Update SURFACE_STATE for Ivybridge.
+
+ Signed-off-by: Kenneth Graunke <kenn...@whitecape.org>
+ Acked-by: Eric Anholt <e...@anholt.net>
+ Acked-by: Chris Wilson <ch...@chris-wilson.co.uk>
+
+commit 07cc488bcf3f7653cd54928e3cedb1f4f102c5e0
+Author: Kenneth Graunke <kenn...@whitecape.org>
+Date: Sat Jul 9 01:36:52 2011 -0700
+
+ render: New Ivybridge assembly programs for render acceleration.
+
+ These are exactly the same as the ones for Sandybridge, but with message
+ registers translated (hopefully) in the same way as Haihao's new
+ programs (m1 == g65).
+
+ Signed-off-by: Kenneth Graunke <kenn...@whitecape.org>
+ Acked-by: Eric Anholt <e...@anholt.net>
+ Acked-by: Chris Wilson <ch...@chris-wilson.co.uk>
+
+commit 1b9e82b4b59dd50c1b057f58d71d5c04dcc648a7
+Author: Chris Wilson <ch...@chris-wilson.co.uk>
+Date: Tue Jul 26 08:29:36 2011 +0100
+
+ sna: Revert enabling scan-line wait on SNB
+
+ Hanging the machine does indeed prevent video tearing. Just not quite
+ what the user expected...
+
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=39497
+ Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk>
+
+commit 6dbbb74bde034f5f00aee0396ccd1e03a6625fbd
+Author: Chris Wilson <ch...@chris-wilson.co.uk>
+Date: Sat Jul 16 14:05:54 2011 +0100
+
+ sna: Enable gen6 scan-line waiting
+
+ The code was ready and waiting, just forgot to turn it on.
+
+ Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk>
+
+commit 3e55f3e88b40471706d5cd45c4df4010f8675c75
+Author: Chad Versace <c...@chad-versace.us>
+Date: Mon Jul 18 00:38:00 2011 -0700
+
+ dri: Do not tile stencil buffer
+
+ Until now, the stencil buffer was allocated as a Y tiled buffer, because
+ in several locations the PRM states that it is. However, it is actually
+ W tiled. From the PRM, 2011 Sandy Bridge, Volume 1, Part 2, Section
+ 4.5.2.1 W-Major Format:
+ W-Major Tile Format is used for separate stencil.
+
+ The GTT is incapable of W fencing, so we allocate the stencil buffer with
+ I915_TILING_NONE and decode the tile's layout in software.
+
+ This commit mutually depends on the mesa commit:
+ intel: Fix stencil buffer to be W tiled
+ Author: Chad Versace <c...@chad-versace.us>
+ Date: Mon Jul 18 00:37:45 2011 -0700
+
+ Signed-off-by: Chad Versace <c...@chad-versace.us>
+ Reviewed-by: Ian Romanick <ian.roman...@intel.com>
+ Acked-by: Kenneth Graunke <kenn...@whitecape.org>
+
+commit 212fa9868767637e8f430485eeb522c99e63fd16
+Author: Chris Wilson <ch...@chris-wilson.co.uk>
+Date: Wed Jul 13 21:11:14 2011 +0100
+
+ Disable adding normal RTF modes for an eDP
+
+ This is causing a hard hang with 2.6.39+, we don't know why so play safe
+ and disable for the time being.
+
+ References: https://bugs.freedesktop.org/show_bug.cgi?id=38012
+ Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk>
+
+commit 7a695c9f6b919eba8785d62094526762ba2a0449
+Author: Chris Wilson <ch...@chris-wilson.co.uk>
+Date: Wed Jul 13 10:57:13 2011 +0100
+
+ sna: Fast-path single span boxes
+
+ These are very common when compositing unclipped trapezoids, and the
+ majority of the overhead is in handling the arbitrary number of boxes
+ and misses out on the constant folding the compiler can do if it is
+ known we have just one box.
+
+ Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk>
+
+commit 0190964906ad878d469d6021c10cde4e7f5799c3
+Author: Chris Wilson <ch...@chris-wilson.co.uk>
+Date: Wed Jul 13 10:26:44 2011 +0100
+
+ sna/damage: Avoid testing against a completey damaged region
+
+ Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk>
+
+commit b929717c89352d4b47dc2b9ce58e26fbbf327201
+Author: Chris Wilson <ch...@chris-wilson.co.uk>
+Date: Wed Jul 13 09:49:09 2011 +0100
+
+ sna/gen3: Tune emit_spans_primitive_constant
+
+ Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk>
+
+commit fbdbfaf38d4da5204750d91cf5a3f43307a6ac33
+Author: Chris Wilson <ch...@chris-wilson.co.uk>
+Date: Wed Jul 13 17:38:41 2011 +0100
+
+ sna/glyphs: Discard GLYPH_PICTURE hint if the glyph doesn't fit into the
cache
+
+ If the glyph is too big to fit into the cache, than ideally we do want
+ to keep an associated GPU bo around for future use. As it is too large
+ to fit into the cache, it of reasonable size and there is little wastage
+ in allocating indiviual GPU bo for each oversized glyph.
+
+ Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk>
+
+commit 12f52530db1727e2f835e55dc922e5efaf4d3a16
+Author: Chris Wilson <ch...@chris-wilson.co.uk>
+Date: Wed Jul 13 17:38:22 2011 +0100
+
+ sna: Add some extra debugging to the texture upload fallback paths
+
+ Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk>
+
+commit a861094c23b5f0df7b889bcc03904e32c4c2c6be
+Author: Chris Wilson <ch...@chris-wilson.co.uk>
+Date: Tue Jul 12 20:17:00 2011 +0100
+
+ sna/dri: Fix a couple of typos
+
+ Somehow these were lost in the rebasing.
+
+ Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk>
+
+commit c221d0356db57c10f5d29ca17fdf592724b35385
+Author: Chris Wilson <ch...@chris-wilson.co.uk>
+Date: Tue Jul 12 15:39:42 2011 +0100
+
+ sna/dri: Remove the unused id/type members for Resource tracking
+
+ ...and reduce it to a simple list.
+
+ Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk>
+
+commit 644b1a903301531e1fb59f27952c15e87888c4c6
+Author: Chris Wilson <ch...@chris-wilson.co.uk>
+Date: Tue Jul 12 11:50:24 2011 +0100
+
+ dri: Always initialise resource members of DRI2FrameEvent
+
+ As we now attempt to always decouple the lists upon freeing the frame
+ event, we need to initialise them along all code paths.
+
+ Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk>
+
+commit 32f42358140ee812984149ae52b0df3dfd1778c3
+Author: Chris Wilson <ch...@chris-wilson.co.uk>
+Date: Mon Jul 11 20:29:53 2011 +0100
+
+ sna/dri: Add some simple debugging
+
+ Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk>
+
+commit a46598220ebf5d4e629e1e0a7baf47ce144ed2c8
+Author: Chris Wilson <ch...@chris-wilson.co.uk>
+Date: Mon Jul 11 14:40:30 2011 +0100
+
+ sna/dri: Refactor common code for assigning a pixmap to the DRI2 buffer
+
+ Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk>
+
+commit 7538be3315b8683b05e8f6b22023baadcc0bc4da
+Author: Chris Wilson <ch...@chris-wilson.co.uk>
+Date: Mon Jul 11 10:50:36 2011 +0100
+
+ dri: Enable triple-bufferred pageflips
+
+ By popular demand.
+
+ Triple-buffering trade-offs output latency versus jitter. By having a
+ pre-rendered frame ready to swap in following a pageflip, we avoid the
+ scenario where the latency between receiving the flip complete signal
+ from the kernel, waking up the vsynced application, it render the new
+ frame and then for the server to process the swap request is greater
+ than the frame interval, causing us to miss the vblank. The result is
+ that application can become frame-locked to 30fps. Instead, we report to
+ the application that the first frame swap is immediately completed,
+ supply a new back buffer (or else the rendering would be blocked on
+ waiting for the front-buffer to be swapped away from the scanout) and
+ let them proceed to render the second frame. The second frame is added
+ to the swap queue, and the client throttled to vrefresh. (If the client
+ missed the vblank, the swap queue is empty and the client is immediately
+ woken again, whilst the pageflip is pending.)
+
+ Note, for practical reasons this only applies to page-flipping, for
+ example, calls to glXSwapBuffer() on fullscreen applications.
+
+ Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk>
+
+commit 2608a367acba7247e50754c3daeed09ba2e97d05
+Author: Chris Wilson <ch...@chris-wilson.co.uk>
+Date: Mon Jul 11 16:28:15 2011 +0100
+
+ dri: Prevent abuse of the Resource database
+
+ The Resource database is only designed to store a single value for a
+ particular type associated with an XID. Due to the asynchronous nature
+ of the vblank/flip requests, we would often associate multiple frame
+ events with a particular drawable/client. Upon freeing the resource, we
+ would not necessarily decouple the right value, leaving a stale pointer
+ behind. Later when the client disappeared, we would write through that
+ stale pointer upsetting valgrind and causing memory corruption. MDK.
+
+ Instead, we need to implement an extra layer for tracking multiple
+ frames within a single Resource.
+
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=37700
+ Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk>
+
+commit ab1000821ae881a301fb0e1f2210493ec383e681
+Author: Chris Wilson <ch...@chris-wilson.co.uk>
+Date: Sat Jul 9 19:44:26 2011 +0100
+
+ dri: Remove the shadow copy of attachment
+
+ Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk>
+
+commit 9f22ea7ca440c788f8104647356393c96c62d155
+Author: Chris Wilson <ch...@chris-wilson.co.uk>
+Date: Sat Jul 9 14:54:33 2011 +0100
+
+ sna: Clamp results for computing BoxRec coords from xRectangle
+
+ As the width/height in the rectangle is specified as uint16_t, the
+ result may be larger than is storagable in the int16_t of the box. Of
+ course it would take a really inane client to do attempt to draw
+ something much larger than the largest possible surface... Is it strange
+ that first example I've found to do so is a Java application?
+
+ Reported-by: Nicolas Kalkhof <nkalk...@web.de>
+ Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk>
+
+commit f4c5dc88171435aa04a5d99372913120cdafe92b
+Author: Chris Wilson <ch...@chris-wilson.co.uk>
+Date: Sat Jul 9 14:17:24 2011 +0100
+
+ sna/accel: Fix fallback for depth=1 copy
+
+ A little carelessness with passing down the offsets caused us to
+ incorrectly copy depth=1 bitmaps, as exemplified by gkrellm.
+
+ Reported-by: Nicolas Kalkhof <nkalk...@web.de>
+ Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk>
+
+commit 649ebcef0938c7cde4f3172a639d39488454999a
+Author: Chris Wilson <ch...@chris-wilson.co.uk>
+Date: Fri Jul 8 17:44:58 2011 +0100
+
+ sna: A buffer only needs a flush if it remains dirty at the end of the
batch
+
+ Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk>
+
+commit 625e37b317e4d237bdc9f80d7ab86b5d2badddc7
+Author: Chris Wilson <ch...@chris-wilson.co.uk>
+Date: Fri Jul 8 18:58:32 2011 +0100
+
+ sna/gen3: So we also need to ensure stippling is cleared...
+
+ My theory that we used nothing that invoked polygon stippling proved
+ baseless.
+
+ Fixes regression from 3b5971bd2359383cb8326702d80e03bc15d34c69
+
+ Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk>
+
+commit 1e2cae0ab339e477929e429f8ff31b11fcaf2cbf
+Author: Chris Wilson <ch...@chris-wilson.co.uk>
+Date: Fri Jul 8 09:54:43 2011 +0100
+
+ sna/gen3: Restore disabling the use of stencil/fog in the invariant
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1qnvjg-0007gv...@vasks.debian.org
