debian/changelog | 12 --
debian/patches/110_warnings_cleanup.patch | 61 ----------
debian/patches/115_quell_vblank_counter_failed.patch | 80 -------------
debian/patches/119_disable_relaxed_fencing.path | 113 -------------------
debian/patches/series | 2
5 files changed, 2 insertions(+), 266 deletions(-)
New commits:
commit da29b404e868ba7f9c3f19c18444eaa6903d87b5
Author: Robert Hooker <sarv...@ubuntu.com>
Date: Tue May 31 15:02:14 2011 -0400
Drop more upstream patches.
diff --git a/debian/changelog b/debian/changelog
index e96a0e8..f89423e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,15 +3,6 @@ xserver-xorg-video-intel (2:2.15.0-3ubuntu1) UNRELEASED;
urgency=low
* Merge from Debian unstable, remaining changes:
- 101_copy-fb.patch
+ Plymouth integration patch
- - 115_quell_vblank_counter_failed.patch
- + Don't fill up Xorg.0.log with
- "get vblank counter failed: Invalid argument" warnings.
- 5 is enough.
- - 119_disable_relaxed_fencing.path
- + The relaxed fencing optimization is suspected as the cause for
- various i915/945 gpu lockup issues. This disables the optimization
- by default but adds an xorg.conf parameter to let people experiment
- with it turned on.
- 120_check_privates.patch
+ Check for null privates pointer on render_dest_picture.
- debian/xserver-xorg-video-intel.preinst.in:
@@ -27,9 +18,10 @@ xserver-xorg-video-intel (2:2.15.0-3ubuntu1) UNRELEASED;
urgency=low
112_fix_error_in_4c4ad555.patch
113_remove_broken_max_base_addresses.patch
114_warnings_cleanup_part_2.patch
+ 115_quell_vblank_counter_failed.patch
117_946gz_isreally_965g.patch
+ 119_disable_relaxed_fencing.path
- all upstream.
- * Disabled patches 115 and 119 for now, they don't apply and need some work.
-- Timo Aaltonen <tjaal...@ubuntu.com> Wed, 25 May 2011 17:10:05 +0300
diff --git a/debian/patches/110_warnings_cleanup.patch
b/debian/patches/110_warnings_cleanup.patch
deleted file mode 100644
index 686bc62..0000000
--- a/debian/patches/110_warnings_cleanup.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff --git a/src/i915_render.c b/src/i915_render.c
-index 6d844e5..9739a72 100644
---- a/src/i915_render.c
-+++ b/src/i915_render.c
-@@ -546,7 +546,7 @@ i915_emit_composite_primitive(PixmapPtr dest,
- {
- ScrnInfoPtr scrn = xf86Screens[dest->drawable.pScreen->myNum];
- intel_screen_private *intel = intel_get_screen_private(scrn);
-- Bool is_affine_src, is_affine_mask = TRUE;
-+ Bool is_affine_src = TRUE, is_affine_mask = TRUE;
- int per_vertex, num_floats;
- int tex_unit = 0;
- int src_unit = -1, mask_unit = -1;
-diff --git a/src/xvmc/intel_batchbuffer.h b/src/xvmc/intel_batchbuffer.h
-index 6fa1c05..888abeb 100644
---- a/src/xvmc/intel_batchbuffer.h
-+++ b/src/xvmc/intel_batchbuffer.h
-@@ -24,7 +24,7 @@ extern int VERBOSE;
-
- #define OUT_RELOC(bo,read_domains,write_domains,delta) \
- do { \
-- *(unsigned int *)batch_ptr = delta + bo->offset; \
-+ *(unsigned int *)batch_ptr = (delta) + bo->offset; \
- intel_batch_emit_reloc(bo, read_domains, write_domains, delta,
batch_ptr); \
- batch_ptr += 4; \
- } while (0)
-diff --git a/src/xvmc/intel_xvmc.c b/src/xvmc/intel_xvmc.c
-index 6cbec80..6bfd9d1 100644
---- a/src/xvmc/intel_xvmc.c
-+++ b/src/xvmc/intel_xvmc.c
-@@ -1071,7 +1071,7 @@ _X_EXPORT Status XvMCLoadQMatrix(Display * display,
XvMCContext * context,
- _X_EXPORT Status XvMCPutSlice(Display * display, XvMCContext * context,
- char *slice, int nbytes)
- {
-- if (xvmc_driver->put_slice(display, context, slice, nbytes)) {
-+ if (xvmc_driver->put_slice(display, context, (unsigned char *) slice,
nbytes)) {
- XVMC_ERR("PutSlice fail\n");
- return BadValue;
- }
-@@ -1082,7 +1082,7 @@ _X_EXPORT Status XvMCPutSlice2(Display * display,
XvMCContext * context,
- char *slice, int nbytes, int slice_code)
- {
- if (xvmc_driver->put_slice2
-- (display, context, slice, nbytes, slice_code)) {
-+ (display, context, (unsigned char *) slice, nbytes, slice_code)) {
- XVMC_ERR("PutSlice2 fail\n");
- return BadValue;
- }
-diff --git a/src/xvmc/intel_xvmc_dump.c b/src/xvmc/intel_xvmc_dump.c
-index 974bcbb..d22d311 100644
---- a/src/xvmc/intel_xvmc_dump.c
-+++ b/src/xvmc/intel_xvmc_dump.c
-@@ -38,7 +38,7 @@ void intel_xvmc_dump_open(void)
- if (xvmc_dump)
- return;
-
-- if (d = getenv("INTEL_XVMC_DUMP"))
-+ if ((d = getenv("INTEL_XVMC_DUMP")))
- xvmc_dump = 1;
-
- if (xvmc_dump) {
diff --git a/debian/patches/115_quell_vblank_counter_failed.patch
b/debian/patches/115_quell_vblank_counter_failed.patch
deleted file mode 100644
index 2c5e553..0000000
--- a/debian/patches/115_quell_vblank_counter_failed.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-diff --git a/src/intel_dri.c b/src/intel_dri.c
-index 7b60e14..65c8f39 100644
---- a/src/intel_dri.c
-+++ b/src/intel_dri.c
-@@ -1057,10 +1057,14 @@ I830DRI2GetMSC(DrawablePtr draw, CARD64 *ust, CARD64
*msc)
-
- ret = drmWaitVBlank(intel->drmSubFD, &vbl);
- if (ret) {
-- xf86DrvMsg(scrn->scrnIndex, X_WARNING,
-- "%s:%d get vblank counter failed: %s\n",
-- __FUNCTION__, __LINE__,
-- strerror(errno));
-+ static int limit = 5;
-+ if (limit) {
-+ xf86DrvMsg(scrn->scrnIndex, X_WARNING,
-+ "%s:%d get vblank counter failed: %s\n",
-+ __FUNCTION__, __LINE__,
-+ strerror(errno));
-+ limit--;
-+ }
- return FALSE;
- }
-
-@@ -1113,10 +1117,14 @@ I830DRI2ScheduleWaitMSC(ClientPtr client, DrawablePtr
draw, CARD64 target_msc,
- vbl.request.sequence = 0;
- ret = drmWaitVBlank(intel->drmSubFD, &vbl);
- if (ret) {
-- xf86DrvMsg(scrn->scrnIndex, X_WARNING,
-- "%s:%d get vblank counter failed: %s\n",
-- __FUNCTION__, __LINE__,
-- strerror(errno));
-+ static int limit = 5;
-+ if (limit) {
-+ xf86DrvMsg(scrn->scrnIndex, X_WARNING,
-+ "%s:%d get vblank counter failed: %s\n",
-+ __FUNCTION__, __LINE__,
-+ strerror(errno));
-+ limit--;
-+ }
- goto out_complete;
- }
-
-@@ -1143,10 +1151,14 @@ I830DRI2ScheduleWaitMSC(ClientPtr client, DrawablePtr
draw, CARD64 target_msc,
- vbl.request.signal = (unsigned long)wait_info;
- ret = drmWaitVBlank(intel->drmSubFD, &vbl);
- if (ret) {
-- xf86DrvMsg(scrn->scrnIndex, X_WARNING,
-- "%s:%d get vblank counter failed: %s\n",
-- __FUNCTION__, __LINE__,
-- strerror(errno));
-+ static int limit = 5;
-+ if (limit) {
-+ xf86DrvMsg(scrn->scrnIndex, X_WARNING,
-+ "%s:%d get vblank counter failed:
%s\n",
-+ __FUNCTION__, __LINE__,
-+ strerror(errno));
-+ limit--;
-+ }
- goto out_complete;
- }
-
-@@ -1178,10 +1190,14 @@ I830DRI2ScheduleWaitMSC(ClientPtr client, DrawablePtr
draw, CARD64 target_msc,
- vbl.request.signal = (unsigned long)wait_info;
- ret = drmWaitVBlank(intel->drmSubFD, &vbl);
- if (ret) {
-- xf86DrvMsg(scrn->scrnIndex, X_WARNING,
-- "%s:%d get vblank counter failed: %s\n",
-- __FUNCTION__, __LINE__,
-- strerror(errno));
-+ static int limit = 5;
-+ if (limit) {
-+ xf86DrvMsg(scrn->scrnIndex, X_WARNING,
-+ "%s:%d get vblank counter failed: %s\n",
-+ __FUNCTION__, __LINE__,
-+ strerror(errno));
-+ limit--;
-+ }
- goto out_complete;
- }
-
diff --git a/debian/patches/119_disable_relaxed_fencing.path
b/debian/patches/119_disable_relaxed_fencing.path
deleted file mode 100644
index 06e25da..0000000
--- a/debian/patches/119_disable_relaxed_fencing.path
+++ /dev/null
@@ -1,113 +0,0 @@
-diff --git a/man/intel.man b/man/intel.man
-index db4c145..0c9cc0d 100644
---- a/man/intel.man
-+++ b/man/intel.man
-@@ -187,6 +187,15 @@ performance.
- .IP
- Default: enabled.
- .TP
-+.BI "Option \*qRelaxedFencing\*q \*q" boolean \*q
-+This option controls whether we attempt to allocate the minimal amount of
-+memory required for the buffers. The reduction in working set has a
substantial
-+improvement on system performance. However, this has been demonstrate to be
-+buggy on older hardware (845-865 and 915-945, but ok on PineView and later)
-+so on those chipsets defaults to off.
-+.IP
-+Default: Enabled for G33 (includes PineView), and later, class machines.
-+.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 1275e4b..2d9bc02 100644
---- a/src/intel_driver.c
-+++ b/src/intel_driver.c
-@@ -108,6 +108,7 @@ typedef enum {
- OPTION_DEBUG_FLUSH_CACHES,
- OPTION_DEBUG_WAIT,
- OPTION_HOTPLUG,
-+ OPTION_RELAXED_FENCING,
- } I830Opts;
-
- static OptionInfoRec I830Options[] = {
-@@ -127,6 +128,7 @@ static OptionInfoRec I830Options[] = {
- {OPTION_DEBUG_FLUSH_CACHES, "DebugFlushCaches", OPTV_BOOLEAN, {0}, FALSE},
- {OPTION_DEBUG_WAIT, "DebugWait", OPTV_BOOLEAN, {0}, FALSE},
- {OPTION_HOTPLUG, "HotPlug", OPTV_BOOLEAN, {0}, TRUE},
-+ {OPTION_RELAXED_FENCING, "RelaxedFencing", OPTV_BOOLEAN, {0},
TRUE},
- {-1, NULL, OPTV_NONE, {0}, FALSE}
- };
- /* *INDENT-ON* */
-@@ -464,6 +466,30 @@ static void I830XvInit(ScrnInfoPtr scrn)
- intel->colorKey);
- }
-
-+static Bool drm_has_boolean_param(struct intel_screen_private *intel,
-+ int param)
-+{
-+ drm_i915_getparam_t gp;
-+ int value;
-+
-+ /* The BLT ring was introduced at the same time as the
-+ * automatic flush for the busy-ioctl.
-+ */
-+
-+ gp.value = &value;
-+ gp.param = param;
-+ if (drmIoctl(intel->drmSubFD, DRM_IOCTL_I915_GETPARAM, &gp))
-+ return FALSE;
-+
-+ return value;
-+}
-+
-+
-+static Bool has_relaxed_fencing(struct intel_screen_private *intel)
-+{
-+ return drm_has_boolean_param(intel, I915_PARAM_HAS_RELAXED_FENCING);
-+}
-+
- static Bool can_accelerate_blt(struct intel_screen_private *intel)
- {
- if (0 && (IS_I830(intel) || IS_845G(intel))) {
-@@ -630,6 +656,18 @@ static Bool I830PreInit(ScrnInfoPtr scrn, int flags)
- " 2D GPU acceleration disabled.\n");
- }
-
-+ intel->has_relaxed_fencing =
-+ xf86ReturnOptValBool(intel->Options,
-+ OPTION_RELAXED_FENCING,
-+ INTEL_INFO(intel)->gen >= 33);
-+ /* And override the user if there is no kernel support */
-+ if (intel->has_relaxed_fencing)
-+ intel->has_relaxed_fencing = has_relaxed_fencing(intel);
-+
-+ xf86DrvMsg(scrn->scrnIndex, X_CONFIG,
-+ "Relaxed fencing %s\n",
-+ intel->has_relaxed_fencing ? "enabled" : "disabled");
-+
- /* SwapBuffers delays to avoid tearing */
- intel->swapbuffers_wait = TRUE;
-
-diff --git a/src/intel_memory.c b/src/intel_memory.c
-index e9ea58d..e88fcef 100644
---- a/src/intel_memory.c
-+++ b/src/intel_memory.c
-@@ -294,8 +294,6 @@ void intel_set_gem_max_sizes(ScrnInfoPtr scrn)
- {
- intel_screen_private *intel = intel_get_screen_private(scrn);
- struct drm_i915_gem_get_aperture aperture;
-- drm_i915_getparam_t gp;
-- int ret, value;
-
- aperture.aper_available_size = 0;
- drmIoctl(intel->drmSubFD, DRM_IOCTL_I915_GEM_GET_APERTURE, &aperture);
-@@ -303,9 +301,4 @@ void intel_set_gem_max_sizes(ScrnInfoPtr scrn)
- intel_set_max_bo_size(intel, &aperture);
- intel_set_max_gtt_map_size(intel, &aperture);
- intel_set_max_tiling_size(intel, &aperture);
--
-- gp.value = &value;
-- gp.param = I915_PARAM_HAS_RELAXED_FENCING;
-- ret = drmIoctl(intel->drmSubFD, DRM_IOCTL_I915_GETPARAM, &gp);
-- intel->has_relaxed_fencing = ret == 0;
- }
diff --git a/debian/patches/series b/debian/patches/series
index 581cf9d..d890ef3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,6 +2,4 @@
# Ubuntu patches
101_copy-fb.patch
-#115_quell_vblank_counter_failed.patch
-#119_disable_relaxed_fencing.path
120_check_privates.patch
--
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/e1qruld-000838...@vasks.debian.org
