xf86-video-intel: 4 commits - man/intel.man NEWS src/i830_video.c

Carl Worth cworth at kemper.freedesktop.org
Thu Dec 10 15:18:55 PST 2009


 NEWS             |   64 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
 man/intel.man    |   18 +++++++++++++++
 src/i830_video.c |   14 +-----------
 3 files changed, 79 insertions(+), 17 deletions(-)

New commits:
commit 8ecf70ea553083cbc26928dc3973c8f6f8b3d9d0
Author: Carl Worth <cworth at cworth.org>
Date:   Thu Dec 10 15:17:57 2009 -0800

    NEWS: Add notes for 2.9.99.902 (and preliminary notes for 2.10)
    
    This comes from my cursory glance over the commit log from 2.9.1
    to master.

diff --git a/NEWS b/NEWS
index 891da07..82ee180 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,62 @@
+Work-in-progress release notes for the next release (which will be 2.10.0)
+==========================================================================
+New requirements of 2.10 compared to 2.9
+----------------------------------------
+ * Linux kernel with kernel-modesetting (KMS)
+
+   All user-modesetting code has now been removed from the driver.
+   We highly recommend kernel version 2.6.32 or later.
+
+ * Libdrm >= 2.4.16
+
+New features in 2.10 compared to 2.9
+------------------------------------
+ * New driver debugging options available in xorg.conf
+   (DebugFlushBatches, DebugFlushCaches, DebugWait). See "man intel"
+   for more details.
+
+ * Video overlay support with KMS. This currently requires Linux
+   2.6.33, but a backport to 2.6.32 is available here:
+
+   http://gitorious.org/daniel-s-linux-stuff/linux-kernel/commits/intel-kms-overlay-for-2.6.32
+
+Notable fixes in 2.10 compared to 2.9
+-----------------------------------
+ * Fix crash when XRenderComposite is called with a -1 value for
+   width/height, (crash at login when using compiz).
+
+   http://bugs.freedesktop.org/show_bug.cgi?id=24724
+
+ * Fix to support larger extended desktops, (such as a 2560x1600 plus a
+   1920x1200 monitor).
+
+ * i915: Fix texture sample coordinates, (was causing gray border around
+   images).
+
+   https://bugs.freedesktop.org/show_bug.cgi?id=21523
+
+ * Fix glyph corruption due to insufficient cache flushing:
+
+   https://bugs.freedesktop.org/show_bug.cgi?id=24315
+
+Several other correctness and performance fixes are also included.
+
+[Developers, please provide me summaries for any additional features
+of this release that you think should appear in NEWS and in the 2.10.0
+release notes.
+
+Snapshot 2.9.99.902 (2009-12-10)
+================================
+This is the second release candidate in preparation for the upcoming
+2.10.0 release. We will appreciate any feedback we can get from
+testing of this snapshot to improve the 2.10.0 release.
+
+Compared to the previous snapshot, this snapshot now correctly
+verifies that libdrm 2.4.16 (or newer) is available. The previous
+snapshot also required libdrm 2.4.16 for correct functionality, but
+neglected to notify the user of this at configure, compile, or install
+time and would instead simply fail to run.
+
 Snapshot 2.9.99.901 (2009-11-30)
 ================================
 This is the first release candidate in preparation for the upcoming
@@ -8,11 +67,6 @@ With this snapshot, the xf86-video-intel driver requires kernel
 modesetting (KMS) as all of the user modesetting (UMS) support has
 been removed from the driver.
 
-See the commit log for further changes in this release, and
-developers, please provide me summaries for any major features in this
-release that you think should appear in NEWS and in the 2.10.0 release
-notes.
-
 Release 2.9.0 (2009-09-28)
 ==========================
 We are pleased to announce the 2.9.0 release of the xf86-video-intel
commit 88b2209a7526a7c7f3b3a2d491d48bd0d5d56e04
Author: Carl Worth <cworth at cworth.org>
Date:   Thu Dec 10 14:52:46 2009 -0800

    Document the DebugFlushBatches, DebugFlushCaches, and DebugWait options.
    
    These were added in 3c0815abf28744e215bea286e71d935cd486955a . The
    documentation added here comes straight from that commit message.

diff --git a/man/intel.man b/man/intel.man
index 9344d28..9e24ca5 100644
--- a/man/intel.man
+++ b/man/intel.man
@@ -137,6 +137,24 @@ server log.
 .IP
 Default: Disabled
 .TP
+.BI "Option \*qDebugFlushBatches\*q \*q" boolean \*q
+Flush the batch buffer after every single operation.
+.IP
+Default: Disabled
+.TP
+.BI "Option \*qDebugFlushCaches\*q \*q" boolean \*q
+Include an MI_FLUSH at the end of every batch buffer to force data to
+be flushed out of cache and into memory before the completion of the
+batch.
+.IP
+Default: Disabled
+.TP
+.BI "Option \*qDebugWait\*q \*q" boolean \*q
+Wait for the completion of every batch buffer before continuing,
+i.e. perform synchronous rendering.
+.IP
+Default: Disabled
+.TP
 .BI "Option \*qSwapbuffersWait\*q \*q" boolean \*q
 This option controls the behavior of glXSwapBuffers and glXCopySubBufferMESA
 calls by GL applications.  If enabled, the calls will avoid tearing by making
commit 8d6faf7dc546bda64e11bf6dea7f3c997f07f887
Author: Tobias Doerffel <tobias.doerffel at gmail.com>
Date:   Wed Dec 9 09:57:20 2009 +0100

    Fix compiler warning in i830_copy_video_data() if XvMC is disabled
    
    The variable "intel" is unused when building i830_video.c without XvMC
    support which results in a compiler warning:
    
      i830_video.c: In function 'i830_copy_video_data':
      i830_video.c:1443: warning: unused variable `intel'
    
    Trivial fix via #ifdef.

diff --git a/src/i830_video.c b/src/i830_video.c
index 7d0d3bf..8f6bfd2 100644
--- a/src/i830_video.c
+++ b/src/i830_video.c
@@ -1428,7 +1428,9 @@ i830_copy_video_data(ScrnInfoPtr scrn, intel_adaptor_private *adaptor_priv,
 		     INT32 x1, INT32 y1, INT32 x2, INT32 y2,
 		     int id, unsigned char *buf)
 {
+#ifdef INTEL_XVMC
 	intel_screen_private *intel = intel_get_screen_private(scrn);
+#endif
 	int srcPitch = 0, srcPitch2 = 0;
 	int top, left, npixels, nlines, size;
 
commit bd81734465912d79d6320a6fb021ce43d258b906
Author: Daniel Vetter <daniel.vetter at ffwll.ch>
Date:   Tue Dec 8 15:27:41 2009 +0100

    Xv: enable drmmode overlay
    
    Now that libdrm 2.4.16 is released (and already required) we can
    unconditionally enable this.
    
    Please add something like this to the release-notes/NEWS file:
    
    * Overlay support for kernel modesetting. This needs at least kernel
      v2.6.33 to work. A backport to 2.6.32 is available at:
    
      http://gitorious.org/daniel-s-linux-stuff/linux-kernel/commits/intel-kms-overlay-for-2.6.32
    
    Signed-off-by: Daniel Vetter <daniel.vetter at ffwll.ch>

diff --git a/src/i830_video.c b/src/i830_video.c
index b0403d4..7d0d3bf 100644
--- a/src/i830_video.c
+++ b/src/i830_video.c
@@ -203,7 +203,6 @@ static XF86ImageRec Images[NUM_IMAGES] = {
 /* kernel modesetting overlay functions */
 static Bool drmmode_has_overlay(ScrnInfoPtr scrn)
 {
-#ifdef DRM_MODE_OVERLAY_LANDED
 	intel_screen_private *intel = intel_get_screen_private(scrn);
 	struct drm_i915_getparam gp;
 	int has_overlay = 0;
@@ -213,14 +212,10 @@ static Bool drmmode_has_overlay(ScrnInfoPtr scrn)
 	drmCommandWriteRead(intel->drmSubFD, DRM_I915_GETPARAM, &gp, sizeof(gp));
 
 	return has_overlay ? TRUE : FALSE;
-#else
-	return FALSE;
-#endif
 }
 
 static void drmmode_overlay_update_attrs(ScrnInfoPtr scrn)
 {
-#ifdef DRM_MODE_OVERLAY_LANDED
 	intel_screen_private *intel = intel_get_screen_private(scrn);
 	intel_adaptor_private *adaptor_priv = intel_get_adaptor_private(scrn);
 	struct drm_intel_overlay_attrs attrs;
@@ -243,12 +238,10 @@ static void drmmode_overlay_update_attrs(ScrnInfoPtr scrn)
 
 	if (ret != 0)
 		OVERLAY_DEBUG("overlay attrs ioctl failed: %i\n", ret);
-#endif
 }
 
 static void drmmode_overlay_off(ScrnInfoPtr scrn)
 {
-#ifdef DRM_MODE_OVERLAY_LANDED
 	intel_screen_private *intel = intel_get_screen_private(scrn);
 	struct drm_intel_overlay_put_image request;
 	int ret;
@@ -260,7 +253,6 @@ static void drmmode_overlay_off(ScrnInfoPtr scrn)
 
 	if (ret != 0)
 		OVERLAY_DEBUG("overlay switch-off ioctl failed: %i\n", ret);
-#endif
 }
 
 static Bool
@@ -270,7 +262,6 @@ drmmode_overlay_put_image(ScrnInfoPtr scrn, xf86CrtcPtr crtc,
 			  BoxPtr dstBox, short src_w, short src_h, short drw_w,
 			  short drw_h)
 {
-#ifdef DRM_MODE_OVERLAY_LANDED
 	intel_screen_private *intel = intel_get_screen_private(scrn);
 	intel_adaptor_private *adaptor_priv = intel_get_adaptor_private(scrn);
 	struct drm_intel_overlay_put_image request;
@@ -336,9 +327,6 @@ drmmode_overlay_put_image(ScrnInfoPtr scrn, xf86CrtcPtr crtc,
 		return FALSE;
 	} else
 		return TRUE;
-#else
-	return FALSE;
-#endif
 }
 
 void I830InitVideo(ScreenPtr screen)


More information about the xorg-commit mailing list