xf86-video-intel: Branch '2.8' - 4 commits - configure.ac NEWS src/drmmode_display.c src/i830.h src/i830_memory.c src/i830_uxa.c src/i965_render.c src/i965_video.c
Carl Worth
cworth at kemper.freedesktop.org
Thu Aug 13 14:15:20 PDT 2009
NEWS | 14 ++++++++++++++
configure.ac | 2 +-
src/drmmode_display.c | 3 ---
src/i830.h | 2 ++
src/i830_memory.c | 2 --
src/i830_uxa.c | 11 +++++++++--
src/i965_render.c | 2 --
src/i965_video.c | 3 ---
8 files changed, 26 insertions(+), 13 deletions(-)
New commits:
commit c6627f05c249879e548c0034c6a314d6d45a5f28
Author: Carl Worth <cworth at cworth.org>
Date: Thu Aug 13 14:02:10 2009 -0700
Update version to 2.8.0.901
This is the version number for release candidate 1 of 2.8.1.
diff --git a/configure.ac b/configure.ac
index f7cdf1f..c19922b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-intel],
- 2.8.0,
+ 2.8.0.901,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-intel)
commit c611082fc25b01ebd6d4fc8aca16096685fc58aa
Author: Carl Worth <cworth at cworth.org>
Date: Thu Aug 13 13:58:02 2009 -0700
NEWS: Add notes for 2.8.0.901 (2.8.1 rc 1)
Just a couple of cherry-picked fixes.
diff --git a/NEWS b/NEWS
index 3a2b243..1bd218f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,17 @@
+Release 2.8.0.901 (2.8.1 rc1 2009-08-13)
+========================================
+We are pleased to announce this release candidate working toward the
+2.8.1 maintenance release of the xf86-video-intel driver. This
+snapshot contains a few, hand-picked fixes since the 2.8.0 release.
+
+New fixes in 2.8.1 compared to 2.8.0
+------------------------------------
+* Allow DRM mode setting to include transformations (also requires a
+ fix in the X server---available in xserver 1.6.3)
+
+* Align tiled pixmap height so we don't address beyond the end of our
+ buffers.
+
Release 2.8.0 (2009-07-20)
==========================
We are pleased to present this major release of the xf86-video-intel
commit b0aa94fb63e8bc4be991f6dcadc66613054b0ddd
Author: Eric Anholt <eric at anholt.net>
Date: Fri Aug 7 18:05:29 2009 -0700
Align tiled pixmap height so we don't address beyond the end of our buffers (plus fix)
Original alignment patch
(cherry picked from commit 222b52ef16895823fbf3a0fc0be4eb23b930ed1b)
with subsequent "Fix math in the tiling alignment fix" squashed
(cherry picked from commit e8f0763d405a8152c74c28792c52fe12c1d41dd5)
diff --git a/src/i830.h b/src/i830.h
index 21c98f5..bf61a7a 100644
--- a/src/i830.h
+++ b/src/i830.h
@@ -619,6 +619,8 @@ typedef struct _I830Rec {
#define I830PTR(p) ((I830Ptr)((p)->driverPrivate))
#define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0]))
+#define ALIGN(i,m) (((i) + (m) - 1) & ~((m) - 1))
+#define MIN(a,b) ((a) < (b) ? (a) : (b))
#define I830_SELECT_FRONT 0
#define I830_SELECT_BACK 1
diff --git a/src/i830_memory.c b/src/i830_memory.c
index cc9d376..a73648b 100644
--- a/src/i830_memory.c
+++ b/src/i830_memory.c
@@ -88,8 +88,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "i810_reg.h"
#include "i915_drm.h"
-#define ALIGN(i,m) (((i) + (m) - 1) & ~((m) - 1))
-
/* Our hardware status area is just a single page */
#define HWSTATUS_PAGE_SIZE GTT_PAGE_SIZE
#define PWRCTX_SIZE GTT_PAGE_SIZE
diff --git a/src/i830_uxa.c b/src/i830_uxa.c
index 2050c48..fe0fb49 100644
--- a/src/i830_uxa.c
+++ b/src/i830_uxa.c
@@ -609,6 +609,13 @@ i830_uxa_create_pixmap (ScreenPtr screen, int w, int h, int depth, unsigned usag
if (tiling == I915_TILING_NONE) {
size = stride * h;
} else {
+ int aligned_h = h;
+ if (tiling == I915_TILING_X)
+ aligned_h = ALIGN(h, 8);
+ else
+ aligned_h = ALIGN(h, 32);
+ assert(aligned_h >= h);
+
stride = i830_get_fence_pitch(i830, stride, tiling);
/* Round the object up to the size of the fence it will live in
* if necessary. We could potentially make the kernel allocate
@@ -616,8 +623,8 @@ i830_uxa_create_pixmap (ScreenPtr screen, int w, int h, int depth, unsigned usag
* but this is easier and also keeps us out of trouble (as much)
* with drm_intel_bufmgr_check_aperture().
*/
- size = i830_get_fence_size(i830, stride * h);
- assert(size >= stride * h);
+ size = i830_get_fence_size(i830, stride * aligned_h);
+ assert(size >= stride * aligned_h);
}
/* Fail very large allocations on 32-bit systems. Large BOs will
diff --git a/src/i965_render.c b/src/i965_render.c
index eeb23e1..1a8075b 100644
--- a/src/i965_render.c
+++ b/src/i965_render.c
@@ -251,8 +251,6 @@ i965_check_composite(int op, PicturePtr pSrcPicture, PicturePtr pMaskPicture,
}
-#define ALIGN(i,m) (((i) + (m) - 1) & ~((m) - 1))
-#define MIN(a,b) ((a) < (b) ? (a) : (b))
#define BRW_GRF_BLOCKS(nreg) ((nreg + 15) / 16 - 1)
/* Set up a default static partitioning of the URB, which is supposed to
diff --git a/src/i965_video.c b/src/i965_video.c
index 805b33f..46a461f 100644
--- a/src/i965_video.c
+++ b/src/i965_video.c
@@ -131,9 +131,6 @@ static const uint32_t ps_kernel_planar_static_gen5[][4] = {
#include "exa_wm_write.g4b.gen5"
};
-#define ALIGN(i,m) (((i) + (m) - 1) & ~((m) - 1))
-#define MIN(a,b) ((a) < (b) ? (a) : (b))
-
static uint32_t float_to_uint (float f) {
union {uint32_t i; float f;} x;
x.f = f;
commit 24638652704f66c97a5f093231182868e638da57
Author: Keith Packard <keithp at keithp.com>
Date: Sun Jul 26 13:14:05 2009 -0700
Allow DRM mode setting to include transformations
This removes the explicit transform disabling code in drm_set_mode_major.
Without a fixed X server, transforms will still be broken, but even a fixed
X server can't work around this driver bug.
Signed-off-by: Keith Packard <keithp at keithp.com>
(cherry picked from commit 8084f76d86f048ca5b82da089fffa9665dbbcdd5)
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index df10fb5..8c919f9 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -185,9 +185,6 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
crtc->x = x;
crtc->y = y;
crtc->rotation = rotation;
-#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,5,99,0,0)
- crtc->transformPresent = FALSE;
-#endif
output_ids = xcalloc(sizeof(uint32_t), xf86_config->num_output);
if (!output_ids) {
More information about the xorg-commit
mailing list