xf86-video-intel: 4 commits - configure.ac src/sna/compiler.h src/sna/gen3_render.c src/sna/kgem.c src/sna/Makefile.am src/sna/sna_composite.c
Chris Wilson
ickle at kemper.freedesktop.org
Sun Dec 11 09:22:59 PST 2011
configure.ac | 2 ++
src/sna/Makefile.am | 1 +
src/sna/compiler.h | 2 +-
src/sna/gen3_render.c | 6 +++---
src/sna/kgem.c | 21 ++++++++++++++++++---
src/sna/sna_composite.c | 31 +++++++++++++++++++++----------
6 files changed, 46 insertions(+), 17 deletions(-)
New commits:
commit e9e6d6f7c8af300716c64b041f96c09d58b3eaa2
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Sun Dec 11 17:25:46 2011 +0000
sna/gen3: Move the video dst_bo to make the conditional clearer
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/gen3_render.c b/src/sna/gen3_render.c
index 0be78c8..89cd4bd 100644
--- a/src/sna/gen3_render.c
+++ b/src/sna/gen3_render.c
@@ -3409,9 +3409,11 @@ gen3_render_video(struct sna *sna,
DBG(("%s: %dx%d -> %dx%d\n", __FUNCTION__, src_w, src_h, drw_w, drw_h));
+ dst_bo = sna_pixmap_get_bo(pixmap);
+
if (pixmap->drawable.width > 2048 ||
pixmap->drawable.height > 2048 ||
- !gen3_check_pitch_3d(sna_pixmap_get_bo(pixmap))) {
+ !gen3_check_pitch_3d(dst_bo)) {
int bpp = pixmap->drawable.bitsPerPixel;
dst_bo = kgem_create_2d(&sna->kgem,
@@ -3427,8 +3429,6 @@ gen3_render_video(struct sna *sna,
pix_yoff = -dyo;
copy = 1;
} else {
- dst_bo = sna_pixmap_get_bo(pixmap);
-
width = pixmap->drawable.width;
height = pixmap->drawable.height;
commit 118ef0781c5064aa0696af59a5dac67091b10046
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Sun Dec 11 16:56:53 2011 +0000
sna/composite: Make the check for a no-op earlier and clearer
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/sna_composite.c b/src/sna/sna_composite.c
index 1d66a8d..3c04d32 100644
--- a/src/sna/sna_composite.c
+++ b/src/sna/sna_composite.c
@@ -49,6 +49,12 @@ region_is_singular(pixman_region16_t *region)
return region->data == NULL;
}
+static inline bool
+region_is_empty(pixman_region16_t *region)
+{
+ return region->data && region->data->numRects == 0;
+}
+
static inline pixman_bool_t
clip_to_dst(pixman_region16_t *region,
pixman_region16_t *clip,
@@ -84,7 +90,7 @@ clip_to_dst(pixman_region16_t *region,
}
return TRUE;
- } else if (!pixman_region_not_empty(clip)) {
+ } else if (region_is_empty(clip)) {
return FALSE;
} else {
if (dx | dy)
@@ -94,7 +100,7 @@ clip_to_dst(pixman_region16_t *region,
if (dx | dy)
pixman_region_translate(region, dx, dy);
- return pixman_region_not_empty(region);
+ return !region_is_empty(region);
}
}
@@ -116,7 +122,7 @@ clip_to_src(RegionPtr region, PicturePtr p, int dx, int dy)
-(p->clipOrigin.x + dx),
-(p->clipOrigin.y + dy));
- return result && pixman_region_not_empty(region);
+ return result && !region_is_empty(region);
}
Bool
@@ -231,7 +237,7 @@ sna_compute_composite_region(RegionPtr region,
region->extents.x2, region->extents.y2));
}
- return pixman_region_not_empty(region);
+ return !region_is_empty(region);
}
static void
@@ -405,6 +411,11 @@ sna_composite(CARD8 op,
dst_x, dst_y, dst->pDrawable->x, dst->pDrawable->y,
width, height));
+ if (region_is_empty(dst->pCompositeClip)) {
+ DBG(("%s: empty clip, skipping\n", __FUNCTION__));
+ return;
+ }
+
if (mask && sna_composite_mask_is_opaque(mask)) {
DBG(("%s: removing opaque %smask\n",
__FUNCTION__,
@@ -594,6 +605,11 @@ sna_composite_rectangles(CARD8 op,
if (!num_rects)
return;
+ if (region_is_empty(dst->pCompositeClip)) {
+ DBG(("%s: empty clip, skipping\n", __FUNCTION__));
+ return;
+ }
+
if (color->alpha <= 0x00ff) {
switch (op) {
case PictOpOver:
@@ -631,11 +647,6 @@ sna_composite_rectangles(CARD8 op,
}
DBG(("%s: converted to op %d\n", __FUNCTION__, op));
- if (!pixman_region_not_empty(dst->pCompositeClip)) {
- DBG(("%s: empty clip, skipping\n", __FUNCTION__));
- return;
- }
-
if (!_pixman_region_init_clipped_rectangles(®ion,
num_rects, rects,
dst->pDrawable->x, dst->pDrawable->y,
@@ -652,7 +663,7 @@ sna_composite_rectangles(CARD8 op,
RegionNumRects(®ion)));
if (!pixman_region_intersect(®ion, ®ion, dst->pCompositeClip) ||
- !pixman_region_not_empty(®ion)) {
+ region_is_empty(®ion)) {
DBG(("%s: zero-intersection between rectangles and clip\n",
__FUNCTION__));
pixman_region_fini(®ion);
commit 2674ef864c93034d728ee11ee0b7ab96cd4cba57
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Sun Dec 11 16:23:13 2011 +0000
sna: Enable hooking up of valgrind during debugging
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/configure.ac b/configure.ac
index a675a93..6dbeb28 100644
--- a/configure.ac
+++ b/configure.ac
@@ -263,6 +263,8 @@ if test "x$DEBUG" != xno; then
fi
if test "x$DEBUG" = xfull; then
AC_DEFINE(HAS_DEBUG_FULL,1,[Enable all debugging])
+ PKG_CHECK_MODULES(VALGRIND, [valgrind],
+ AC_DEFINE([HAVE_VALGRIND], 0, [Use valgind intrinsics to suppress false warings]),)
CFLAGS="$CFLAGS -O0 -ggdb3"
fi
diff --git a/src/sna/Makefile.am b/src/sna/Makefile.am
index 65e85bf..6043000 100644
--- a/src/sna/Makefile.am
+++ b/src/sna/Makefile.am
@@ -91,6 +91,7 @@ libsna_la_SOURCES += \
endif
if DEBUG
+AM_CFLAGS += @VALGRIND_CFLAGS@
libsna_la_SOURCES += \
kgem_debug.c \
kgem_debug.h \
diff --git a/src/sna/compiler.h b/src/sna/compiler.h
index ad1313b..e84a681 100644
--- a/src/sna/compiler.h
+++ b/src/sna/compiler.h
@@ -40,7 +40,7 @@
#define fastcall
#endif
-#ifdef HAVE_VALGRIND_H
+#ifdef HAVE_VALGRIND
#define VG(x) x
#else
#define VG(x)
diff --git a/src/sna/kgem.c b/src/sna/kgem.c
index d635b7c..7ff0904 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -39,6 +39,11 @@
#include <errno.h>
#include <fcntl.h>
+#ifdef HAVE_VALGRIND
+#include <valgrind.h>
+#include <memcheck.h>
+#endif
+
static inline void list_move(struct list *list, struct list *head)
{
__list_del(list->prev, list->next);
@@ -181,6 +186,7 @@ static int gem_read(int fd, uint32_t handle, const void *dst,
int offset, int length)
{
struct drm_i915_gem_pread pread;
+ int ret;
DBG(("%s(handle=%d, len=%d)\n", __FUNCTION__,
handle, length));
@@ -190,7 +196,12 @@ static int gem_read(int fd, uint32_t handle, const void *dst,
pread.offset = offset;
pread.size = length;
pread.data_ptr = (uintptr_t)dst;
- return drmIoctl(fd, DRM_IOCTL_I915_GEM_PREAD, &pread);
+ ret = drmIoctl(fd, DRM_IOCTL_I915_GEM_PREAD, &pread);
+ if (ret)
+ return ret;
+
+ VG(VALGRIND_MAKE_MEM_DEFINED(dst, length));
+ return 0;
}
static bool
commit c83fd4e24de187700bc125037cd9ae311514213e
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Sun Dec 11 16:14:38 2011 +0000
sna: Add some more debug messages for VMA caching
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/kgem.c b/src/sna/kgem.c
index f7c4ca3..d635b7c 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -607,6 +607,8 @@ static void kgem_bo_free(struct kgem *kgem, struct kgem_bo *bo)
}
if (bo->map) {
+ DBG(("%s: releasing vma for handle=%d, count=%d\n",
+ __FUNCTION__, bo->handle, kgem->vma_count-1));
munmap(bo->map, bo->size);
list_del(&bo->vma);
kgem->vma_count--;
@@ -1871,8 +1873,8 @@ void *kgem_bo_map(struct kgem *kgem, struct kgem_bo *bo, int prot)
bo->map = ptr;
kgem->vma_count++;
- DBG(("%s: caching vma for %d\n",
- __FUNCTION__, bo->handle));
+ DBG(("%s: caching vma for %d, count=%d\n",
+ __FUNCTION__, bo->handle, kgem->vma_count));
}
if (bo->needs_flush | bo->gpu) {
@@ -1896,6 +1898,8 @@ void *kgem_bo_map(struct kgem *kgem, struct kgem_bo *bo, int prot)
void kgem_bo_unmap(struct kgem *kgem, struct kgem_bo *bo)
{
+ DBG(("%s: (debug) releasing vma for handle=%d, count=%d\n",
+ __FUNCTION__, bo->handle, kgem->vma_count-1));
assert(bo->map);
munmap(bo->map, bo->size);
More information about the xorg-commit
mailing list