xserver-xorg-video-intel: Changes to 'debian-unstable'
.gitignore | 83
COPYING | 169
ChangeLog | 5983 +++++++++++-
Makefile.am | 14
NEWS | 356
README | 2
configure.ac | 161
debian/changelog | 47
debian/control | 11
debian/copyright | 37
debian/rules | 2
debian/xserver-xorg-video-intel-dbg.install | 1
m4/dolt.m4 | 178
m4/shave.m4 | 73
man/Makefile.am | 41
man/intel.man | 257
shave-libtool.in | 69
shave.in | 76
src/.gitignore | 6
src/Makefile.am | 102
src/bios_reader/.gitignore | 3
src/bios_reader/Makefile.am | 16
src/bios_reader/bios_dumper.c | 104
src/bios_reader/bios_reader.c | 565 -
src/bios_reader/swf_dumper.c | 110
src/ch7017/Makefile.am | 16
src/ch7017/ch7017.c | 330
src/ch7017/ch7017_module.c | 36
src/ch7017/ch7017_reg.h | 162
src/ch7xxx/Makefile.am | 17
src/ch7xxx/ch7xxx.c | 323
src/ch7xxx/ch7xxx.h | 31
src/ch7xxx/ch7xxx_module.c | 35
src/ch7xxx/ch7xxx_reg.h | 80
src/common.h | 240
src/drmmode_display.c | 622 -
src/i2c_vid.h | 132
src/i810.h | 341
src/i810_accel.c | 617 -
src/i810_common.h | 191
src/i810_cursor.c | 266
src/i810_dga.c | 282
src/i810_dri.c | 1541 ---
src/i810_dri.h | 131
src/i810_driver.c | 2430 ----
src/i810_hwmc.c | 419
src/i810_io.c | 133
src/i810_memory.c | 428
src/i810_reg.h | 3443 ------
src/i810_ring.h | 90
src/i810_video.c | 1424 --
src/i810_wmark.c | 313
src/i830.h | 986 -
src/i830_3d.c | 403
src/i830_accel.c | 237
src/i830_batchbuffer.c | 241
src/i830_batchbuffer.h | 167
src/i830_bios.c | 401
src/i830_bios.h | 632 -
src/i830_common.h | 241
src/i830_crt.c | 557 -
src/i830_cursor.c | 307
src/i830_debug.c | 2540 -----
src/i830_debug.h | 34
src/i830_display.c | 2367 ----
src/i830_display.h | 43
src/i830_dri.c | 443
src/i830_dri.h | 61
src/i830_driver.c | 3220 ------
src/i830_dvo.c | 521 -
src/i830_hdmi.c | 368
src/i830_hwmc.c | 177
src/i830_hwmc.h | 114
src/i830_i2c.c | 392
src/i830_io.c | 35
src/i830_lvds.c | 1627 ---
src/i830_memory.c | 1721 ---
src/i830_modes.c | 69
src/i830_quirks.c | 430
src/i830_reg.h | 100
src/i830_render.c | 1302 +-
src/i830_ring.h | 93
src/i830_sdvo.c | 2440 ----
src/i830_sdvo.h | 29
src/i830_sdvo_regs.h | 726 -
src/i830_tv.c | 2042 ----
src/i830_uxa.c | 766 -
src/i830_video.c | 2836 -----
src/i830_video.h | 91
src/i915_3d.c | 147
src/i915_3d.h | 864 +
src/i915_hwmc.c | 884 -
src/i915_hwmc.h | 61
src/i915_reg.h | 185
src/i915_render.c | 1709 ++-
src/i915_video.c | 806 -
src/i965_hwmc.c | 292
src/i965_hwmc.h | 28
src/i965_reg.h | 241
src/i965_render.c | 3046 +++---
src/i965_video.c | 1934 +--
src/intel.h | 662 +
src/intel_batchbuffer.c | 280
src/intel_batchbuffer.h | 210
src/intel_dri.c | 1083 ++
src/intel_driver.c | 1266 ++
src/intel_driver.h | 262
src/intel_hwmc.c | 260
src/intel_hwmc.h | 75
src/intel_memory.c | 299
src/intel_module.c | 475
src/intel_transform.c | 92
src/intel_transform.h | 14
src/intel_uxa.c | 1133 ++
src/intel_video.c | 1769 +++
src/intel_video.h | 87
src/ivch/Makefile.am | 16
src/ivch/ivch.c | 373
src/ivch/ivch_module.c | 64
src/ivch/ivch_reg.h | 291
src/legacy/Makefile.am | 18
src/legacy/README | 6
src/legacy/i810/Makefile.am | 35
src/legacy/i810/i810.h | 335
src/legacy/i810/i810_accel.c | 617 +
src/legacy/i810/i810_common.h | 323
src/legacy/i810/i810_cursor.c | 266
src/legacy/i810/i810_dga.c | 258
src/legacy/i810/i810_dri.c | 1544 +++
src/legacy/i810/i810_dri.h | 131
src/legacy/i810/i810_driver.c | 2117 ++++
src/legacy/i810/i810_hwmc.c | 419
src/legacy/i810/i810_io.c | 133
src/legacy/i810/i810_memory.c | 428
src/legacy/i810/i810_reg.h | 3194 ++++++
src/legacy/i810/i810_ring.h | 90
src/legacy/i810/i810_video.c | 1423 ++
src/legacy/i810/i810_wmark.c | 313
src/legacy/i810/xvmc/I810XvMC.c | 4509 +++++++++
src/legacy/i810/xvmc/I810XvMC.h | 366
src/legacy/i810/xvmc/Makefile.am | 11
src/legacy/legacy.h | 7
src/legacy/ums/Makefile.am | 161
src/legacy/ums/brw_defines.h | 874 +
src/legacy/ums/brw_structs.h | 1469 ++
src/legacy/ums/ch7017/Makefile.am | 10
src/legacy/ums/ch7017/ch7017.c | 324
src/legacy/ums/ch7017/ch7017_module.c | 36
src/legacy/ums/ch7017/ch7017_reg.h | 162
src/legacy/ums/ch7xxx/Makefile.am | 11
src/legacy/ums/ch7xxx/ch7xxx.c | 317
src/legacy/ums/ch7xxx/ch7xxx.h | 31
src/legacy/ums/ch7xxx/ch7xxx_module.c | 35
src/legacy/ums/ch7xxx/ch7xxx_reg.h | 80
src/legacy/ums/ivch/Makefile.am | 10
src/legacy/ums/ivch/ivch.c | 368
src/legacy/ums/ivch/ivch_module.c | 64
src/legacy/ums/ivch/ivch_reg.h | 291
src/legacy/ums/render_programs/exa_sf.g4a | 107
src/legacy/ums/render_programs/exa_sf.g4b | 15
src/legacy/ums/render_programs/exa_sf_mask.g4a | 107
src/legacy/ums/render_programs/exa_sf_mask.g4b | 15
src/legacy/ums/render_programs/exa_wm.g4i | 156
src/legacy/ums/render_programs/exa_wm_affine.g4i | 44
src/legacy/ums/render_programs/exa_wm_ca.g4a | 38
src/legacy/ums/render_programs/exa_wm_ca.g4b | 4
src/legacy/ums/render_programs/exa_wm_ca_srcalpha.g4a | 37
src/legacy/ums/render_programs/exa_wm_ca_srcalpha.g4b | 4
src/legacy/ums/render_programs/exa_wm_mask_affine.g4a | 41
src/legacy/ums/render_programs/exa_wm_mask_affine.g4b | 8
src/legacy/ums/render_programs/exa_wm_mask_projective.g4a | 53
src/legacy/ums/render_programs/exa_wm_mask_projective.g4b | 16
src/legacy/ums/render_programs/exa_wm_mask_sample_a.g4a | 48
src/legacy/ums/render_programs/exa_wm_mask_sample_a.g4b | 2
src/legacy/ums/render_programs/exa_wm_mask_sample_argb.g4a | 48
src/legacy/ums/render_programs/exa_wm_mask_sample_argb.g4b | 2
src/legacy/ums/render_programs/exa_wm_noca.g4a | 38
src/legacy/ums/render_programs/exa_wm_noca.g4b | 4
src/legacy/ums/render_programs/exa_wm_nomask.g4a | 143
src/legacy/ums/render_programs/exa_wm_projective.g4i | 51
src/legacy/ums/render_programs/exa_wm_src_affine.g4a | 45
src/legacy/ums/render_programs/exa_wm_src_affine.g4b | 8
src/legacy/ums/render_programs/exa_wm_src_projective.g4a | 49
src/legacy/ums/render_programs/exa_wm_src_projective.g4b | 16
src/legacy/ums/render_programs/exa_wm_src_sample_a.g4a | 47
src/legacy/ums/render_programs/exa_wm_src_sample_a.g4b | 2
src/legacy/ums/render_programs/exa_wm_src_sample_argb.g4a | 47
src/legacy/ums/render_programs/exa_wm_src_sample_argb.g4b | 2
src/legacy/ums/render_programs/exa_wm_src_sample_planar.g4a | 65
src/legacy/ums/render_programs/exa_wm_src_sample_planar.g4b | 4
src/legacy/ums/render_programs/exa_wm_write.g4a | 74
src/legacy/ums/render_programs/exa_wm_write.g4b | 18
src/legacy/ums/render_programs/exa_wm_xy.g4a | 52
src/legacy/ums/render_programs/exa_wm_xy.g4b | 4
src/legacy/ums/render_programs/exa_wm_yuv_rgb.g4a | 98
src/legacy/ums/render_programs/exa_wm_yuv_rgb.g4b | 12
src/legacy/ums/render_programs/packed_yuv_sf.g4a | 45
src/legacy/ums/render_programs/packed_yuv_sf.g4b | 17
src/legacy/ums/render_programs/packed_yuv_wm.g4a | 221
src/legacy/ums/render_programs/packed_yuv_wm.g4b | 79
src/legacy/ums/sil164/Makefile.am | 11
src/legacy/ums/sil164/sil164.c | 264
src/legacy/ums/sil164/sil164.h | 31
src/legacy/ums/sil164/sil164_module.c | 38
src/legacy/ums/sil164/sil164_reg.h | 60
src/legacy/ums/tfp410/Makefile.am | 11
src/legacy/ums/tfp410/tfp410.c | 286
src/legacy/ums/tfp410/tfp410.h | 33
src/legacy/ums/tfp410/tfp410_module.c | 38
src/legacy/ums/tfp410/tfp410_reg.h | 91
src/legacy/ums/ums.h | 1021 ++
src/legacy/ums/ums_accel.c | 284
src/legacy/ums/ums_batchbuffer.c | 204
src/legacy/ums/ums_batchbuffer.h | 160
src/legacy/ums/ums_bios.c | 406
src/legacy/ums/ums_bios.h | 632 +
src/legacy/ums/ums_common.h | 190
src/legacy/ums/ums_crt.c | 557 +
src/legacy/ums/ums_cursor.c | 321
src/legacy/ums/ums_debug.c | 1903 +++
src/legacy/ums/ums_debug.h | 33
src/legacy/ums/ums_display.c | 2428 ++++
src/legacy/ums/ums_display.h | 42
src/legacy/ums/ums_dri.c | 1441 ++
src/legacy/ums/ums_dri.h | 63
src/legacy/ums/ums_driver.c | 3096 ++++++
src/legacy/ums/ums_drmmode_display.c | 1364 ++
src/legacy/ums/ums_dvo.c | 521 +
src/legacy/ums/ums_exa.c | 468
src/legacy/ums/ums_hdmi.c | 368
src/legacy/ums/ums_hwmc.c | 159
src/legacy/ums/ums_hwmc.h | 113
src/legacy/ums/ums_i2c.c | 392
src/legacy/ums/ums_i2c_vid.h | 132
src/legacy/ums/ums_i810_reg.h | 3444 ++++++
src/legacy/ums/ums_i830_3d.c | 251
src/legacy/ums/ums_i830_common.h | 242
src/legacy/ums/ums_i830_reg.h | 747 +
src/legacy/ums/ums_i830_render.c | 807 +
src/legacy/ums/ums_i915_3d.c | 111
src/legacy/ums/ums_i915_3d.h | 435
src/legacy/ums/ums_i915_hwmc.c | 890 +
src/legacy/ums/ums_i915_reg.h | 873 +
src/legacy/ums/ums_i915_render.c | 722 +
src/legacy/ums/ums_i915_video.c | 417
src/legacy/ums/ums_i965_hwmc.c | 320
src/legacy/ums/ums_i965_hwmc.h | 25
src/legacy/ums/ums_i965_render.c | 1725 +++
src/legacy/ums/ums_i965_video.c | 1180 ++
src/legacy/ums/ums_io.c | 131
src/legacy/ums/ums_lvds.c | 1513 +++
src/legacy/ums/ums_memory.c | 1717 +++
src/legacy/ums/ums_modes.c | 69
src/legacy/ums/ums_quirks.c | 424
src/legacy/ums/ums_ring.h | 93
src/legacy/ums/ums_sdvo.c | 2443 ++++
src/legacy/ums/ums_sdvo.h | 29
src/legacy/ums/ums_sdvo_regs.h | 726 +
src/legacy/ums/ums_tv.c | 2042 ++++
src/legacy/ums/ums_video.c | 2970 +++++
src/legacy/ums/ums_video.h | 93
src/legacy/ums/ums_xaa.c | 230
src/reg_dumper/.gitignore | 7
src/reg_dumper/Makefile.am | 62
src/reg_dumper/audio.c | 454
src/reg_dumper/gtt.c | 118
src/reg_dumper/hotplug.c | 148
src/reg_dumper/idle.c | 227
src/reg_dumper/lid.c | 146
src/reg_dumper/main.c | 107
src/reg_dumper/reg_dumper.h | 87
src/reg_dumper/statuspage.c | 81
src/reg_dumper/stepping.c | 137
src/reg_dumper/util.c | 83
src/reg_dumper/xprintf.c | 60
src/sil164/Makefile.am | 17
src/sil164/sil164.c | 270
src/sil164/sil164.h | 31
src/sil164/sil164_module.c | 38
src/sil164/sil164_reg.h | 60
src/tfp410/Makefile.am | 17
src/tfp410/tfp410.c | 292
src/tfp410/tfp410.h | 33
src/tfp410/tfp410_module.c | 38
src/tfp410/tfp410_reg.h | 91
src/xvmc/.gitignore | 6
src/xvmc/I810XvMC.c | 4509 ---------
src/xvmc/I810XvMC.h | 366
src/xvmc/Makefile.am | 16
src/xvmc/dri2.c | 301
src/xvmc/dri2.h | 70
src/xvmc/i915_program.h | 146
src/xvmc/i915_structs.h | 1406 +-
src/xvmc/i915_xvmc.c | 3460 ++----
src/xvmc/i915_xvmc.h | 66
src/xvmc/i965_xvmc.c | 1185 +-
src/xvmc/i965_xvmc.h | 2
src/xvmc/intel_batchbuffer.c | 174
src/xvmc/intel_batchbuffer.h | 5
src/xvmc/intel_xvmc.c | 1306 +-
src/xvmc/intel_xvmc.h | 271
src/xvmc/intel_xvmc_dump.c | 211
src/xvmc/shader/mc/Makefile.am | 1
src/xvmc/shader/vld/Makefile.am | 6
src/xvmc/xvmc_vld.c | 1719 +--
src/xvmc/xvmc_vld.h | 1
uxa/Makefile.am | 5
uxa/uxa-accel.c | 1977 ++-
uxa/uxa-glyphs.c | 1752 ++-
uxa/uxa-priv.h | 462
uxa/uxa-render.c | 2718 +++--
uxa/uxa-unaccel.c | 572 -
uxa/uxa.c | 674 -
uxa/uxa.h | 939 -
314 files changed, 95012 insertions(+), 66626 deletions(-)
New commits:
commit fbc7f3bffa8d4e6a58b2a7e4cf4a4e8d5049f7b5
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Aug 24 21:00:41 2010 +0200
Changelog update
diff --git a/ChangeLog b/ChangeLog
index f8797db..5776d63 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,27 @@
+commit a69c7e3817ee63afe31e6a1874e84ec03d944cd4
+Author: Julien Cristau <jcristau@debian.org>
+Date: Tue Aug 24 20:36:40 2010 +0200
+
+ legacy/ums: fix distcheck
+
+ Signed-off-by: Julien Cristau <jcristau@debian.org>
+
+commit 22e5830d3a60f25cbbab6976a8effaa2c843a804
+Author: Daniel Vetter <daniel.vetter@ffwll.ch>
+Date: Wed Oct 14 18:09:08 2009 +0200
+
+ legacy/ums/Xv overlay: fix planar YUV copy for right rotated crtcs
+
+ While copying and rotating the buffer, array access was out of bounds when
+ rotated to the right (RR_Rotate_270). My buffer handling changes probably
+ made this bug much more likely to actually result in a SIGSEGV.
+
+ I've checked the logs and the bug exists since rotation has been supported,
+ i.e. this looks like a candidate for cherry-picking for all supported
+ releases.
+
+ Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
+
commit 352016d2da69bfc998a642132ab722940899ad2e
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sat Jul 24 23:08:20 2010 +0100
commit a69c7e3817ee63afe31e6a1874e84ec03d944cd4
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Aug 24 20:36:40 2010 +0200
legacy/ums: fix distcheck
Signed-off-by: Julien Cristau <jcristau@debian.org>
diff --git a/src/legacy/ums/Makefile.am b/src/legacy/ums/Makefile.am
index 057da34..4c6afdb 100644
--- a/src/legacy/ums/Makefile.am
+++ b/src/legacy/ums/Makefile.am
@@ -30,10 +30,9 @@ UMS_DRI_SRCS = \
ums_dri.h
UMS_XVMC_SRCS = \
- ums_i830_hwmc.h \
- ums_i830_hwmc.c \
+ ums_hwmc.c \
+ ums_hwmc.h \
ums_i915_hwmc.c \
- ums_i915_hwmc.h \
ums_i965_hwmc.c \
ums_i965_hwmc.h
@@ -72,6 +71,7 @@ liblegacy_ums_la_SOURCES = \
ums_video.h \
ums_video.c \
ums_xaa.c \
+ ums_i810_reg.h \
ums_i830_common.h \
ums_i830_reg.h \
ums_i830_3d.c \
diff --git a/src/legacy/ums/i965_hwmc.h b/src/legacy/ums/i965_hwmc.h
deleted file mode 100644
index dafd18d..0000000
--- a/src/legacy/ums/i965_hwmc.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#define I965_MC_STATIC_BUFFER_SIZE (1024*512)
-#define I965_MAX_SURFACES 32
-struct _i830_memory;
-struct drm_memory_block {
- struct _i830_memory *buffer;
- drm_handle_t handle;
- drmAddress ptr;
- size_t size;
- unsigned long offset;
-};
-
-struct i965_xvmc_surface {
- struct drm_memory_block buffer;
- unsigned int no;
- void *handle;
-};
-
-struct i965_xvmc_context {
- struct _intel_xvmc_common comm;
- struct drm_memory_block static_buffer;
- struct drm_memory_block blocks;
- struct i965_xvmc_surface *surfaces[I965_MAX_SURFACES];
- unsigned int is_g4x:1;
- unsigned int is_965_q:1;
-};
diff --git a/src/legacy/ums/ums_i965_hwmc.h b/src/legacy/ums/ums_i965_hwmc.h
new file mode 100644
index 0000000..dafd18d
--- /dev/null
+++ b/src/legacy/ums/ums_i965_hwmc.h
@@ -0,0 +1,25 @@
+#define I965_MC_STATIC_BUFFER_SIZE (1024*512)
+#define I965_MAX_SURFACES 32
+struct _i830_memory;
+struct drm_memory_block {
+ struct _i830_memory *buffer;
+ drm_handle_t handle;
+ drmAddress ptr;
+ size_t size;
+ unsigned long offset;
+};
+
+struct i965_xvmc_surface {
+ struct drm_memory_block buffer;
+ unsigned int no;
+ void *handle;
+};
+
+struct i965_xvmc_context {
+ struct _intel_xvmc_common comm;
+ struct drm_memory_block static_buffer;
+ struct drm_memory_block blocks;
+ struct i965_xvmc_surface *surfaces[I965_MAX_SURFACES];
+ unsigned int is_g4x:1;
+ unsigned int is_965_q:1;
+};
commit 0b1877bdf5060be81d526e136d85a415b981cd41
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Aug 24 18:03:56 2010 +0200
Update changelogs
diff --git a/ChangeLog b/ChangeLog
index bd36be7..f8797db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,296 @@
+commit 352016d2da69bfc998a642132ab722940899ad2e
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sat Jul 24 23:08:20 2010 +0100
+
+ legacy/ums: Don't use uninitialised methods for synchronisation
+
+ Fixes https://bugs.freedesktop.org/show_bug.cgi?id=29153
+
+commit e90446967b34013cf74bc9c6aa502261dddf1933
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Thu Jul 15 11:31:32 2010 +0100
+
+ legacy/ums: #include <drm.h>
+
+commit 7865828182d094b0e9b3706dc4a6ea17e3b09ba7
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Tue Jul 13 17:50:59 2010 +0100
+
+ legacy/ums/dri: Enable framebuffer mapping for dri
+
+commit 381a69364cd74e66554454567efb8b71ceb50819
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Tue Jul 13 08:57:13 2010 +0100
+
+ legacy/ums/i965: we do not handle SourcePictures
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit cc6467a4fce031143a5be5500c25d8210bc4d29e
+Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
+Date: Tue Jul 13 17:36:25 2010 +1000
+
+ legacy/ums: Fix build with DRI disabled
+
+commit 3c28c879e2f26265a50129d558b3aee261956f77
+Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
+Date: Tue Jul 13 17:15:00 2010 +1000
+
+ legacy/ums: Re-add missing HWS initialisation
+
+commit 8ea8567cb2d45c8b2f2ba8b8893a112c1068e753
+Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
+Date: Mon Jul 12 14:33:46 2010 +1000
+
+ ums: ChangeGC changed prototype in 1.8.99, not 1.7.98
+
+commit b0f7f8744aea54086d86936031d14c47b92854da
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sun Jun 20 19:18:04 2010 +0100
+
+ Reintegrate legacy UMS.
+
+ As downstream still carries our old UMS driver in order to workaround
+ the catastrophic incoherency issues that currently plague the earlier
+ i8xx chipsets when trying to use GEM, it makes sense to integrate their
+ work into the main repository so that their fixes are shared and
+ available for all users.
+
+ This combines the EXA code from 2.6 with the most recent updates through
+ to 2.9 when the UMS code was removed and the distributions were forced
+ to fork.
+
+commit 1cca56f9c8439e4ae2016d7ed5e415a690f80a66
+Author: Keith Packard <keithp@keithp.com>
+Date: Thu Jul 1 09:56:40 2010 -0400
+
+ Destroy screen pixmap on screen close.
+
+ This avoids a memory leak on server reset.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ [ickle: Added comments from Keith that explain the necessity of
+ destroying the pixmap ourselves and why chaining up in this instance is
+ not the correct approach.]
+ Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 5ce3f536b7169a1ee9eadf830e61bab230dd7239
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri Jul 9 14:06:43 2010 +0100
+
+ drmmode: Destroy the output on shutdown
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 6ff369cd2602497ee11273b50f76d1a7bf25991d
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri Jul 9 14:00:31 2010 +0100
+
+ drmmode: Destroy Crtc on screen shutdown
+
+ Should fix:
+
+ Bug 26946 - CRTC cursor BO leak in 2D
+ https://bugs.freedesktop.org/show_bug.cgi?id=26946
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 6fba8c449f61341a98a5ae8d97effa6fd0610fd4
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri Jul 9 12:12:13 2010 +0100
+
+ Add support for I854.
+
+ I spotted that the kernel knew of the I854, but the pci-id was never
+ added to the ddx.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 141e88c8730a099a6ca5eab1350c2e53a680cb0d
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri Jul 9 12:11:07 2010 +0100
+
+ video: forgotten amendment to previous commit.
+
+ An extra sanity check to skip the wait if all clipped...
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 272d1c14a39c32ade39b5a8b080a891f2b3d6e8e
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri Jul 9 10:41:19 2010 +0100
+
+ video: apply the crtc box checks from dri.
+
+ The dri code is much more careful in ensuring that the scan lines that
+ is waits for are valid. Copy this code to video, with a bit of work this
+ can be refactored, and perhaps even teach dri how to handle rotated
+ front buffers.
+
+ References:
+
+ Bug 28964 - [i965gm] GPU infinite MI_WAIT_FOR_EVENT while watching video
+ in Totem
+ https://bugs.freedesktop.org/show_bug.cgi?id=28964
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 75850e824bd66b961b9ce21696d9090169f7b28f
+Author: Evan McClain <aeroevan@gmail.com>
+Date: Thu Feb 25 01:51:42 2010 -0500
+
+ Add mbp_backlight support.
+
+ Acked-by: Julien Cristau <jcristau@debian.org>
+
+commit a2aa4c23f65b03c389c2ba8eac0298dfb205e67d
+Author: Dave Airlie <airlied@redhat.com>
+Date: Mon Jul 5 14:02:42 2010 +1000
+
+ uxa: oops typo in previous commit
+
+commit feff2ec80eeeba5074d19efcddf4867adf639b4f
+Author: Dave Airlie <airlied@redhat.com>
+Date: Mon Jul 5 09:07:08 2010 +1000
+
+ uxa: don't compare planemask with FB_ALLONES.
+
+ planemask is an unsigned long initialised to ~0, on 64-bit this is not equal
+ to an (unsigned int)-1.
+
+ Use the macro provided to do this.
+
+ Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+commit 7ad9c0bebf2c71db574e0302264859ce53cecd37
+Author: Jesse Barnes <jbarnes@virtuousgeek.org>
+Date: Fri Jul 2 12:39:27 2010 -0700
+
+ add cscope files to gitignore
+
+commit afcd41820d7481912b49093670e9d7a4a6a2338f
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Thu Jul 1 22:14:03 2010 +0100
+
+ Reduce front buffer stride prior to rejection
+
+ If we reject the front buffer because it has too large a stride, repeat
+ the allocation using untiled for the cases where we can utilize laxer
+ hardware restrictions.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit f8778b66a98d68e622cdf5b2d1fd959c4f7a2b2b
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Thu Jul 1 21:58:43 2010 +0100
+
+ drmmode: Add missing newlines at the end of log messages.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 690fbd1a64c1e1fd07f7f8a5e39e05a33e4d0721
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Thu Jul 1 21:55:04 2010 +0100
+
+ drmmode: Use a copy of the converted mode on resize
+
+ Avoid a potential use-after-free of the copied mode string by reusing
+ the converted kernel mode on resize.
+
+ ==19897== Invalid read of size 8
+ ==19897== at 0x661C330: ??? (strcpy.S:1308)
+ ==19897== by 0x8618AE7: drmmode_set_mode_major (drmmode_display.c:293)
+ ==19897== by 0x8618E6F: drmmode_xf86crtc_resize (drmmode_display.c:1299)
+ ==19897== by 0x529A77: xf86RandR12ScreenSetSize (xf86RandR12.c:708)
+ ==19897== by 0x4BD528: ProcRRSetScreenSize (rrscreen.c:301)
+ ==19897== by 0x42B820: Dispatch (dispatch.c:432)
+ ==19897== by 0x4254C9: main (main.c:289)
+ ==19897== Address 0x72e91e0 is 0 bytes inside a block of size 9 free'd
+ ==19897== at 0x4C23DBC: free (vg_replace_malloc.c:325)
+ ==19897== by 0x48424F: xf86DeleteMode (xf86Mode.c:1921)
+ ==19897== by 0x4942B7: xf86ProbeOutputModes (xf86Crtc.c:1572)
+ ==19897== by 0x5290BB: xf86RandR12GetInfo12 (xf86RandR12.c:1551)
+ ==19897== by 0x5313AE: RRGetInfo (rrinfo.c:202)
+ ==19897== by 0x4BCCAA: rrGetScreenResources (rrscreen.c:337)
+ ==19897== by 0x42B820: Dispatch (dispatch.c:432)
+ ==19897== by 0x4254C9: main (main.c:289)
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 772f8236d50725f0b330508616b4f2a9a910662a
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed Jun 30 13:58:05 2010 +0100
+
+ dri: Handle errors during GetBuffers() gracefully.
+
+ Unwind the array of Pixmaps already allocated and report failure for the
+ old dri GetBuffers() path.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 17884af4eda01c05e7429ed6a195f3e4ceeff892
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon Jun 28 17:44:45 2010 +0100
+
+ Repair the damage to 'make distcheck' after splitting out i810
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 28c0ca676c47e7e38fabdd9ef24a70bd26701f33
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri Jun 25 13:40:22 2010 +0100
+
+ Remove unused inclusion of <sys/mman.h>
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 2306e675c48bc00a8ca1f4545bb88c97d6ef4fa6
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri Jun 25 13:32:02 2010 +0100
+
+ configure: Remove check for unused function, mprotect
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 6695296ca28da7c4f551b0e80a8d06b557d59a5e
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri Jun 25 13:31:11 2010 +0100
+
+ configure: Remove unused checks for xext
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 5c663ce8442bd3b69c96e29061c57cc565fca91d
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sun Jun 20 15:01:16 2010 +0100
+
+ Rename common infrastructure to the intel namespace.
+
+ After splitting out the i810 driver into its own legacy directory, we
+ can identify the common routines not as i830 but as intel. This
+ clarifies the code which *is* i830 specific.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit 797d173a9af12055ba2609293182b616dd673ef4
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sun Jun 20 12:52:10 2010 +0100
+
+ i810: Move into a legacy directory.
+
+ The driver is still built but is no longer under active development so
+ move it and supporting files to a new directory.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+commit cd61531a78b9a2cbdd6019199c43258f83e6e2ce
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sun Jun 20 21:03:44 2010 +0100
+
+ Remove unused configure option: --enable-video-debug
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
commit ca16e3133658504b68a6b5c83bb8712899016544
Author: Carl Worth <cworth@cworth.org>
Date: Thu Jun 24 14:07:15 2010 -0700
diff --git a/debian/changelog b/debian/changelog
index b37430d..ac8ad72 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-intel (2:2.12.0+legacy1-1) UNRELEASED; urgency=low
+
+ * Merge from people.freedesktop.org/~ickle/xf86-video-intel:legacy.
+ This reintroduces UMS and EXA for legacy chips, while allowing us to get
+ the fixes and new hw support from 2.12.
+
+ -- Julien Cristau <jcristau@debian.org> Tue, 24 Aug 2010 17:41:52 +0200
+
xserver-xorg-video-intel (2:2.12.0-1) experimental; urgency=low
* New upstream release.
commit 22e5830d3a60f25cbbab6976a8effaa2c843a804
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Wed Oct 14 18:09:08 2009 +0200
legacy/ums/Xv overlay: fix planar YUV copy for right rotated crtcs
While copying and rotating the buffer, array access was out of bounds when
rotated to the right (RR_Rotate_270). My buffer handling changes probably
made this bug much more likely to actually result in a SIGSEGV.
I've checked the logs and the bug exists since rotation has been supported,
i.e. this looks like a candidate for cherry-picking for all supported
releases.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
diff --git a/src/legacy/ums/ums_video.c b/src/legacy/ums/ums_video.c
index 6623e8a..999ce9e 100644
--- a/src/legacy/ums/ums_video.c
+++ b/src/legacy/ums/ums_video.c
@@ -1359,10 +1359,10 @@ I830CopyPackedData(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv,
for (j = 0; j < w; j+=2) {
/* Copy U */
dst[(((h - i)*2) - 3) + (j * dstPitch)] = src[(j*2) + 1 + (i * srcPitch)];
- dst[(((h - i)*2) - 3) + ((j - 1) * dstPitch)] = src[(j*2) + 1 + ((i+1) * srcPitch)];
+ dst[(((h - i)*2) - 3) + ((j + 1) * dstPitch)] = src[(j*2) + 1 + ((i+1) * srcPitch)];
/* Copy V */
dst[(((h - i)*2) - 1) + (j * dstPitch)] = src[(j*2) + 3 + (i * srcPitch)];
- dst[(((h - i)*2) - 1) + ((j - 1) * dstPitch)] = src[(j*2) + 3 + ((i+1) * srcPitch)];
+ dst[(((h - i)*2) - 1) + ((j + 1) * dstPitch)] = src[(j*2) + 3 + ((i+1) * srcPitch)];
}
}
break;
commit 352016d2da69bfc998a642132ab722940899ad2e
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sat Jul 24 23:08:20 2010 +0100
legacy/ums: Don't use uninitialised methods for synchronisation
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=29153
diff --git a/src/legacy/ums/ums_accel.c b/src/legacy/ums/ums_accel.c
index 821593e..b663312 100644
--- a/src/legacy/ums/ums_accel.c
+++ b/src/legacy/ums/ums_accel.c
@@ -158,35 +158,7 @@ ums_I830Sync(ScrnInfoPtr pScrn)
ums_I830EmitFlush(pScrn);
ums_batch_flush(pScrn, TRUE);
-
- if (pI830->directRenderingType > DRI_NONE) {
- struct drm_i915_irq_emit emit;
- struct drm_i915_irq_wait wait;
- int ret;
-
- /* Most of the uses of I830Sync while using GEM should actually be
- * using set_domain on a specific buffer. We're not there yet, so fake
- * it up using irq_emit/wait. It's still better than spinning on
- * register reads for idle.
- */
- emit.irq_seq = &wait.irq_seq;
- ret = drmCommandWriteRead(pI830->drmSubFD, DRM_I830_IRQ_EMIT, &emit,
- sizeof(emit));
- if (ret != 0)
- FatalError("Failure to emit IRQ: %s\n", strerror(-ret));
-
- do {
- ret = drmCommandWrite(pI830->drmSubFD, DRM_I830_IRQ_WAIT, &wait,
- sizeof(wait));
- } while (ret == -EINTR);
-
- if (ret != 0)
- FatalError("Failure to wait for IRQ: %s\n", strerror(-ret));
-
- ums_refresh_ring(pScrn);
- } else {
- ums_wait_ring_idle(pScrn);
- }
+ ums_wait_ring_idle(pScrn);
pI830->nextColorExpandBuf = 0;
}
commit e90446967b34013cf74bc9c6aa502261dddf1933
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Thu Jul 15 11:31:32 2010 +0100
legacy/ums: #include <drm.h>
diff --git a/src/legacy/ums/ums.h b/src/legacy/ums/ums.h
index f831da3..76c0af8 100644
--- a/src/legacy/ums/ums.h
+++ b/src/legacy/ums/ums.h
@@ -66,7 +66,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "GL/glxint.h"
#include "ums_dri.h"
#endif
-#include <drm/drm.h>
+#include <drm.h>
#include "intel_bufmgr.h"
#include "i915_drm.h"
commit 7865828182d094b0e9b3706dc4a6ea17e3b09ba7
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Tue Jul 13 17:50:59 2010 +0100
legacy/ums/dri: Enable framebuffer mapping for dri
diff --git a/src/legacy/ums/ums_dri.c b/src/legacy/ums/ums_dri.c
index 2603883..30de483 100644
--- a/src/legacy/ums/ums_dri.c
+++ b/src/legacy/ums/ums_dri.c
@@ -67,6 +67,13 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "ums.h"
+#if (DRIINFO_MAJOR_VERSION > 5 || \
+ (DRIINFO_MAJOR_VERSION == 5 && DRIINFO_MINOR_VERSION >= 4))
+#define DRI_DRIVER_FRAMEBUFFER_MAP 1
+#else
+#define DRI_DRIVER_FRAMEBUFFER_MAP 0
+#endif
+
extern void GlxSetVisualConfigs(int nconfigs,
__GLXvisualConfig * configs,
void **configprivs);
commit 381a69364cd74e66554454567efb8b71ceb50819
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Tue Jul 13 08:57:13 2010 +0100
legacy/ums/i965: we do not handle SourcePictures
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
diff --git a/src/legacy/ums/ums_i965_render.c b/src/legacy/ums/ums_i965_render.c
index caa5f07..b7e8322 100644
--- a/src/legacy/ums/ums_i965_render.c
+++ b/src/legacy/ums/ums_i965_render.c
@@ -186,11 +186,16 @@ static Bool i965_get_dest_format(PicturePtr pDstPicture, uint32_t *dst_format)
static Bool i965_check_composite_texture(PicturePtr pPict, int unit)
{
- ScrnInfoPtr pScrn = xf86Screens[pPict->pDrawable->pScreen->myNum];
- int w = pPict->pDrawable->width;
- int h = pPict->pDrawable->height;
- int i;
+ ScrnInfoPtr pScrn;
+ int w, h, i;
+
+ if (!pPict->pDrawable)
+ return FALSE;
+ pScrn = xf86Screens[pPict->pDrawable->pScreen->myNum];
+
+ w = pPict->pDrawable->width;
+ h = pPict->pDrawable->height;
if ((w > 8192) || (h > 8192))
I830FALLBACK("Picture w/h too large (%dx%d)\n", w, h);
@@ -240,7 +245,7 @@ ums_i965_check_composite(int op, PicturePtr pSrcPicture, PicturePtr pMaskPicture
I830FALLBACK("Component alpha not supported with source "
"alpha and source value blending.\n");
}
- }
+ }
if (!i965_check_composite_texture(pSrcPicture, 0))
I830FALLBACK("Check Src picture texture\n");
commit cc6467a4fce031143a5be5500c25d8210bc4d29e
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Tue Jul 13 17:36:25 2010 +1000
legacy/ums: Fix build with DRI disabled
diff --git a/configure.ac b/configure.ac
index a9c82c7..2bdf83b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -119,9 +119,12 @@ if test "x$DRI" != xno; then
CFLAGS="$save_CFLAGS $DEBUGFLAGS"
fi
+dnl This could be removed by open-coding DRICreatePCIBusID for
+dnl intel_kernel_mode_enabled
+PKG_CHECK_MODULES(DRI, [xf86driproto glproto])
+
AM_CONDITIONAL(DRI, test x$DRI = xyes)
if test "$DRI" = yes; then
- PKG_CHECK_MODULES(DRI, [xf86driproto glproto])
AC_DEFINE(BUILD_DRI,1,[Enable DRI driver support])
AC_DEFINE(BUILD_DRI_DEVEL,1,[Enable developmental DRI driver support])
fi
diff --git a/src/legacy/ums/ums.h b/src/legacy/ums/ums.h
index 9cbabe4..f831da3 100644
--- a/src/legacy/ums/ums.h
+++ b/src/legacy/ums/ums.h
@@ -66,6 +66,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "GL/glxint.h"
#include "ums_dri.h"
#endif
+#include <drm/drm.h>
#include "intel_bufmgr.h"
#include "i915_drm.h"
diff --git a/src/legacy/ums/ums_driver.c b/src/legacy/ums/ums_driver.c
index 0bb6e21..6c8b9fc 100644
--- a/src/legacy/ums/ums_driver.c
+++ b/src/legacy/ums/ums_driver.c
@@ -2066,8 +2066,10 @@ ums_try_memory_allocation(ScrnInfoPtr pScrn)
if (!ums_allocate_pwrctx(pScrn))
goto failed;
+#if BUILD_DRI
if (xf86dri && !ums_allocate_3d_memory(pScrn))
goto failed;
+#endif
xf86DrvMsg(pScrn->scrnIndex, X_INFO, "%siled allocation successful.\n",
tiled ? "T" : "Unt");
diff --git a/src/legacy/ums/ums_memory.c b/src/legacy/ums/ums_memory.c
Reply to: