xf86-video-intel: 9 commits - src/compat-api.h src/sna/fb src/sna/gen3_render.c src/sna/gen4_render.c src/sna/gen5_render.c src/sna/gen6_render.c src/sna/gen7_render.c src/sna/gen8_render.c src/sna/sna_accel.c src/sna/sna_composite.c src/sna/sna_damage.c src/sna/sna_display.c src/sna/sna_dri2.c src/sna/sna_driver.c src/sna/sna_glyphs.c src/sna/sna.h src/sna/sna_tiling.c src/sna/sna_trapezoids_boxes.c src/sna/sna_trapezoids_imprecise.c src/sna/sna_trapezoids_mono.c src/sna/sna_trapezoids_precise.c src/sna/sna_video_overlay.c src/sna/sna_video_sprite.c src/sna/sna_video_textured.c
Chris Wilson
ickle at kemper.freedesktop.org
Wed Jun 11 03:15:45 PDT 2014
src/compat-api.h | 24 +++
src/sna/fb/fbbitmap.c | 4
src/sna/fb/fblinebits.h | 8 -
src/sna/fb/fbpoint.c | 4
src/sna/gen3_render.c | 16 +-
src/sna/gen4_render.c | 4
src/sna/gen5_render.c | 4
src/sna/gen6_render.c | 8 -
src/sna/gen7_render.c | 8 -
src/sna/gen8_render.c | 83 +++++++++---
src/sna/sna.h | 9 -
src/sna/sna_accel.c | 253 +++++++++++++++++++------------------
src/sna/sna_composite.c | 16 +-
src/sna/sna_damage.c | 61 ++++----
src/sna/sna_display.c | 194 ++++++++++++++++++++++------
src/sna/sna_dri2.c | 14 +-
src/sna/sna_driver.c | 42 +-----
src/sna/sna_glyphs.c | 12 -
src/sna/sna_tiling.c | 14 +-
src/sna/sna_trapezoids_boxes.c | 44 +++---
src/sna/sna_trapezoids_imprecise.c | 40 ++---
src/sna/sna_trapezoids_mono.c | 16 +-
src/sna/sna_trapezoids_precise.c | 40 ++---
src/sna/sna_video_overlay.c | 8 -
src/sna/sna_video_sprite.c | 6
src/sna/sna_video_textured.c | 4
26 files changed, 560 insertions(+), 376 deletions(-)
New commits:
commit 4fccfe3a516ab8383dfd99ccd7fe1840c88bbc01
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Fri Jun 6 08:30:59 2014 +0100
sna/gen8: Check offset alignment before using a userptr for RENDER
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=79053
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/gen8_render.c b/src/sna/gen8_render.c
index 3de9259..0cbfff9 100644
--- a/src/sna/gen8_render.c
+++ b/src/sna/gen8_render.c
@@ -214,6 +214,35 @@ static inline bool too_large(int width, int height)
return width > GEN8_MAX_SIZE || height > GEN8_MAX_SIZE;
}
+static bool unaligned(struct kgem_bo *bo, int bpp)
+{
+ int x, y;
+
+ if (bo->proxy == NULL)
+ return false;
+
+ /* Assume that all tiled proxies are constructed correctly. */
+ if (bo->tiling)
+ return true;
+
+ DBG(("%s: checking alignment of a linear proxy, offset=%d, pitch=%d, bpp=%d: => (%d, %d)\n",
+ __FUNCTION__, bo->delta, bo->pitch, bpp,
+ 8 * (bo->delta % bo->pitch) / bpp, bo->delta / bo->pitch));
+
+ /* This may be a random userptr map, check that it meets the
+ * render alignment of SURFACE_VALIGN_4 | SURFACE_HALIGN_4.
+ */
+ y = bo->delta / bo->pitch;
+ if (y & 3)
+ return false;
+
+ x = 8 * (bo->delta - y * bo->pitch);
+ if (x & (4*bpp - 1))
+ return false;
+
+ return true;
+}
+
static uint32_t gen8_get_blend(int op,
bool has_component_alpha,
uint32_t dst_format)
@@ -1855,13 +1884,18 @@ gen8_composite_picture(struct sna *sna,
x, y, w, h, dst_x, dst_y);
}
-static void gen8_composite_channel_convert(struct sna_composite_channel *channel)
+static bool gen8_composite_channel_convert(struct sna_composite_channel *channel)
{
+ if (unaligned(channel->bo, PICT_FORMAT_BPP(channel->pict_format)))
+ return false;
+
channel->repeat = gen8_repeat(channel->repeat);
channel->filter = gen8_filter(channel->filter);
if (channel->card_format == (unsigned)-1)
channel->card_format = gen8_get_card_format(channel->pict_format);
assert(channel->card_format != (unsigned)-1);
+
+ return true;
}
static void gen8_render_composite_done(struct sna *sna,
@@ -1917,6 +1951,9 @@ gen8_composite_set_target(struct sna *sna,
if (op->dst.bo == NULL)
return false;
+ if (unaligned(op->dst.bo, dst->pDrawable->bitsPerPixel))
+ return false;
+
get_drawable_deltas(dst->pDrawable, op->dst.pixmap,
&op->dst.x, &op->dst.y);
@@ -2247,13 +2284,16 @@ gen8_render_composite(struct sna *sna,
case 1:
/* Did we just switch rings to prepare the source? */
if (mask == NULL &&
- prefer_blt_composite(sna, tmp) &&
+ (prefer_blt_composite(sna, tmp) ||
+ unaligned(tmp->src.bo, PICT_FORMAT_BPP(tmp->src.pict_format))) &&
sna_blt_composite__convert(sna,
dst_x, dst_y, width, height,
tmp))
return true;
- gen8_composite_channel_convert(&tmp->src);
+ if (!gen8_composite_channel_convert(&tmp->src))
+ goto cleanup_dst;
+
break;
}
@@ -2298,7 +2338,8 @@ gen8_render_composite(struct sna *sna,
goto cleanup_src;
/* fall through to fixup */
case 1:
- gen8_composite_channel_convert(&tmp->mask);
+ if (!gen8_composite_channel_convert(&tmp->mask))
+ goto cleanup_src;
break;
}
}
@@ -2532,7 +2573,8 @@ gen8_render_composite_spans(struct sna *sna,
goto cleanup_dst;
/* fall through to fixup */
case 1:
- gen8_composite_channel_convert(&tmp->base.src);
+ if (!gen8_composite_channel_convert(&tmp->base.src))
+ goto cleanup_dst;
break;
}
tmp->base.mask.bo = NULL;
@@ -2712,7 +2754,9 @@ gen8_render_copy_boxes(struct sna *sna, uint8_t alu,
box, n))
return true;
- if (!(alu == GXcopy || alu == GXclear)) {
+ if (!(alu == GXcopy || alu == GXclear) ||
+ unaligned(src_bo, src->drawable.bitsPerPixel) ||
+ unaligned(dst_bo, dst->drawable.bitsPerPixel)) {
fallback_blt:
DBG(("%s: fallback blt\n", __FUNCTION__));
if (!sna_blt_compare_depth(&src->drawable, &dst->drawable))
@@ -2955,7 +2999,9 @@ gen8_render_copy(struct sna *sna, uint8_t alu,
if (!(alu == GXcopy || alu == GXclear) || src_bo == dst_bo ||
too_large(src->drawable.width, src->drawable.height) ||
- too_large(dst->drawable.width, dst->drawable.height)) {
+ too_large(dst->drawable.width, dst->drawable.height) ||
+ unaligned(src_bo, src->drawable.bitsPerPixel) ||
+ unaligned(dst_bo, dst->drawable.bitsPerPixel)) {
fallback:
if (!sna_blt_compare_depth(&src->drawable, &dst->drawable))
return false;
@@ -3072,7 +3118,8 @@ gen8_render_fill_boxes(struct sna *sna,
}
if (prefer_blt_fill(sna, dst_bo, FILL_BOXES) ||
- !gen8_check_dst_format(format)) {
+ !gen8_check_dst_format(format) ||
+ unaligned(dst_bo, PICT_FORMAT_BPP(format))) {
uint8_t alu = GXinvalid;
if (op <= PictOpSrc) {
@@ -3301,7 +3348,8 @@ gen8_render_fill(struct sna *sna, uint8_t alu,
return true;
if (!(alu == GXcopy || alu == GXclear) ||
- too_large(dst->drawable.width, dst->drawable.height))
+ too_large(dst->drawable.width, dst->drawable.height) ||
+ unaligned(dst_bo, dst->drawable.bitsPerPixel))
return sna_blt_fill(sna, alu,
dst_bo, dst->drawable.bitsPerPixel,
color,
@@ -3387,7 +3435,8 @@ gen8_render_fill_one(struct sna *sna, PixmapPtr dst, struct kgem_bo *bo,
/* Must use the BLT if we can't RENDER... */
if (!(alu == GXcopy || alu == GXclear) ||
- too_large(dst->drawable.width, dst->drawable.height))
+ too_large(dst->drawable.width, dst->drawable.height) ||
+ unaligned(bo, dst->drawable.bitsPerPixel))
return gen8_render_fill_one_try_blt(sna, dst, bo, color,
x1, y1, x2, y2, alu);
@@ -3479,7 +3528,8 @@ gen8_render_clear(struct sna *sna, PixmapPtr dst, struct kgem_bo *bo)
return true;
/* Must use the BLT if we can't RENDER... */
- if (too_large(dst->drawable.width, dst->drawable.height))
+ if (too_large(dst->drawable.width, dst->drawable.height) ||
+ unaligned(bo, dst->drawable.bitsPerPixel))
return gen8_render_clear_try_blt(sna, dst, bo);
tmp.dst.pixmap = dst;
@@ -3673,6 +3723,9 @@ gen8_render_video(struct sna *sna,
REGION_EXTENTS(NULL, dstRegion)->y2));
assert(priv->gpu_bo);
+ assert(!too_large(pixmap->drawable.width, pixmap->drawable.height));
+ assert(!unaligned(priv->gpu_bo, pixmap->drawable.bitsPerPixel));
+
memset(&tmp, 0, sizeof(tmp));
tmp.dst.pixmap = pixmap;
commit 1217dbc88e0901e4a657ee51e2e3b7d00bb72b77
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Thu Apr 17 21:04:15 2014 +0100
sna: Support efficient cursor updates for old machines
Given a kernel patch to fix coherency of physical objects, we can use a
more efficient method for updating cursors.
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index 12f1e8d..251d305 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -4366,6 +4366,7 @@ sna_cursor_pre_init(struct sna *sna)
uint64_t name;
uint64_t value;
} cap;
+ int v;
if (sna->mode.num_real_crtc == 0)
return;
@@ -4374,6 +4375,8 @@ sna_cursor_pre_init(struct sna *sna)
#define DRM_CAP_CURSOR_WIDTH 8
#define DRM_CAP_CURSOR_HEIGHT 9
+#define I915_PARAM_HAS_COHERENT_PHYS_GTT 29
+
sna->cursor.max_size = 64;
cap.value = 0;
@@ -4387,7 +4390,17 @@ sna_cursor_pre_init(struct sna *sna)
assert(sna->cursor.max_size == cap.value);
#endif
- sna->cursor.use_gtt = sna->kgem.gen >= 033;
+ v = -1; /* No param uses the sign bit, reserve it for errors */
+ if (sna->kgem.gen >= 033) {
+ v = 1;
+ } else {
+ drm_i915_getparam_t gp = {
+ I915_PARAM_HAS_COHERENT_PHYS_GTT,
+ &v,
+ };
+ (void)drmIoctl(sna->kgem.fd, DRM_IOCTL_I915_GETPARAM, &gp);
+ }
+ sna->cursor.use_gtt = v > 0;
DBG(("%s: cursor updates use_gtt?=%d\n",
__FUNCTION__, sna->cursor.use_gtt));
commit ee7d2e0a8ef882c1d4e0e77a0148b54dcfbf4236
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Fri Jun 6 12:00:35 2014 +0100
sna: MST topologies may change on any hotplug event
As the kernel does not send out an explicit DISCOVER event, we have to
reinspect every connector after every hotplug event to detect topology
changes.
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/sna.h b/src/sna/sna.h
index a44235b..dfdfc65 100644
--- a/src/sna/sna.h
+++ b/src/sna/sna.h
@@ -253,7 +253,6 @@ struct sna {
#define SNA_REMOVE_OUTPUTS 0x400
#define SNA_HAS_FLIP 0x10000
#define SNA_HAS_ASYNC_FLIP 0x20000
-#define SNA_REDISCOVER 0x40000000
#define SNA_REPROBE 0x80000000
unsigned cpu_features;
diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c
index 0075936..4df93eb 100644
--- a/src/sna/sna_driver.c
+++ b/src/sna/sna_driver.c
@@ -759,21 +759,12 @@ sna_handle_uevents(int fd, void *closure)
return;
}
- str = udev_device_get_property_value(dev, "DISCOVER");
- if (str && atoi(str) == 1) {
- DBG(("%s: discover event (vtSema?=%d)\n",
- __FUNCTION__, sna->scrn->vtSema));
- if (sna->scrn->vtSema)
- sna_mode_discover(sna);
- else
- sna->flags |= SNA_REDISCOVER;
- }
-
str = udev_device_get_property_value(dev, "HOTPLUG");
if (str && atoi(str) == 1) {
DBG(("%s: hotplug event (vtSema?=%d)\n",
__FUNCTION__, sna->scrn->vtSema));
if (sna->scrn->vtSema) {
+ sna_mode_discover(sna);
sna_mode_check(sna);
RRGetInfo(xf86ScrnToScreen(scrn), TRUE);
} else
@@ -1178,16 +1169,10 @@ static Bool sna_enter_vt(VT_FUNC_ARGS_DECL)
if (intel_get_master(scrn))
return FALSE;
- if (sna->flags & SNA_REDISCOVER) {
- DBG(("%s: reporting deferred discover event\n",
- __FUNCTION__));
- sna_mode_discover(sna);
- sna->flags &= ~SNA_REDISCOVER;
- }
-
if (sna->flags & SNA_REPROBE) {
DBG(("%s: reporting deferred hotplug event\n",
__FUNCTION__));
+ sna_mode_discover(sna);
RRGetInfo(xf86ScrnToScreen(scrn), TRUE);
sna->flags &= ~SNA_REPROBE;
}
commit 782c920b01d5144125f2fe954e29fd7b07a1913e
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Thu May 8 08:04:58 2014 +0100
sna: Create a stable output name based on MST topology
In order to provide persistent names for MST devices, which may change
topology dynamically, the kernel exports a PATH blob. We can then use
this path to generate the output name, and so reuse existing XID when a
monitor is plugged back in.
Based on the patch for -modesetting by Dave Airlie.
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index 36084d0..12f1e8d 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -2592,6 +2592,8 @@ sna_output_destroy(xf86OutputPtr output)
free(sna_output->edid_raw);
for (i = 0; i < sna_output->num_props; i++) {
+ if (output->randr_output)
+ RRDeleteOutputProperty(output->randr_output, sna_output->props[i].atoms[0]);
drmModeFreeProperty(sna_output->props[i].kprop);
free(sna_output->props[i].atoms);
}
@@ -3122,6 +3124,66 @@ sna_mode_compute_possible_outputs(struct sna *sna)
}
}
+static int name_from_path(struct sna *sna,
+ struct sna_output *sna_output,
+ char *name)
+{
+ struct drm_mode_get_blob blob;
+ char buf[32], *path = buf;
+ int id;
+
+ id = find_property(sna, sna_output, "PATH");
+ DBG(("%s: found? PATH=%d\n", __FUNCTION__, id));
+ if (id == -1)
+ return 0;
+
+ VG_CLEAR(blob);
+ blob.blob_id = sna_output->prop_values[id];
+ blob.length = sizeof(buf)-1;
+ blob.data = (uintptr_t)path;
+ VG(memset(path, 0, blob.length));
+ if (drmIoctl(sna->kgem.fd, DRM_IOCTL_MODE_GETPROPBLOB, &blob))
+ return 0;
+
+ if (blob.length >= sizeof(buf)) {
+ path = alloca(blob.length + 1);
+ blob.data = (uintptr_t)path;
+ VG(memset(path, 0, blob.length));
+ DBG(("%s: reading %d bytes for path blob\n", __FUNCTION__, blob.length));
+ if (drmIoctl(sna->kgem.fd, DRM_IOCTL_MODE_GETPROPBLOB, &blob))
+ return 0;
+ }
+
+ path[blob.length] = '\0'; /* paranoia */
+ DBG(("%s: PATH='%s'\n", __FUNCTION__, path));
+
+ /* we only handle MST paths for now */
+ if (strncmp(path, "mst:", 4) == 0) {
+ xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(sna->scrn);
+ char tmp[5], *c;
+ int n;
+
+ c = strchr(path + 4, '-');
+ if (c == NULL)
+ return 0;
+
+ id = c - (path + 4);
+ if (id + 1> 5)
+ return 0;
+
+ memcpy(tmp, path + 4, id);
+ tmp[id] = '\0';
+ id = strtoul(tmp, NULL, 0);
+
+ for (n = 0; n < sna->mode.num_real_output; n++) {
+ if (to_sna_output(config->output[n])->id == id)
+ return snprintf(name, 32, "%s-%s", config->output[n]->name, c + 1);
+ }
+ }
+
+ return 0;
+}
+
static int
sna_output_add(struct sna *sna, int id, int serial)
{
@@ -3135,7 +3197,7 @@ sna_output_add(struct sna *sna, int id, int serial)
unsigned possible_encoders, attached_encoders, possible_crtcs;
const char *output_name;
char name[32];
- int len, i;
+ int path, len, i;
DBG(("%s(%d): serial=%d\n", __FUNCTION__, id, serial));
@@ -3251,6 +3313,39 @@ sna_output_add(struct sna *sna, int id, int serial)
VG(VALGRIND_MAKE_MEM_DEFINED(sna_output->prop_ids, sizeof(uint32_t)*sna_output->num_props));
VG(VALGRIND_MAKE_MEM_DEFINED(sna_output->prop_values, sizeof(uint64_t)*sna_output->num_props));
+ /* Construct name from topology, and recheck if output is acceptable */
+ path = name_from_path(sna, sna_output, name);
+ if (path) {
+ const char *str;
+
+ if (output_ignored(scrn, name)) {
+ len = 0;
+ goto skip;
+ }
+
+ if (serial) {
+ for (i = 0; i < sna->mode.num_real_output; i++) {
+ output = config->output[i];
+ if (strcmp(output->name, name) == 0) {
+ assert(output->scrn == scrn);
+ assert(output->funcs == &sna_output_funcs);
+ assert(to_sna_output(output)->id == 0);
+ sna_output_destroy(output);
+ goto reset;
+ }
+ }
+ }
+
+ str = xf86GetOptValString(sna->Options, OPTION_ZAPHOD);
+ if (str && !sna_zaphod_match(str, name)) {
+ DBG(("%s: zaphod mismatch, want %s, have %s\n", __FUNCTION__, str, name));
+ len = 0;
+ goto skip;
+ }
+
+ len = path;
+ }
+
output = calloc(1, sizeof(*output) + len + 1);
if (!output)
goto cleanup;
@@ -3279,6 +3374,7 @@ sna_output_add(struct sna *sna, int id, int serial)
output->use_screen_monitor = config->num_output != 1;
xf86OutputUseScreenMonitor(output, !output->use_screen_monitor);
+reset:
sna_output->id = compat_conn.conn.connector_id;
sna_output->is_panel = is_panel(compat_conn.conn.connector_type);
sna_output->edid_idx = find_property(sna, sna_output, "EDID");
@@ -3312,9 +3408,11 @@ sna_output_add(struct sna *sna, int id, int serial)
output->interlaceAllowed = TRUE;
if (serial) {
- output->randr_output = RROutputCreate(xf86ScrnToScreen(scrn), name, len, output);
- if (output->randr_output == NULL)
- goto cleanup;
+ if (output->randr_output == NULL) {
+ output->randr_output = RROutputCreate(xf86ScrnToScreen(scrn), name, len, output);
+ if (output->randr_output == NULL)
+ goto cleanup;
+ }
sna_output_create_resources(output);
RRPostPendingProperties(output->randr_output);
@@ -3337,10 +3435,12 @@ sna_output_add(struct sna *sna, int id, int serial)
return 1;
cleanup:
+ len = -1;
+skip:
free(sna_output->prop_ids);
free(sna_output->prop_values);
free(sna_output);
- return -1;
+ return len;
}
static void sna_output_del(xf86OutputPtr output)
commit e680e54eab6ffa72e5e1eb6cc0e3fe4b235b06a1
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Wed Jun 11 10:48:26 2014 +0100
sna: Ignore setting read-only for temporary userptr maps
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index 563712c..ed53fcc 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -4460,7 +4460,7 @@ try_upload_blt(PixmapPtr pixmap, RegionRec *region,
if (!sna_pixmap_move_area_to_gpu(pixmap, ®ion->extents, MOVE_WRITE | MOVE_ASYNC_HINT | (region->data ? MOVE_READ : 0)))
return false;
- src_bo = kgem_create_map(&sna->kgem, bits, stride * h, true);
+ src_bo = kgem_create_map(&sna->kgem, bits, stride * h, false);
if (src_bo == NULL)
return false;
@@ -6223,7 +6223,7 @@ sna_copy_boxes(DrawablePtr src, DrawablePtr dst, GCPtr gc,
src_bo = kgem_create_map(&sna->kgem,
src_pixmap->devPrivate.ptr,
src_pixmap->devKind * src_pixmap->drawable.height,
- true);
+ false);
if (src_bo) {
src_bo->pitch = src_pixmap->devKind;
kgem_bo_mark_unreusable(src_bo);
commit d9bf6f3fecb3d691937da086a5270334c6c0e69a
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Wed Jun 11 10:35:50 2014 +0100
sna: Prefer to operate inplace on the GPU rather than stall on the CPU
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index 55b6451..563712c 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -1593,6 +1593,11 @@ static inline bool pixmap_inplace(struct sna *sna,
return has_coherent_map(sna, priv->gpu_bo, flags);
}
+ if (priv->cpu_bo && kgem_bo_is_busy(priv->cpu_bo)) {
+ DBG(("%s: yes, has CPU bo and is active on CPU\n", __FUNCTION__));
+ return true;
+ }
+
if (priv->cpu_bo && priv->cpu) {
DBG(("%s: no, has CPU bo and was last active on CPU, presume future CPU activity\n", __FUNCTION__));
return false;
commit 277e6ab84bb0c692358a34a76e7962c64efb0362
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Wed Jun 11 10:12:01 2014 +0100
sna: Discard TearFree damage before checking for an overwriting upload
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/sna.h b/src/sna/sna.h
index e504ee0..a44235b 100644
--- a/src/sna/sna.h
+++ b/src/sna/sna.h
@@ -428,8 +428,8 @@ extern void sna_mode_wakeup(struct sna *sna);
extern void sna_mode_redisplay(struct sna *sna);
extern void sna_shadow_set_crtc(struct sna *sna, xf86CrtcPtr crtc, struct kgem_bo *bo);
extern void sna_shadow_unset_crtc(struct sna *sna, xf86CrtcPtr crtc);
-extern void sna_pixmap_discard_shadow_damage(struct sna_pixmap *priv,
- RegionPtr region);
+extern bool sna_pixmap_discard_shadow_damage(struct sna_pixmap *priv,
+ const RegionRec *region);
extern void sna_mode_close(struct sna *sna);
extern void sna_mode_fini(struct sna *sna);
diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index c5f3f56..55b6451 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -474,12 +474,16 @@ sna_copy_init_blt(struct sna_copy_op *copy,
static void sna_pixmap_free_gpu(struct sna *sna, struct sna_pixmap *priv)
{
+ DBG(("%s: handle=%d (pinned? %d)\n", __FUNCTION__, priv->gpu_bo ? priv->gpu_bo->handle : 0, priv->pinned));
assert(priv->gpu_damage == NULL || priv->gpu_bo);
if (priv->cow)
- sna_pixmap_undo_cow(sna, priv, 0);
+ sna_pixmap_undo_cow(sna, priv, MOVE_WRITE);
assert(priv->cow == NULL);
+ if (priv->move_to_gpu)
+ priv->move_to_gpu(sna, priv, MOVE_WRITE);
+
sna_damage_destroy(&priv->gpu_damage);
priv->clear = false;
@@ -4423,7 +4427,7 @@ try_upload_blt(PixmapPtr pixmap, RegionRec *region,
if (priv == NULL)
return false;
- if (DAMAGE_IS_ALL(priv->cpu_damage) || priv->gpu_damage == NULL) {
+ if (DAMAGE_IS_ALL(priv->cpu_damage) || priv->gpu_damage == NULL || priv->cpu) {
DBG(("%s: no, no gpu damage\n", __FUNCTION__));
return false;
}
@@ -4433,19 +4437,13 @@ try_upload_blt(PixmapPtr pixmap, RegionRec *region,
if ((priv->create & (KGEM_CAN_CREATE_GTT | KGEM_CAN_CREATE_LARGE)) == KGEM_CAN_CREATE_GTT &&
kgem_bo_can_map(&sna->kgem, priv->gpu_bo) &&
- !__kgem_bo_is_busy(&sna->kgem, priv->gpu_bo)) {
+ (priv->cow == NULL &&
+ (priv->move_to_gpu == NULL || sna_pixmap_discard_shadow_damage(priv, region)) &&
+ !__kgem_bo_is_busy(&sna->kgem, priv->gpu_bo))) {
DBG(("%s: no, target is idle\n", __FUNCTION__));
return false;
}
- if (priv->cow || priv->move_to_gpu) {
- if (!region_subsumes_drawable(region, &pixmap->drawable) ||
- !sna_pixmap_move_to_gpu(pixmap, MOVE_WRITE)) {
- DBG(("%s: no, target is a partial COW\n", __FUNCTION__));
- return false;
- }
- }
-
if (priv->cpu_damage &&
sna_damage_contains_box__no_reduce(priv->cpu_damage,
®ion->extents) &&
@@ -4454,6 +4452,9 @@ try_upload_blt(PixmapPtr pixmap, RegionRec *region,
return false;
}
+ if (!sna_pixmap_move_area_to_gpu(pixmap, ®ion->extents, MOVE_WRITE | MOVE_ASYNC_HINT | (region->data ? MOVE_READ : 0)))
+ return false;
+
src_bo = kgem_create_map(&sna->kgem, bits, stride * h, true);
if (src_bo == NULL)
return false;
@@ -4500,9 +4501,9 @@ try_upload_blt(PixmapPtr pixmap, RegionRec *region,
list_del(&priv->flush_list);
if (sna_pixmap_free_cpu(sna, priv, priv->cpu))
sna_damage_all(&priv->gpu_damage, pixmap);
- priv->cpu = false;
}
}
+ priv->cpu = false;
priv->clear = false;
return true;
@@ -4543,7 +4544,8 @@ try_upload_tiled_x(PixmapPtr pixmap, RegionRec *region,
if (priv->gpu_bo && replaces) {
if (UNDO) kgem_bo_pair_undo(&sna->kgem, priv->gpu_bo, priv->cpu_bo);
if (can_create_upload_tiled_x(&sna->kgem, pixmap, priv, true) &&
- (__kgem_bo_is_busy(&sna->kgem, priv->gpu_bo) ||
+ (priv->cow ||
+ __kgem_bo_is_busy(&sna->kgem, priv->gpu_bo) ||
!kgem_bo_can_map__cpu(&sna->kgem, priv->gpu_bo, true))) {
DBG(("%s: discarding unusable target bo (busy? %d, mappable? %d)\n", __FUNCTION__,
kgem_bo_is_busy(priv->gpu_bo),
@@ -4554,9 +4556,10 @@ try_upload_tiled_x(PixmapPtr pixmap, RegionRec *region,
}
assert(priv->gpu_bo == NULL || priv->gpu_bo->proxy == NULL);
- if ((priv->cow || priv->move_to_gpu) &&
- (!replaces || !sna_pixmap_move_to_gpu(pixmap, MOVE_WRITE))) {
- DBG(("%s: no, has COW or pending move-to-gpu\n", __FUNCTION__));
+ if (priv->cow ||
+ (priv->move_to_gpu && !sna_pixmap_discard_shadow_damage(priv, replaces ? NULL : region))) {
+ DBG(("%s: no, has pending COW? %d or move-to-gpu? %d\n",
+ __FUNCTION__, priv->cow != NULL, priv->move_to_gpu != NULL));
return false;
}
diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index b0f6ea7..36084d0 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -1205,30 +1205,37 @@ done:
return ret;
}
-void sna_pixmap_discard_shadow_damage(struct sna_pixmap *priv,
- RegionPtr region)
+bool sna_pixmap_discard_shadow_damage(struct sna_pixmap *priv,
+ const RegionRec *region)
{
struct sna *sna;
if (priv->move_to_gpu != wait_for_shadow)
- return;
+ return false;
sna = priv->move_to_gpu_data;
- DBG(("%s: discarding region %dx[(%d, %d), (%d, %d)] from damage %dx[(%d, %d], (%d, %d)]\n",
- __FUNCTION__,
- region_num_rects(region),
- region->extents.x1, region->extents.y1,
- region->extents.x2, region->extents.y2,
- region_num_rects(&sna->mode.shadow_region),
- sna->mode.shadow_region.extents.x1, sna->mode.shadow_region.extents.y1,
- sna->mode.shadow_region.extents.x2, sna->mode.shadow_region.extents.y2));
+ if (region) {
+ DBG(("%s: discarding region %dx[(%d, %d), (%d, %d)] from damage %dx[(%d, %d], (%d, %d)]\n",
+ __FUNCTION__,
+ region_num_rects(region),
+ region->extents.x1, region->extents.y1,
+ region->extents.x2, region->extents.y2,
+ region_num_rects(&sna->mode.shadow_region),
+ sna->mode.shadow_region.extents.x1, sna->mode.shadow_region.extents.y1,
+ sna->mode.shadow_region.extents.x2, sna->mode.shadow_region.extents.y2));
- if (region)
RegionSubtract(&sna->mode.shadow_region,
&sna->mode.shadow_region,
- region);
- else
+ (RegionPtr)region);
+ } else {
+ DBG(("%s: discarding all damage %dx[(%d, %d], (%d, %d)]\n",
+ region_num_rects(&sna->mode.shadow_region),
+ sna->mode.shadow_region.extents.x1, sna->mode.shadow_region.extents.y1,
+ sna->mode.shadow_region.extents.x2, sna->mode.shadow_region.extents.y2));
RegionEmpty(&sna->mode.shadow_region);
+ }
+
+ return RegionNil(&sna->mode.shadow_region);
}
static bool sna_mode_enable_shadow(struct sna *sna)
commit eb9de37daaea45e917fa7f44444a9782070f7333
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Wed Jun 11 09:29:50 2014 +0100
sna: Silence compiler warnings for discarding const Region points
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/compat-api.h b/src/compat-api.h
index c7b0aae..286d42b 100644
--- a/src/compat-api.h
+++ b/src/compat-api.h
@@ -107,6 +107,30 @@
#endif
+static inline int
+region_num_rects(const RegionRec *r)
+{
+ return r->data ? r->data->numRects : 1;
+}
+
+static inline int
+region_nil(const RegionRec *r)
+{
+ return region_num_rects(r) == 0;
+}
+
+static inline BoxPtr
+region_boxptr(const RegionRec *r)
+{
+ return (BoxPtr)(r->data + 1);
+}
+
+static inline BoxPtr
+region_rects(const RegionRec *r)
+{
+ return r->data ? region_boxptr(r) : (BoxPtr)&r->extents;
+}
+
#ifndef INCLUDE_LEGACY_REGION_DEFINES
#define RegionCreate(r, s) REGION_CREATE(NULL, r, s)
#define RegionBreak(r) REGION_BREAK(NULL, r)
diff --git a/src/sna/fb/fbbitmap.c b/src/sna/fb/fbbitmap.c
index 2ea92a9..a632abe 100644
--- a/src/sna/fb/fbbitmap.c
+++ b/src/sna/fb/fbbitmap.c
@@ -178,11 +178,11 @@ fbBitmapToRegion(PixmapPtr pixmap)
} else
region->extents.x1 = region->extents.x2 = 0;
- DBG(("%s: region extents=(%d, %d), (%d, %d) x %ld\n",
+ DBG(("%s: region extents=(%d, %d), (%d, %d) x %d\n",
__FUNCTION__,
region->extents.x1, region->extents.y1,
region->extents.x2, region->extents.y2,
- (long)RegionNumRects(region)));
+ region_num_rects(region)));
return region;
}
diff --git a/src/sna/fb/fblinebits.h b/src/sna/fb/fblinebits.h
index 67e98e5..a4bc4fa 100644
--- a/src/sna/fb/fblinebits.h
+++ b/src/sna/fb/fblinebits.h
@@ -30,8 +30,8 @@ POLYLINE(DrawablePtr drawable, GCPtr gc, int mode, int n_0, DDXPointPtr pt_0)
int xoff = drawable->x;
int yoff = drawable->y;
unsigned int bias = miGetZeroLineBias(drawable->pScreen);
- const BoxRec *clip = RegionRects(gc->pCompositeClip);
- const BoxRec *const last_clip = clip + RegionNumRects(gc->pCompositeClip);
+ const BoxRec *clip = region_rects(gc->pCompositeClip);
+ const BoxRec *const last_clip = clip + region_num_rects(gc->pCompositeClip);
FbBits *dst;
int dstStride;
@@ -148,8 +148,8 @@ POLYSEGMENT(DrawablePtr drawable, GCPtr gc, int n_0, xSegment *seg_0)
int xoff = drawable->x;
int yoff = drawable->y;
unsigned int bias = miGetZeroLineBias(drawable->pScreen);
- const BoxRec *clip = RegionRects(gc->pCompositeClip);
- const BoxRec *const last_clip = clip + RegionNumRects(gc->pCompositeClip);
+ const BoxRec *clip = region_rects(gc->pCompositeClip);
+ const BoxRec *const last_clip = clip + region_num_rects(gc->pCompositeClip);
FbBits *dst;
int dstStride;
diff --git a/src/sna/fb/fbpoint.c b/src/sna/fb/fbpoint.c
index c5f0f87..8ec5e55 100644
--- a/src/sna/fb/fbpoint.c
+++ b/src/sna/fb/fbpoint.c
@@ -93,10 +93,10 @@ fbPolyPoint(DrawablePtr drawable, GCPtr gc,
int xoff, int yoff,
FbBits and, FbBits xor);
- DBG(("%s x %d, clip=[(%d, %d), (%d, %d)]x%ld\n", __FUNCTION__, n,
+ DBG(("%s x %d, clip=[(%d, %d), (%d, %d)]x%d\n", __FUNCTION__, n,
gc->pCompositeClip->extents.x1, gc->pCompositeClip->extents.y1,
gc->pCompositeClip->extents.x2, gc->pCompositeClip->extents.y2,
- (long)RegionNumRects(gc->pCompositeClip)));
+ region_num_rects(gc->pCompositeClip)));
if (mode == CoordModePrevious)
fbFixCoordModePrevious(n, pt);
diff --git a/src/sna/gen3_render.c b/src/sna/gen3_render.c
index fffdb5a..c9e69c3 100644
--- a/src/sna/gen3_render.c
+++ b/src/sna/gen3_render.c
@@ -5382,8 +5382,8 @@ gen3_render_video(struct sna *sna,
PixmapPtr pixmap)
{
struct sna_pixmap *priv = sna_pixmap(pixmap);
- BoxPtr pbox = REGION_RECTS(dstRegion);
- int nbox = REGION_NUM_RECTS(dstRegion);
+ BoxPtr pbox = region_rects(dstRegion);
+ int nbox = region_num_rects(dstRegion);
int dst_width = dstRegion->extents.x2 - dstRegion->extents.x1;
int dst_height = dstRegion->extents.y2 - dstRegion->extents.y1;
int src_width = frame->src.x2 - frame->src.x1;
@@ -5508,8 +5508,8 @@ gen3_render_video(struct sna *sna,
dst_bo, -dstRegion->extents.x1, -dstRegion->extents.y1,
priv->gpu_bo, pix_xoff, pix_yoff,
pixmap->drawable.bitsPerPixel,
- REGION_RECTS(dstRegion),
- REGION_NUM_RECTS(dstRegion));
+ region_rects(dstRegion),
+ region_num_rects(dstRegion));
kgem_bo_destroy(&sna->kgem, dst_bo);
}
@@ -5520,12 +5520,12 @@ gen3_render_video(struct sna *sna,
sna_damage_subtract(&priv->cpu_damage, dstRegion);
} else {
sna_damage_add_boxes(&priv->gpu_damage,
- REGION_RECTS(dstRegion),
- REGION_NUM_RECTS(dstRegion),
+ region_rects(dstRegion),
+ region_num_rects(dstRegion),
pix_xoff, pix_yoff);
sna_damage_subtract_boxes(&priv->cpu_damage,
- REGION_RECTS(dstRegion),
- REGION_NUM_RECTS(dstRegion),
+ region_rects(dstRegion),
+ region_num_rects(dstRegion),
pix_xoff, pix_yoff);
}
}
diff --git a/src/sna/gen4_render.c b/src/sna/gen4_render.c
index 3015c2c..435ede3 100644
--- a/src/sna/gen4_render.c
+++ b/src/sna/gen4_render.c
@@ -1462,8 +1462,8 @@ gen4_render_video(struct sna *sna,
src_scale_y = (float)src_height / dst_height / frame->height;
src_offset_y = (float)frame->src.y1 / frame->height - dstRegion->extents.y1 * src_scale_y;
- box = REGION_RECTS(dstRegion);
- nbox = REGION_NUM_RECTS(dstRegion);
+ box = region_rects(dstRegion);
+ nbox = region_num_rects(dstRegion);
do {
int n;
diff --git a/src/sna/gen5_render.c b/src/sna/gen5_render.c
index 9ad7afe..4167f7b 100644
--- a/src/sna/gen5_render.c
+++ b/src/sna/gen5_render.c
@@ -1412,8 +1412,8 @@ gen5_render_video(struct sna *sna,
src_scale_y = (float)src_height / dst_height / frame->height;
src_offset_y = (float)frame->src.y1 / frame->height - dstRegion->extents.y1 * src_scale_y;
- box = REGION_RECTS(dstRegion);
- nbox = REGION_NUM_RECTS(dstRegion);
+ box = region_rects(dstRegion);
+ nbox = region_num_rects(dstRegion);
while (nbox--) {
BoxRec r;
diff --git a/src/sna/gen6_render.c b/src/sna/gen6_render.c
index 8e25dc4..a7ed2ea 100644
--- a/src/sna/gen6_render.c
+++ b/src/sna/gen6_render.c
@@ -1596,10 +1596,10 @@ gen6_render_video(struct sna *sna,
unsigned filter;
BoxPtr box;
- DBG(("%s: src=(%d, %d), dst=(%d, %d), %ldx[(%d, %d), (%d, %d)...]\n",
+ DBG(("%s: src=(%d, %d), dst=(%d, %d), %dx[(%d, %d), (%d, %d)...]\n",
__FUNCTION__,
src_width, src_height, dst_width, dst_height,
- (long)REGION_NUM_RECTS(dstRegion),
+ region_num_rects(dstRegion),
REGION_EXTENTS(NULL, dstRegion)->x1,
REGION_EXTENTS(NULL, dstRegion)->y1,
REGION_EXTENTS(NULL, dstRegion)->x2,
@@ -1662,8 +1662,8 @@ gen6_render_video(struct sna *sna,
src_scale_y = (float)src_height / dst_height / frame->height;
src_offset_y = (float)frame->src.y1 / frame->height - dstRegion->extents.y1 * src_scale_y;
- box = REGION_RECTS(dstRegion);
- nbox = REGION_NUM_RECTS(dstRegion);
+ box = region_rects(dstRegion);
+ nbox = region_num_rects(dstRegion);
while (nbox--) {
BoxRec r;
diff --git a/src/sna/gen7_render.c b/src/sna/gen7_render.c
index ce137bd..68b2d35 100644
--- a/src/sna/gen7_render.c
+++ b/src/sna/gen7_render.c
@@ -1838,10 +1838,10 @@ gen7_render_video(struct sna *sna,
unsigned filter;
BoxPtr box;
- DBG(("%s: src=(%d, %d), dst=(%d, %d), %ldx[(%d, %d), (%d, %d)...]\n",
+ DBG(("%s: src=(%d, %d), dst=(%d, %d), %dx[(%d, %d), (%d, %d)...]\n",
__FUNCTION__,
src_width, src_height, dst_width, dst_height,
- (long)REGION_NUM_RECTS(dstRegion),
+ region_num_rects(dstRegion),
REGION_EXTENTS(NULL, dstRegion)->x1,
REGION_EXTENTS(NULL, dstRegion)->y1,
REGION_EXTENTS(NULL, dstRegion)->x2,
@@ -1918,8 +1918,8 @@ gen7_render_video(struct sna *sna,
src_scale_x, src_scale_y,
src_offset_x, src_offset_y));
- box = REGION_RECTS(dstRegion);
- nbox = REGION_NUM_RECTS(dstRegion);
+ box = region_rects(dstRegion);
+ nbox = region_num_rects(dstRegion);
while (nbox--) {
BoxRec r;
diff --git a/src/sna/gen8_render.c b/src/sna/gen8_render.c
index c66f7cc..3de9259 100644
--- a/src/sna/gen8_render.c
+++ b/src/sna/gen8_render.c
@@ -3663,10 +3663,10 @@ gen8_render_video(struct sna *sna,
unsigned filter;
BoxPtr box;
- DBG(("%s: src=(%d, %d), dst=(%d, %d), %ldx[(%d, %d), (%d, %d)...]\n",
+ DBG(("%s: src=(%d, %d), dst=(%d, %d), %dx[(%d, %d), (%d, %d)...]\n",
__FUNCTION__,
src_width, src_height, dst_width, dst_height,
- (long)REGION_NUM_RECTS(dstRegion),
+ region_num_rects(dstRegion),
REGION_EXTENTS(NULL, dstRegion)->x1,
REGION_EXTENTS(NULL, dstRegion)->y1,
REGION_EXTENTS(NULL, dstRegion)->x2,
@@ -3741,8 +3741,8 @@ gen8_render_video(struct sna *sna,
src_scale_x, src_scale_y,
src_offset_x, src_offset_y));
- box = REGION_RECTS(dstRegion);
- nbox = REGION_NUM_RECTS(dstRegion);
+ box = region_rects(dstRegion);
+ nbox = region_num_rects(dstRegion);
while (nbox--) {
BoxRec r;
diff --git a/src/sna/sna.h b/src/sna/sna.h
index 2238e80..e504ee0 100644
--- a/src/sna/sna.h
+++ b/src/sna/sna.h
@@ -1134,9 +1134,9 @@ inline static bool is_power_of_two(unsigned x)
inline static bool is_clipped(const RegionRec *r,
const DrawableRec *d)
{
- DBG(("%s: region[%ld]x(%d, %d),(%d, %d) against drawable %dx%d\n",
+ DBG(("%s: region[%d]x(%d, %d),(%d, %d) against drawable %dx%d\n",
__FUNCTION__,
- (long)RegionNumRects(r),
+ region_num_rects(r),
r->extents.x1, r->extents.y1,
r->extents.x2, r->extents.y2,
d->width, d->height));
diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index e7b76d5..c5f3f56 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -2789,8 +2789,8 @@ move_to_cpu:
}
if (priv->clear) {
- int n = RegionNumRects(region);
- BoxPtr box = RegionRects(region);
+ int n = region_num_rects(region);
+ BoxPtr box = region_rects(region);
assert(DAMAGE_IS_ALL(priv->gpu_damage));
assert(priv->cpu_damage == NULL);
@@ -2877,13 +2877,13 @@ move_to_cpu:
* reads.
*/
if (flags & MOVE_WRITE) {
- int n = RegionNumRects(region), i;
- BoxPtr boxes = RegionRects(region);
+ int n = region_num_rects(region), i;
+ BoxPtr boxes = region_rects(region);
BoxPtr blocks;
blocks = NULL;
if (priv->cpu_damage == NULL)
- blocks = malloc(sizeof(BoxRec) * RegionNumRects(region));
+ blocks = malloc(sizeof(BoxRec) * n);
if (blocks) {
for (i = 0; i < n; i++) {
blocks[i].x1 = boxes[i].x1 & ~31;
@@ -2931,8 +2931,8 @@ move_to_cpu:
assert(sna_damage_contains_box(priv->cpu_damage, &r->extents) == PIXMAN_REGION_OUT);
download_boxes(sna, priv,
- RegionNumRects(r),
- RegionRects(r));
+ region_num_rects(r),
+ region_rects(r));
sna_damage_subtract(&priv->gpu_damage, r);
} else {
RegionRec need;
@@ -2943,8 +2943,8 @@ move_to_cpu:
__FUNCTION__));
download_boxes(sna, priv,
- RegionNumRects(&need),
- RegionRects(&need));
+ region_num_rects(&need),
+ region_rects(&need));
sna_damage_subtract(&priv->gpu_damage, r);
RegionUninit(&need);
}
@@ -3271,43 +3271,41 @@ sna_pixmap_move_area_to_gpu(PixmapPtr pixmap, const BoxRec *box, unsigned int fl
assert(priv->cpu_damage);
region_set(&r, box);
if (MIGRATE_ALL || region_subsumes_damage(&r, priv->cpu_damage)) {
+ bool ok = false;
int n;
n = sna_damage_get_boxes(priv->cpu_damage, (BoxPtr *)&box);
- if (n) {
- bool ok = false;
-
- if (use_cpu_bo_for_upload(sna, priv, 0)) {
- DBG(("%s: using CPU bo for upload to GPU\n", __FUNCTION__));
- ok = sna->render.copy_boxes(sna, GXcopy,
- pixmap, priv->cpu_bo, 0, 0,
- pixmap, priv->gpu_bo, 0, 0,
- box, n, 0);
- }
- if (!ok) {
- sna_pixmap_unmap(pixmap, priv);
- if (pixmap->devPrivate.ptr == NULL)
- return NULL;
+ assert(n);
+ if (use_cpu_bo_for_upload(sna, priv, 0)) {
+ DBG(("%s: using CPU bo for upload to GPU\n", __FUNCTION__));
+ ok = sna->render.copy_boxes(sna, GXcopy,
+ pixmap, priv->cpu_bo, 0, 0,
+ pixmap, priv->gpu_bo, 0, 0,
+ box, n, 0);
+ }
+ if (!ok) {
+ sna_pixmap_unmap(pixmap, priv);
+ if (pixmap->devPrivate.ptr == NULL)
+ return NULL;
- assert(pixmap->devKind);
- if (n == 1 && !priv->pinned &&
- box->x1 <= 0 && box->y1 <= 0 &&
- box->x2 >= pixmap->drawable.width &&
- box->y2 >= pixmap->drawable.height) {
- ok = sna_replace(sna, pixmap,
- pixmap->devPrivate.ptr,
- pixmap->devKind);
- } else {
- ok = sna_write_boxes(sna, pixmap,
- priv->gpu_bo, 0, 0,
- pixmap->devPrivate.ptr,
- pixmap->devKind,
- 0, 0,
- box, n);
- }
- if (!ok)
- return NULL;
+ assert(pixmap->devKind);
+ if (n == 1 && !priv->pinned &&
+ box->x1 <= 0 && box->y1 <= 0 &&
+ box->x2 >= pixmap->drawable.width &&
+ box->y2 >= pixmap->drawable.height) {
+ ok = sna_replace(sna, pixmap,
+ pixmap->devPrivate.ptr,
+ pixmap->devKind);
+ } else {
+ ok = sna_write_boxes(sna, pixmap,
+ priv->gpu_bo, 0, 0,
+ pixmap->devPrivate.ptr,
+ pixmap->devKind,
+ 0, 0,
+ box, n);
}
+ if (!ok)
+ return NULL;
}
sna_damage_destroy(&priv->cpu_damage);
@@ -3342,10 +3340,10 @@ sna_pixmap_move_area_to_gpu(PixmapPtr pixmap, const BoxRec *box, unsigned int fl
sna_damage_subtract(&priv->cpu_damage, &r);
} else if (sna_damage_intersect(priv->cpu_damage, &r, &i)) {
- int n = RegionNumRects(&i);
+ int n = region_num_rects(&i);
bool ok;
- box = RegionRects(&i);
+ box = region_rects(&i);
ok = false;
if (use_cpu_bo_for_upload(sna, priv, 0)) {
DBG(("%s: using CPU bo for upload to GPU, %d boxes\n", __FUNCTION__, n));
@@ -4070,6 +4068,7 @@ sna_pixmap_move_to_gpu(PixmapPtr pixmap, unsigned flags)
}
n = sna_damage_get_boxes(priv->cpu_damage, &box);
+ assert(n);
if (n) {
bool ok;
@@ -4462,15 +4461,15 @@ try_upload_blt(PixmapPtr pixmap, RegionRec *region,
src_bo->pitch = stride;
kgem_bo_mark_unreusable(src_bo);
- DBG(("%s: upload(%d, %d, %d, %d) x %ld through a temporary map\n",
- __FUNCTION__, x, y, w, h, (long)RegionNumRects(region)));
+ DBG(("%s: upload(%d, %d, %d, %d) x %d through a temporary map\n",
+ __FUNCTION__, x, y, w, h, region_num_rects(region)));
if (sigtrap_get() == 0) {
ok = sna->render.copy_boxes(sna, GXcopy,
pixmap, src_bo, -x, -y,
pixmap, priv->gpu_bo, 0, 0,
- RegionRects(region),
- RegionNumRects(region),
+ region_rects(region),
+ region_num_rects(region),
COPY_LAST);
sigtrap_put();
} else
@@ -4607,8 +4606,8 @@ try_upload_tiled_x(PixmapPtr pixmap, RegionRec *region,
kgem_bo_sync__cpu(&sna->kgem, priv->gpu_bo);
- box = RegionRects(region);
- n = RegionNumRects(region);
+ box = region_rects(region);
+ n = region_num_rects(region);
DBG(("%s: upload(%d, %d, %d, %d) x %d\n", __FUNCTION__, x, y, w, h, n));
@@ -4753,8 +4752,8 @@ sna_put_zpixmap_blt(DrawablePtr drawable, GCPtr gc, RegionPtr region,
return false;
/* Region is pre-clipped and translated into pixmap space */
- box = RegionRects(region);
- n = RegionNumRects(region);
+ box = region_rects(region);
+ n = region_num_rects(region);
DBG(("%s: upload(%d, %d, %d, %d) x %d boxes\n", __FUNCTION__, x, y, w, h, n));
do {
DBG(("%s: copy box (%d, %d)->(%d, %d)x(%d, %d)\n",
@@ -4850,8 +4849,8 @@ sna_put_xybitmap_blt(DrawablePtr drawable, GCPtr gc, RegionPtr region,
kgem_set_mode(&sna->kgem, KGEM_BLT, bo);
/* Region is pre-clipped and translated into pixmap space */
- box = RegionRects(region);
- n = RegionNumRects(region);
+ box = region_rects(region);
+ n = region_num_rects(region);
do {
int bx1 = (box->x1 - x) & ~7;
int bx2 = (box->x2 - x + 7) & ~7;
@@ -5011,8 +5010,8 @@ sna_put_xypixmap_blt(DrawablePtr drawable, GCPtr gc, RegionPtr region,
skip = h * BitmapBytePad(w + left);
for (i = 1 << (gc->depth-1); i; i >>= 1, bits += skip) {
- const BoxRec *box = RegionRects(region);
- int n = RegionNumRects(region);
+ const BoxRec *box = region_rects(region);
+ int n = region_num_rects(region);
if ((gc->planemask & i) == 0)
continue;
@@ -5407,14 +5406,14 @@ sna_self_copy_boxes(DrawablePtr src, DrawablePtr dst, GCPtr gc,
PixmapPtr pixmap = get_drawable_pixmap(src);
struct sna *sna = to_sna_from_pixmap(pixmap);
struct sna_pixmap *priv = sna_pixmap(pixmap);
- BoxPtr box = RegionRects(region);
- int n = RegionNumRects(region);
+ BoxPtr box = region_rects(region);
+ int n = region_num_rects(region);
int alu = gc ? gc->alu : GXcopy;
int16_t tx, ty;
assert(pixmap == get_drawable_pixmap(dst));
- assert(RegionNumRects(region));
+ assert(region_num_rects(region));
if (((dx | dy) == 0 && alu == GXcopy))
return;
@@ -5517,7 +5516,7 @@ out:
}
free_boxes:
- if (box != RegionRects(region))
+ if (box != region_rects(region))
free(box);
}
@@ -5717,8 +5716,8 @@ sna_copy_boxes__inplace(struct sna *sna, RegionPtr region, int alu,
kgem_bo_sync__cpu_full(&sna->kgem, src_priv->gpu_bo, FORCE_FULL_SYNC);
- box = RegionRects(region);
- n = RegionNumRects(region);
+ box = region_rects(region);
+ n = region_num_rects(region);
if (src_priv->gpu_bo->tiling) {
DBG(("%s: copy from a tiled CPU map\n", __FUNCTION__));
assert(dst_pixmap->devKind);
@@ -5841,8 +5840,8 @@ upload_inplace:
}
dst_priv->clear = false;
- box = RegionRects(region);
- n = RegionNumRects(region);
+ box = region_rects(region);
+ n = region_num_rects(region);
if (dst_priv->gpu_bo->tiling) {
DBG(("%s: copy to a tiled CPU map\n", __FUNCTION__));
assert(dst_priv->gpu_bo->tiling == I915_TILING_X);
@@ -5917,14 +5916,14 @@ sna_copy_boxes(DrawablePtr src, DrawablePtr dst, GCPtr gc,
struct kgem_bo *bo;
int16_t src_dx, src_dy;
int16_t dst_dx, dst_dy;
- BoxPtr box = RegionRects(region);
- int n = RegionNumRects(region);
+ BoxPtr box = region_rects(region);
+ int n = region_num_rects(region);
int alu = gc->alu;
int stride, bpp;
char *bits;
bool replaces;
- assert(RegionNumRects(region));
+ assert(region_num_rects(region));
if (src_pixmap == dst_pixmap)
return sna_self_copy_boxes(src, dst, gc,
@@ -6607,18 +6606,18 @@ sna_do_copy(DrawablePtr src, DrawablePtr dst, GCPtr gc,
} else
RegionIntersect(®ion, ®ion, clip);
}
- DBG(("%s: src extents (%d, %d), (%d, %d) x %ld\n", __FUNCTION__,
+ DBG(("%s: src extents (%d, %d), (%d, %d) x %d\n", __FUNCTION__,
region.extents.x1, region.extents.y1,
region.extents.x2, region.extents.y2,
- (long)RegionNumRects(®ion)));
+ region_num_rects(®ion)));
RegionTranslate(®ion, dx-sx, dy-sy);
if (gc->pCompositeClip->data)
RegionIntersect(®ion, ®ion, gc->pCompositeClip);
- DBG(("%s: copy region (%d, %d), (%d, %d) x %ld\n", __FUNCTION__,
+ DBG(("%s: copy region (%d, %d), (%d, %d) x %d\n", __FUNCTION__,
region.extents.x1, region.extents.y1,
region.extents.x2, region.extents.y2,
- (long)RegionNumRects(®ion)));
+ region_num_rects(®ion)));
if (!box_empty(®ion.extents))
copy(src, dst, gc, ®ion, sx-dx, sy-dy, bitPlane, closure);
@@ -6641,8 +6640,8 @@ sna_fallback_copy_boxes(DrawablePtr src, DrawablePtr dst, GCPtr gc,
RegionPtr region, int dx, int dy,
Pixel bitplane, void *closure)
{
- DBG(("%s (boxes=%ldx[(%d, %d), (%d, %d)...], src=+(%d, %d), alu=%d\n",
- __FUNCTION__, (long)RegionNumRects(region),
+ DBG(("%s (boxes=%dx[(%d, %d), (%d, %d)...], src=+(%d, %d), alu=%d\n",
+ __FUNCTION__, region_num_rects(region),
region->extents.x1, region->extents.y1,
region->extents.x2, region->extents.y2,
dx, dy, gc->alu));
@@ -7272,9 +7271,9 @@ no_damage_clipped:
assert(dx + clip.extents.x2 <= pixmap->drawable.width);
assert(dy + clip.extents.y2 <= pixmap->drawable.height);
- DBG(("%s: clip %ld x [(%d, %d), (%d, %d)] x %d [(%d, %d)...]\n",
+ DBG(("%s: clip %d x [(%d, %d), (%d, %d)] x %d [(%d, %d)...]\n",
__FUNCTION__,
- (long)RegionNumRects(&clip),
+ region_num_rects(&clip),
clip.extents.x1, clip.extents.y1, clip.extents.x2, clip.extents.y2,
n, pt->x, pt->y));
@@ -7372,9 +7371,9 @@ damage_clipped:
assert(dx + clip.extents.x2 <= pixmap->drawable.width);
assert(dy + clip.extents.y2 <= pixmap->drawable.height);
- DBG(("%s: clip %ld x [(%d, %d), (%d, %d)] x %d [(%d, %d)...]\n",
+ DBG(("%s: clip %d x [(%d, %d), (%d, %d)] x %d [(%d, %d)...]\n",
__FUNCTION__,
- (long)RegionNumRects(&clip),
+ region_num_rects(&clip),
clip.extents.x1, clip.extents.y1, clip.extents.x2, clip.extents.y2,
n, pt->x, pt->y));
@@ -7775,14 +7774,14 @@ sna_copy_bitmap_blt(DrawablePtr _bitmap, DrawablePtr drawable, GCPtr gc,
BoxPtr box;
int n;
- DBG(("%s: plane=%x (%d,%d),(%d,%d)x%ld\n",
+ DBG(("%s: plane=%x (%d,%d),(%d,%d)xld\n",
__FUNCTION__, (unsigned)bitplane,
region->extents.x1, region->extents.y1,
region->extents.x2, region->extents.y2,
- (long)RegionNumRects(region)));
+ region_num_rects(region)));
- box = RegionRects(region);
- n = RegionNumRects(region);
+ box = region_rects(region);
+ n = region_num_rects(region);
assert(n);
get_drawable_deltas(drawable, pixmap, &dx, &dy);
@@ -7995,8 +7994,8 @@ sna_copy_plane_blt(DrawablePtr source, DrawablePtr drawable, GCPtr gc,
int16_t dx, dy;
int bit = ffs(bitplane) - 1;
uint32_t br00, br13;
- BoxPtr box = RegionRects(region);
- int n = RegionNumRects(region);
+ BoxPtr box = region_rects(region);
+ int n = region_num_rects(region);
DBG(("%s: plane=%x [%d] x%d\n", __FUNCTION__,
(unsigned)bitplane, bit, n));
@@ -8620,8 +8619,8 @@ sna_poly_zero_line_blt(DrawablePtr drawable,
clip.extents.x2, clip.extents.y2,
dx, dy, damage));
- extents = RegionRects(&clip);
- last_extents = extents + RegionNumRects(&clip);
+ extents = region_rects(&clip);
+ last_extents = extents + region_num_rects(&clip);
b = box;
do {
@@ -9857,8 +9856,8 @@ sna_poly_zero_segment_blt(DrawablePtr drawable,
jump = _jump[(damage != NULL) | !!(dx|dy) << 1];
b = box;
- extents = RegionRects(&clip);
- last_extents = extents + RegionNumRects(&clip);
+ extents = region_rects(&clip);
+ last_extents = extents + region_num_rects(&clip);
do {
int n = _n;
const xSegment *s = _s;
@@ -11067,8 +11066,8 @@ sna_poly_rectangle(DrawablePtr drawable, GCPtr gc, int n, xRectangle *r)
}
fallback:
- DBG(("%s: fallback, clip=%ldx[(%d, %d), (%d, %d)]\n", __FUNCTION__,
- (long)RegionNumRects(gc->pCompositeClip),
+ DBG(("%s: fallback, clip=%dx[(%d, %d), (%d, %d)]\n", __FUNCTION__,
+ region_num_rects(gc->pCompositeClip),
gc->pCompositeClip->extents.x1, gc->pCompositeClip->extents.y1,
gc->pCompositeClip->extents.x2, gc->pCompositeClip->extents.y2));
@@ -11076,8 +11075,8 @@ fallback:
if (!region_maybe_clip(®ion, gc->pCompositeClip))
return;
- DBG(("%s: CPU region=%ldx[(%d, %d), (%d, %d)]\n", __FUNCTION__,
- (long)RegionNumRects(®ion),
+ DBG(("%s: CPU region=%dx[(%d, %d), (%d, %d)]\n", __FUNCTION__,
+ region_num_rects(®ion),
region.extents.x1, region.extents.y1,
region.extents.x2, region.extents.y2));
if (!sna_gc_move_to_cpu(gc, drawable, ®ion))
@@ -12406,8 +12405,8 @@ sna_poly_fill_rect_tiled_blt(DrawablePtr drawable,
assert(region.extents.x2 + dx <= pixmap->drawable.width);
assert(region.extents.y2 + dy <= pixmap->drawable.height);
- nbox = RegionNumRects(®ion);
- box = RegionRects(®ion);
+ nbox = region_num_rects(®ion);
+ box = region_rects(®ion);
DBG(("%s: split into %d boxes after clipping\n", __FUNCTION__, nbox));
while (nbox--) {
int height = box->y2 - box->y1;
@@ -14653,8 +14652,8 @@ sna_glyph_blt(DrawablePtr drawable, GCPtr gc,
_x += drawable->x + dx;
_y += drawable->y + dy;
- extents = RegionRects(clip);
- last_extents = extents + RegionNumRects(clip);
+ extents = region_rects(clip);
+ last_extents = extents + region_num_rects(clip);
if (!transparent) { /* emulate miImageGlyphBlt */
if (!sna_blt_fill_boxes(sna, GXcopy,
@@ -15370,8 +15369,8 @@ sna_reversed_glyph_blt(DrawablePtr drawable, GCPtr gc,
_x += drawable->x + dx;
_y += drawable->y + dy;
- extents = RegionRects(clip);
- last_extents = extents + RegionNumRects(clip);
+ extents = region_rects(clip);
+ last_extents = extents + region_num_rects(clip);
if (!transparent) { /* emulate miImageGlyphBlt */
if (!sna_blt_fill_boxes(sna, GXcopy,
@@ -15839,8 +15838,8 @@ sna_push_pixels_solid_blt(GCPtr gc,
kgem_set_mode(&sna->kgem, KGEM_BLT, bo);
/* Region is pre-clipped and translated into pixmap space */
- box = RegionRects(region);
- n = RegionNumRects(region);
+ box = region_rects(region);
+ n = region_num_rects(region);
do {
int bx1 = (box->x1 - region->extents.x1) & ~7;
int bx2 = (box->x2 - region->extents.x1 + 7) & ~7;
@@ -16094,9 +16093,9 @@ sna_validate_gc(GCPtr gc, unsigned long changes, DrawablePtr drawable)
(gc->clientClipType != CT_NONE && (changes & (GCClipXOrigin | GCClipYOrigin)))) {
DBG(("%s: recomputing clip\n", __FUNCTION__));
miComputeCompositeClip(gc, drawable);
- DBG(("%s: composite clip=%ldx[(%d, %d), (%d, %d)] [%p]\n",
+ DBG(("%s: composite clip=%dx[(%d, %d), (%d, %d)] [%p]\n",
__FUNCTION__,
- (long)RegionNumRects(gc->pCompositeClip),
+ region_num_rects(gc->pCompositeClip),
gc->pCompositeClip->extents.x1,
gc->pCompositeClip->extents.y1,
gc->pCompositeClip->extents.x2,
@@ -16770,10 +16769,10 @@ static void sna_accel_post_damage(struct sna *sna)
region.extents.y2 = dirty->y + dst->drawable.height;
region.data = NULL;
- DBG(("%s: pushing damage ((%d, %d), (%d, %d))x%d to slave pixmap=%ld, ((%d, %d), (%d, %d))\n", __FUNCTION__,
+ DBG(("%s: pushing damage ((%d, %d), (%d, %d))x%d to slave pixmap=%d, ((%d, %d), (%d, %d))\n", __FUNCTION__,
damage->extents.x1, damage->extents.y1,
damage->extents.x2, damage->extents.y2,
- RegionNumRects(damage),
+ region_num_rects(damage),
dst->drawable.serialNumber,
region.extents.x1, region.extents.y1,
region.extents.x2, region.extents.y2));
@@ -16788,10 +16787,10 @@ static void sna_accel_post_damage(struct sna *sna)
DBG(("%s: slave: ((%d, %d), (%d, %d))x%d\n", __FUNCTION__,
region.extents.x1, region.extents.y1,
region.extents.x2, region.extents.y2,
- RegionNumRects(®ion)));
+ region_num_rects(®ion)));
- box = RegionRects(®ion);
- n = RegionNumRects(®ion);
+ box = region_rects(®ion);
+ n = region_num_rects(®ion);
if (wedged(sna)) {
fallback:
if (!sna_pixmap_move_to_cpu(src, MOVE_READ))
diff --git a/src/sna/sna_composite.c b/src/sna/sna_composite.c
index 8b4aa80..1b236f4 100644
--- a/src/sna/sna_composite.c
+++ b/src/sna/sna_composite.c
@@ -404,7 +404,7 @@ static void _assert_pixmap_contains_box(PixmapPtr pixmap, BoxPtr box, const char
static void apply_damage(struct sna_composite_op *op, RegionPtr region)
{
DBG(("%s: damage=%p, region=%d [(%d, %d), (%d, %d) + (%d, %d)]\n",
- __FUNCTION__, op->damage, (int)RegionNumRects(region),
+ __FUNCTION__, op->damage, region_num_rects(region),
region->extents.x1, region->extents.y1,
region->extents.x2, region->extents.y2,
op->dst.x, op->dst.y));
@@ -546,8 +546,8 @@ sna_composite_fb(CARD8 op,
region->extents.x2 + sx <= src->pDrawable->width &&
region->extents.y2 + sy <= src->pDrawable->height) {
if (sigtrap_get() == 0) {
- BoxPtr box = RegionRects(region);
- int nbox = RegionNumRects(region);
+ BoxPtr box = region_rects(region);
+ int nbox = region_num_rects(region);
sx += src->pDrawable->x;
sy += src->pDrawable->y;
@@ -734,7 +734,7 @@ sna_composite(CARD8 op,
else
tmp.boxes(sna, &tmp,
RegionBoxptr(®ion),
- RegionNumRects(®ion));
+ region_num_rects(®ion));
apply_damage(&tmp, ®ion);
tmp.done(sna, &tmp);
@@ -899,11 +899,11 @@ sna_composite_rectangles(CARD8 op,
goto cleanup_region;
}
- DBG(("%s: clipped extents (%d, %d),(%d, %d) x %ld\n",
+ DBG(("%s: clipped extents (%d, %d),(%d, %d) x %d\n",
__FUNCTION__,
RegionExtents(®ion)->x1, RegionExtents(®ion)->y1,
RegionExtents(®ion)->x2, RegionExtents(®ion)->y2,
- (long)RegionNumRects(®ion)));
+ region_num_rects(®ion)));
/* XXX xserver-1.8: CompositeRects is not tracked by Damage, so we must
* manually append the damaged regions ourselves.
@@ -1082,8 +1082,8 @@ fallback:
if (sigtrap_get() == 0) {
if (op <= PictOpSrc) {
- int nbox = RegionNumRects(®ion);
- BoxPtr box = RegionRects(®ion);
+ int nbox = region_num_rects(®ion);
+ BoxPtr box = region_rects(®ion);
uint32_t pixel;
if (op == PictOpClear)
diff --git a/src/sna/sna_damage.c b/src/sna/sna_damage.c
index d4b3515..8c041de 100644
--- a/src/sna/sna_damage.c
+++ b/src/sna/sna_damage.c
@@ -69,34 +69,31 @@ static inline bool region_is_singular_or_empty(const RegionRec *r)
static const char *_debug_describe_region(char *buf, int max,
const RegionRec *region)
{
- BoxPtr extents;
- BoxPtr box;
- int n;
- int len;
+ const BoxRec *box;
+ int n, len;
if (region == NULL)
return "nil";
- n = REGION_NUM_RECTS(region);
+ n = region_num_rects(region);
if (n == 0)
return "[0]";
- extents = REGION_EXTENTS(NULL, region);
if (n == 1) {
sprintf(buf,
"[(%d, %d), (%d, %d)]",
- extents->x1, extents->y1,
- extents->x2, extents->y2);
+ region->extents.x1, region->extents.y1,
+ region->extents.x2, region->extents.y2);
return buf;
}
len = sprintf(buf,
"[(%d, %d), (%d, %d) x %d: ",
- extents->x1, extents->y1,
- extents->x2, extents->y2,
+ region->extents.x1, region->extents.y1,
+ region->extents.x2, region->extents.y2,
n) + 3;
max -= 2;
- box = REGION_RECTS(region);
+ box = region_rects(region);
while (n--) {
char tmp[80];
int this;
@@ -223,7 +220,7 @@ static void __sna_damage_reduce(struct sna_damage *damage)
assert(damage->mode != DAMAGE_ALL);
assert(damage->dirty);
- DBG((" reduce: before region.n=%ld\n", (long)REGION_NUM_RECTS(region)));
+ DBG((" reduce: before region.n=%d\n", region_num_rects(region)));
nboxes = damage->embedded_box.size;
list_for_each_entry(iter, &damage->embedded_box.list, list)
@@ -248,7 +245,7 @@ static void __sna_damage_reduce(struct sna_damage *damage)
}
if (damage->mode == DAMAGE_ADD)
- nboxes += REGION_NUM_RECTS(region);
+ nboxes += region_num_rects(region);
iter = last_box(damage);
n = iter->size - damage->remain;
@@ -299,9 +296,9 @@ static void __sna_damage_reduce(struct sna_damage *damage)
if (damage->mode == DAMAGE_ADD) {
memcpy(boxes + n,
- REGION_RECTS(region),
- REGION_NUM_RECTS(region)*sizeof(BoxRec));
- assert(n + REGION_NUM_RECTS(region) == nboxes);
+ region_rects(region),
+ region_num_rects(region)*sizeof(BoxRec));
+ assert(n + region_num_rects(region) == nboxes);
pixman_region_fini(region);
pixman_region_init_rects(region, boxes, nboxes);
@@ -335,7 +332,7 @@ done:
free_list(&damage->embedded_box.list);
reset_embedded_box(damage);
- DBG((" reduce: after region.n=%ld\n", (long)REGION_NUM_RECTS(region)));
+ DBG((" reduce: after region.n=%d\n", region_num_rects(region)));
}
static bool _sna_damage_create_boxes(struct sna_damage *damage,
@@ -709,8 +706,8 @@ inline static struct sna_damage *__sna_damage_add(struct sna_damage *damage,
damage_union(damage, ®ion->extents);
return _sna_damage_create_elt(damage,
- REGION_RECTS(region),
- REGION_NUM_RECTS(region));
+ region_rects(region),
+ region_num_rects(region));
}
#if HAS_DEBUG_FULL
@@ -728,7 +725,7 @@ fastcall struct sna_damage *_sna_damage_add(struct sna_damage *damage,
DBG((" = %s\n",
_debug_describe_damage(damage_buf, sizeof(damage_buf), damage)));
- assert(RegionNumRects(&damage->region));
+ assert(region_num_rects(&damage->region));
assert(damage->region.extents.x2 > damage->region.extents.x1);
assert(damage->region.extents.y2 > damage->region.extents.y1);
@@ -812,7 +809,7 @@ struct sna_damage *_sna_damage_add_boxes(struct sna_damage *damage,
DBG((" = %s\n",
_debug_describe_damage(damage_buf, sizeof(damage_buf), damage)));
- if (RegionNumRects(&damage->region)) {
+ if (region_num_rects(&damage->region)) {
assert(damage->region.extents.x2 > damage->region.extents.x1);
assert(damage->region.extents.y2 > damage->region.extents.y1);
}
@@ -901,7 +898,7 @@ struct sna_damage *_sna_damage_add_rectangles(struct sna_damage *damage,
DBG((" = %s\n",
_debug_describe_damage(damage_buf, sizeof(damage_buf), damage)));
- if (RegionNumRects(&damage->region)) {
+ if (region_num_rects(&damage->region)) {
assert(damage->region.extents.x2 > damage->region.extents.x1);
assert(damage->region.extents.y2 > damage->region.extents.y1);
}
@@ -985,7 +982,7 @@ struct sna_damage *_sna_damage_add_points(struct sna_damage *damage,
DBG((" = %s\n",
_debug_describe_damage(damage_buf, sizeof(damage_buf), damage)));
- if (RegionNumRects(&damage->region)) {
+ if (region_num_rects(&damage->region)) {
assert(damage->region.extents.x2 > damage->region.extents.x1);
assert(damage->region.extents.y2 > damage->region.extents.y1);
}
@@ -1015,7 +1012,7 @@ fastcall struct sna_damage *_sna_damage_add_box(struct sna_damage *damage,
DBG((" = %s\n",
_debug_describe_damage(damage_buf, sizeof(damage_buf), damage)));
- assert(RegionNumRects(&damage->region));
+ assert(region_num_rects(&damage->region));
assert(damage->region.extents.x2 > damage->region.extents.x1);
assert(damage->region.extents.y2 > damage->region.extents.y1);
@@ -1156,8 +1153,8 @@ no_damage:
}
return _sna_damage_create_elt(damage,
- REGION_RECTS(region),
- REGION_NUM_RECTS(region));
+ region_rects(region),
+ region_num_rects(region));
}
#if HAS_DEBUG_FULL
@@ -1535,8 +1532,8 @@ static int __sna_damage_get_boxes(struct sna_damage *damage, BoxPtr *boxes)
if (damage->dirty)
__sna_damage_reduce(damage);
- *boxes = REGION_RECTS(&damage->region);
- return REGION_NUM_RECTS(&damage->region);
+ *boxes = region_rects(&damage->region);
+ return region_num_rects(&damage->region);
}
struct sna_damage *_sna_damage_reduce(struct sna_damage *damage)
@@ -1824,7 +1821,7 @@ void _sna_damage_debug_get_region(struct sna_damage *damage, RegionRec *r)
}
if (damage->mode == DAMAGE_ADD)
- nboxes += REGION_NUM_RECTS(r);
+ nboxes += region_num_rects(r);
iter = last_box(damage);
n = iter->size - damage->remain;
@@ -1861,9 +1858,9 @@ void _sna_damage_debug_get_region(struct sna_damage *damage, RegionRec *r)
if (damage->mode == DAMAGE_ADD) {
memcpy(boxes + n,
- REGION_RECTS(r),
- REGION_NUM_RECTS(r)*sizeof(BoxRec));
- assert(n + REGION_NUM_RECTS(r) == nboxes);
+ region_rects(r),
+ region_num_rects(r)*sizeof(BoxRec));
+ assert(n + region_num_rects(r) == nboxes);
pixman_region_fini(r);
pixman_region_init_rects(r, boxes, nboxes);
diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index 7169779..b0f6ea7 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -1167,8 +1167,8 @@ static bool wait_for_shadow(struct sna *sna, struct sna_pixmap *priv, unsigned f
}
if (flags & MOVE_READ && RegionNotEmpty(&sna->mode.shadow_region)) {
- DBG(("%s: copying existing GPU damage: %ldx(%d, %d), (%d, %d)\n",
- __FUNCTION__, (long)REGION_NUM_RECTS(&sna->mode.shadow_region),
+ DBG(("%s: copying existing GPU damage: %dx(%d, %d), (%d, %d)\n",
+ __FUNCTION__, region_num_rects(&sna->mode.shadow_region),
sna->mode.shadow_region.extents.x1,
sna->mode.shadow_region.extents.y1,
sna->mode.shadow_region.extents.x2,
@@ -1176,8 +1176,8 @@ static bool wait_for_shadow(struct sna *sna, struct sna_pixmap *priv, unsigned f
ret = sna->render.copy_boxes(sna, GXcopy,
pixmap, priv->gpu_bo, 0, 0,
pixmap, bo, 0, 0,
- REGION_RECTS(&sna->mode.shadow_region),
- REGION_NUM_RECTS(&sna->mode.shadow_region),
+ region_rects(&sna->mode.shadow_region),
+ region_num_rects(&sna->mode.shadow_region),
0);
}
@@ -1216,10 +1216,10 @@ void sna_pixmap_discard_shadow_damage(struct sna_pixmap *priv,
sna = priv->move_to_gpu_data;
DBG(("%s: discarding region %dx[(%d, %d), (%d, %d)] from damage %dx[(%d, %d], (%d, %d)]\n",
__FUNCTION__,
- RegionNumRects(region),
+ region_num_rects(region),
region->extents.x1, region->extents.y1,
region->extents.x2, region->extents.y2,
- RegionNumRects(&sna->mode.shadow_region),
+ region_num_rects(&sna->mode.shadow_region),
sna->mode.shadow_region.extents.x1, sna->mode.shadow_region.extents.y1,
sna->mode.shadow_region.extents.x2, sna->mode.shadow_region.extents.y2));
@@ -1629,7 +1629,7 @@ static void set_shadow(struct sna *sna, RegionPtr region)
DBG(("%s: waiting for region %dx[(%d, %d), (%d, %d)], front handle=%d, shadow handle=%d\n",
__FUNCTION__,
- RegionNumRects(region),
+ region_num_rects(region),
region->extents.x1, region->extents.y1,
region->extents.x2, region->extents.y2,
priv->gpu_bo->handle, sna->mode.shadow->handle));
@@ -1860,9 +1860,9 @@ sna_crtc_damage(xf86CrtcPtr crtc)
damage = DamageRegion(sna->mode.shadow_damage);
RegionUnion(damage, damage, ®ion);
- DBG(("%s: damage now %ldx[(%d, %d), (%d, %d)]\n",
+ DBG(("%s: damage now %dx[(%d, %d), (%d, %d)]\n",
__FUNCTION__,
- (long)RegionNumRects(damage),
+ region_num_rects(damage),
damage->extents.x1, damage->extents.y1,
damage->extents.x2, damage->extents.y2));
}
@@ -5694,8 +5694,8 @@ sna_crtc_redisplay__fallback(xf86CrtcPtr crtc, RegionPtr region, struct kgem_bo
kgem_bo_sync__gtt(&sna->kgem, bo);
if (sigtrap_get() == 0) { /* paranoia */
- const BoxRec *b = REGION_RECTS(region);
- int n = REGION_NUM_RECTS(region);
+ const BoxRec *b = region_rects(region);
+ int n = region_num_rects(region);
do {
BoxRec box;
@@ -5794,8 +5794,8 @@ sna_crtc_redisplay__composite(xf86CrtcPtr crtc, RegionPtr region, struct kgem_bo
goto free_dst;
}
- n = REGION_NUM_RECTS(region);
- b = REGION_RECTS(region);
+ n = region_num_rects(region);
+ b = region_rects(region);
do {
BoxRec box;
@@ -5828,11 +5828,11 @@ sna_crtc_redisplay(xf86CrtcPtr crtc, RegionPtr region)
int16_t tx, ty;
assert(sna_crtc);
- DBG(("%s: crtc %d [pipe=%d], damage (%d, %d), (%d, %d) x %ld\n",
+ DBG(("%s: crtc %d [pipe=%d], damage (%d, %d), (%d, %d) x %d\n",
__FUNCTION__, sna_crtc->id, sna_crtc->pipe,
region->extents.x1, region->extents.y1,
region->extents.x2, region->extents.y2,
- (long)RegionNumRects(region)));
+ region_num_rects(region)));
assert(!wedged(sna));
@@ -5843,7 +5843,7 @@ sna_crtc_redisplay(xf86CrtcPtr crtc, RegionPtr region)
sna_blt_fill_boxes(sna, GXcopy,
sna_crtc->bo, sna->front->drawable.bitsPerPixel,
priv->clear_color,
- REGION_RECTS(region), REGION_NUM_RECTS(region));
+ region_rects(region), region_num_rects(region));
return;
}
@@ -5862,7 +5862,7 @@ sna_crtc_redisplay(xf86CrtcPtr crtc, RegionPtr region)
if (sna->render.copy_boxes(sna, GXcopy,
sna->front, priv->gpu_bo, 0, 0,
&tmp, sna_crtc->bo, -tx, -ty,
- REGION_RECTS(region), REGION_NUM_RECTS(region), 0))
+ region_rects(region), region_num_rects(region), 0))
return;
}
@@ -5944,8 +5944,8 @@ void sna_mode_redisplay(struct sna *sna)
if (RegionNil(region))
return;
- DBG(("%s: damage: %ldx(%d, %d), (%d, %d)\n",
- __FUNCTION__, (long)REGION_NUM_RECTS(region),
+ DBG(("%s: damage: %dx(%d, %d), (%d, %d)\n",
+ __FUNCTION__, region_num_rects(region),
region->extents.x1, region->extents.y1,
region->extents.x2, region->extents.y2));
diff --git a/src/sna/sna_dri2.c b/src/sna/sna_dri2.c
index e196464..21feed5 100644
--- a/src/sna/sna_dri2.c
+++ b/src/sna/sna_dri2.c
@@ -965,8 +965,8 @@ __sna_dri2_copy_region(struct sna *sna, DrawablePtr draw, RegionPtr region,
}
if (region) {
- boxes = REGION_RECTS(region);
- n = REGION_NUM_RECTS(region);
+ boxes = region_rects(region);
+ n = region_num_rects(region);
assert(n);
} else {
region = &clip;
@@ -1039,11 +1039,11 @@ sna_dri2_copy_region(DrawablePtr draw,
assert(get_private(src)->bo->refcnt);
assert(get_private(dst)->bo->refcnt);
- DBG(("%s: region (%d, %d), (%d, %d) x %ld\n",
+ DBG(("%s: region (%d, %d), (%d, %d) x %d\n",
__FUNCTION__,
region->extents.x1, region->extents.y1,
region->extents.x2, region->extents.y2,
- (long)REGION_NUM_RECTS(region)));
+ region_num_rects(region)));
__sna_dri2_copy_region(sna, draw, region, src, dst, false);
}
@@ -1420,7 +1420,7 @@ can_flip(struct sna * sna,
win->drawable.width, win->drawable.height,
win->clipList.extents.x1, win->clipList.extents.y1,
win->clipList.extents.x2, win->clipList.extents.y2,
- RegionNumRects(&win->clipList)));
+ region_num_rects(&win->clipList)));
if (!RegionEqual(&win->clipList, &draw->pScreen->root->winSize)) {
DBG(("%s: no, window is clipped: clip region=(%d, %d), (%d, %d), root size=(%d, %d), (%d, %d)\n",
__FUNCTION__,
@@ -1509,7 +1509,7 @@ can_xchg(struct sna * sna,
win->drawable.width, win->drawable.height,
win->clipList.extents.x1, win->clipList.extents.y1,
win->clipList.extents.x2, win->clipList.extents.y2,
- RegionNumRects(&win->clipList),
+ region_num_rects(&win->clipList),
pixmap->drawable.width,
pixmap->drawable.height));
if (is_clipped(&win->clipList, &pixmap->drawable)) {
@@ -1631,7 +1631,7 @@ can_xchg_one(struct sna *sna,
win->drawable.width, win->drawable.height,
win->clipList.extents.x1, win->clipList.extents.y1,
win->clipList.extents.x2, win->clipList.extents.y2,
- RegionNumRects(&win->clipList)));
+ region_num_rects(&win->clipList)));
if (is_clipped(&win->clipList, &win->drawable)) {
DBG(("%s: no, %dx%d window is clipped: clip region=(%d, %d), (%d, %d)\n",
__FUNCTION__,
diff --git a/src/sna/sna_glyphs.c b/src/sna/sna_glyphs.c
index 5818086..93aac34 100644
--- a/src/sna/sna_glyphs.c
+++ b/src/sna/sna_glyphs.c
@@ -580,8 +580,8 @@ glyphs_to_dst(struct sna *sna,
list->xOff, list->yOff, dst->pDrawable->x, dst->pDrawable->y));
if (clipped_glyphs(dst, nlist, list, glyphs)) {
- rects = REGION_RECTS(dst->pCompositeClip);
- nrect = REGION_NUM_RECTS(dst->pCompositeClip);
+ rects = region_rects(dst->pCompositeClip);
+ nrect = region_num_rects(dst->pCompositeClip);
} else
nrect = 0;
@@ -742,8 +742,8 @@ glyphs0_to_dst(struct sna *sna,
src_y -= list->yOff + y;
if (clipped_glyphs(dst, nlist, list, glyphs)) {
- rects = REGION_RECTS(dst->pCompositeClip);
- nrect = REGION_NUM_RECTS(dst->pCompositeClip);
+ rects = region_rects(dst->pCompositeClip);
+ nrect = region_num_rects(dst->pCompositeClip);
if (nrect == 0)
return true;
@@ -974,8 +974,8 @@ glyphs_slow(struct sna *sna,
COMPOSITE_PARTIAL, memset(&tmp, 0, sizeof(tmp))))
return false;
- rects = REGION_RECTS(dst->pCompositeClip);
- nrect = REGION_NUM_RECTS(dst->pCompositeClip);
+ rects = region_rects(dst->pCompositeClip);
+ nrect = region_num_rects(dst->pCompositeClip);
do {
struct sna_composite_rectangles r;
int16_t x2, y2;
diff --git a/src/sna/sna_tiling.c b/src/sna/sna_tiling.c
index f3073e7..3237185 100644
--- a/src/sna/sna_tiling.c
+++ b/src/sna/sna_tiling.c
@@ -676,18 +676,18 @@ sna_tiling_fill_boxes(struct sna *sna,
!sna->render.copy_boxes(sna, GXcopy,
dst, dst_bo, 0, 0,
&tmp, bo, -dx, -dy,
- REGION_RECTS(&this), REGION_NUM_RECTS(&this), 0))
+ region_rects(&this), region_num_rects(&this), 0))
goto err;
RegionTranslate(&this, -dx, -dy);
if (!sna->render.fill_boxes(sna, op, format, color, &tmp, bo,
- REGION_RECTS(&this), REGION_NUM_RECTS(&this)))
+ region_rects(&this), region_num_rects(&this)))
goto err;
if (!sna->render.copy_boxes(sna, GXcopy,
&tmp, bo, 0, 0,
dst, dst_bo, dx, dy,
- REGION_RECTS(&this), REGION_NUM_RECTS(&this), 0))
+ region_rects(&this), region_num_rects(&this), 0))
goto err;
kgem_bo_destroy(&sna->kgem, bo);
@@ -871,14 +871,14 @@ sna_tiling_blt_copy_boxes__with_alpha(struct sna *sna, uint8_t alu,
if (!sna_blt_copy_boxes(sna, GXcopy,
src_bo, src_dx, src_dy,
bo, -dx, -dy,
- bpp, REGION_RECTS(&this), REGION_NUM_RECTS(&this)))
+ bpp, region_rects(&this), region_num_rects(&this)))
goto err;
if (!sna_blt_copy_boxes__with_alpha(sna, alu,
bo, -dx, -dy,
dst_bo, dst_dx, dst_dy,
bpp, alpha_fixup,
- REGION_RECTS(&this), REGION_NUM_RECTS(&this)))
+ region_rects(&this), region_num_rects(&this)))
goto err;
kgem_bo_destroy(&sna->kgem, bo);
@@ -1098,13 +1098,13 @@ bool sna_tiling_blt_copy_boxes(struct sna *sna, uint8_t alu,
if (!sna_blt_copy_boxes(sna, GXcopy,
src_bo, src_dx, src_dy,
bo, -dx, -dy,
- bpp, REGION_RECTS(&this), REGION_NUM_RECTS(&this)))
+ bpp, region_rects(&this), region_num_rects(&this)))
goto err;
if (!sna_blt_copy_boxes(sna, alu,
bo, -dx, -dy,
dst_bo, dst_dx, dst_dy,
- bpp, REGION_RECTS(&this), REGION_NUM_RECTS(&this)))
+ bpp, region_rects(&this), region_num_rects(&this)))
goto err;
kgem_bo_destroy(&sna->kgem, bo);
diff --git a/src/sna/sna_trapezoids_boxes.c b/src/sna/sna_trapezoids_boxes.c
index 335b2ce..e7d74f5 100644
--- a/src/sna/sna_trapezoids_boxes.c
+++ b/src/sna/sna_trapezoids_boxes.c
@@ -73,9 +73,9 @@ static void _assert_pixmap_contains_box(PixmapPtr pixmap, BoxPtr box, const char
static void apply_damage(struct sna_composite_op *op, RegionPtr region)
{
- DBG(("%s: damage=%p, region=%ldx[(%d, %d), (%d, %d)]\n",
+ DBG(("%s: damage=%p, region=%dx[(%d, %d), (%d, %d)]\n",
__FUNCTION__, op->damage,
- (long)REGION_NUM_RECTS(region),
+ region_num_rects(region),
region->extents.x1, region->extents.y1,
region->extents.x2, region->extents.y2));
@@ -237,8 +237,8 @@ composite_aligned_boxes(struct sna *sna,
RegionIntersect(®ion, ®ion, &clip);
if (sigtrap_get() == 0) {
- b = REGION_RECTS(®ion);
- count = REGION_NUM_RECTS(®ion);
+ b = region_rects(®ion);
+ count = region_num_rects(®ion);
for (i = 0; i < count; i++) {
fbComposite(op, src, NULL, dst,
src_x + b[i].x1 - boxes[0].x1,
@@ -254,8 +254,8 @@ composite_aligned_boxes(struct sna *sna,
for (n = 0; n < num_boxes; n++) {
pixman_region_init_rects(®ion, &boxes[n], 1);
RegionIntersect(®ion, ®ion, &clip);
- b = REGION_RECTS(®ion);
- count = REGION_NUM_RECTS(®ion);
+ b = region_rects(®ion);
+ count = region_num_rects(®ion);
if (sigtrap_get() == 0) {
for (i = 0; i < count; i++) {
fbComposite(op, src, NULL, dst,
@@ -280,10 +280,10 @@ composite_aligned_boxes(struct sna *sna,
num_boxes == 1) {
pixman_region_init_rects(®ion, boxes, num_boxes);
RegionIntersect(®ion, ®ion, &clip);
- if (REGION_NUM_RECTS(®ion)) {
+ if (region_num_rects(®ion)) {
tmp.boxes(sna, &tmp,
- REGION_RECTS(®ion),
- REGION_NUM_RECTS(®ion));
+ region_rects(®ion),
+ region_num_rects(®ion));
apply_damage(&tmp, ®ion);
}
pixman_region_fini(®ion);
@@ -291,10 +291,10 @@ composite_aligned_boxes(struct sna *sna,
for (n = 0; n < num_boxes; n++) {
pixman_region_init_rects(®ion, &boxes[n], 1);
RegionIntersect(®ion, ®ion, &clip);
- if (REGION_NUM_RECTS(®ion)) {
+ if (region_num_rects(®ion)) {
tmp.boxes(sna, &tmp,
- REGION_RECTS(®ion),
- REGION_NUM_RECTS(®ion));
+ region_rects(®ion),
+ region_num_rects(®ion));
apply_damage(&tmp, ®ion);
}
pixman_region_fini(®ion);
@@ -330,10 +330,10 @@ composite_unaligned_box(struct sna *sna,
pixman_region_init_rects(®ion, box, 1);
RegionIntersect(®ion, ®ion, clip);
- if (REGION_NUM_RECTS(®ion))
+ if (region_num_rects(®ion))
tmp->boxes(sna, tmp,
- REGION_RECTS(®ion),
- REGION_NUM_RECTS(®ion),
+ region_rects(®ion),
+ region_num_rects(®ion),
opacity);
pixman_region_fini(®ion);
} else
@@ -472,7 +472,7 @@ composite_unaligned_trap(struct sna *sna,
pixman_region_init_rects(®ion, &box, 1);
RegionIntersect(®ion, ®ion, clip);
- if (REGION_NUM_RECTS(®ion))
+ if (region_num_rects(®ion))
apply_damage(&tmp->base, ®ion);
RegionUninit(®ion);
} else
@@ -797,8 +797,8 @@ composite_unaligned_boxes_inplace__solid(struct sna *sna,
if (sigtrap_get() == 0) {
RegionTranslate(&clip, dx, dy);
- count = REGION_NUM_RECTS(&clip);
- extents = REGION_RECTS(&clip);
+ count = region_num_rects(&clip);
+ extents = region_rects(&clip);
while (count--) {
int16_t y1 = dy + pixman_fixed_to_int(t->top);
uint16_t fy1 = pixman_fixed_frac(t->top);
@@ -887,8 +887,8 @@ pixman:
pi.op = op;
if (sigtrap_get() == 0) {
- count = REGION_NUM_RECTS(&clip);
- extents = REGION_RECTS(&clip);
+ count = region_num_rects(&clip);
+ extents = region_rects(&clip);
while (count--) {
int16_t y1 = pixman_fixed_to_int(t->top);
uint16_t fy1 = pixman_fixed_frac(t->top);
@@ -1128,8 +1128,8 @@ composite_unaligned_boxes_inplace(struct sna *sna,
pi.op = op;
if (sigtrap_get() == 0) {
- count = REGION_NUM_RECTS(&clip);
- extents = REGION_RECTS(&clip);
+ count = region_num_rects(&clip);
+ extents = region_rects(&clip);
while (count--) {
int16_t y1 = pixman_fixed_to_int(t->top);
uint16_t fy1 = pixman_fixed_frac(t->top);
diff --git a/src/sna/sna_trapezoids_imprecise.c b/src/sna/sna_trapezoids_imprecise.c
index 115d2b4..69f8ae8 100644
--- a/src/sna/sna_trapezoids_imprecise.c
+++ b/src/sna/sna_trapezoids_imprecise.c
@@ -85,9 +85,9 @@ static void _assert_pixmap_contains_box(PixmapPtr pixmap, BoxPtr box, const char
static void apply_damage(struct sna_composite_op *op, RegionPtr region)
{
- DBG(("%s: damage=%p, region=%ldx[(%d, %d), (%d, %d)]\n",
+ DBG(("%s: damage=%p, region=%dx[(%d, %d), (%d, %d)]\n",
__FUNCTION__, op->damage,
- (long)REGION_NUM_RECTS(region),
+ region_num_rects(region),
region->extents.x1, region->extents.y1,
region->extents.x2, region->extents.y2));
@@ -1008,10 +1008,10 @@ tor_blt_span_clipped(struct sna *sna,
pixman_region_init_rects(®ion, box, 1);
RegionIntersect(®ion, ®ion, clip);
- if (REGION_NUM_RECTS(®ion)) {
+ if (region_num_rects(®ion)) {
op->boxes(sna, op,
- REGION_RECTS(®ion),
- REGION_NUM_RECTS(®ion),
+ region_rects(®ion),
+ region_num_rects(®ion),
opacity);
apply_damage(&op->base, ®ion);
}
@@ -1738,10 +1738,10 @@ span_thread_clipped_box(struct sna *sna,
pixman_region_init_rects(®ion, box, 1);
RegionIntersect(®ion, ®ion, clip);
- if (REGION_NUM_RECTS(®ion)) {
+ if (region_num_rects(®ion)) {
span_thread_add_boxes(sna, op,
- REGION_RECTS(®ion),
- REGION_NUM_RECTS(®ion),
+ region_rects(®ion),
+ region_num_rects(®ion),
AREA_TO_ALPHA(coverage));
}
pixman_region_fini(®ion);
@@ -2230,8 +2230,8 @@ tor_blt_src_clipped(struct sna *sna,
pixman_region_init_rects(®ion, box, 1);
RegionIntersect(®ion, ®ion, clip);
- n = REGION_NUM_RECTS(®ion);
- box = REGION_RECTS(®ion);
+ n = region_num_rects(®ion);
+ box = region_rects(®ion);
while (n--)
tor_blt_src(sna, op, NULL, box++, coverage);
pixman_region_fini(®ion);
@@ -2280,8 +2280,8 @@ tor_blt_in_clipped(struct sna *sna,
pixman_region_init_rects(®ion, box, 1);
RegionIntersect(®ion, ®ion, clip);
- n = REGION_NUM_RECTS(®ion);
- box = REGION_RECTS(®ion);
+ n = region_num_rects(®ion);
+ box = region_rects(®ion);
while (n--)
tor_blt_in(sna, op, NULL, box++, coverage);
pixman_region_fini(®ion);
@@ -2337,8 +2337,8 @@ tor_blt_add_clipped(struct sna *sna,
pixman_region_init_rects(®ion, box, 1);
RegionIntersect(®ion, ®ion, clip);
- n = REGION_NUM_RECTS(®ion);
- box = REGION_RECTS(®ion);
+ n = region_num_rects(®ion);
+ box = region_rects(®ion);
while (n--)
tor_blt_add(sna, op, NULL, box++, coverage);
pixman_region_fini(®ion);
@@ -2411,8 +2411,8 @@ tor_blt_lerp32_clipped(struct sna *sna,
pixman_region_init_rects(®ion, box, 1);
RegionIntersect(®ion, ®ion, clip);
- n = REGION_NUM_RECTS(®ion);
- box = REGION_RECTS(®ion);
+ n = region_num_rects(®ion);
+ box = region_rects(®ion);
while (n--)
tor_blt_lerp32(sna, op, NULL, box++, coverage);
pixman_region_fini(®ion);
@@ -2459,8 +2459,8 @@ pixmask_span_solid__clipped(struct sna *sna,
pixman_region_init_rects(®ion, box, 1);
RegionIntersect(®ion, ®ion, clip);
- n = REGION_NUM_RECTS(®ion);
- box = REGION_RECTS(®ion);
+ n = region_num_rects(®ion);
+ box = region_rects(®ion);
while (n--)
pixmask_span_solid(sna, op, NULL, box++, coverage);
pixman_region_fini(®ion);
@@ -2499,8 +2499,8 @@ pixmask_span__clipped(struct sna *sna,
pixman_region_init_rects(®ion, box, 1);
RegionIntersect(®ion, ®ion, clip);
- n = REGION_NUM_RECTS(®ion);
- box = REGION_RECTS(®ion);
+ n = region_num_rects(®ion);
+ box = region_rects(®ion);
while (n--)
pixmask_span(sna, op, NULL, box++, coverage);
pixman_region_fini(®ion);
diff --git a/src/sna/sna_trapezoids_mono.c b/src/sna/sna_trapezoids_mono.c
index fe77ffd..acd2b10 100644
--- a/src/sna/sna_trapezoids_mono.c
+++ b/src/sna/sna_trapezoids_mono.c
@@ -119,9 +119,9 @@ static void _assert_pixmap_contains_box(PixmapPtr pixmap, BoxPtr box, const char
static void apply_damage(struct sna_composite_op *op, RegionPtr region)
{
- DBG(("%s: damage=%p, region=%ldx[(%d, %d), (%d, %d)]\n",
+ DBG(("%s: damage=%p, region=%dx[(%d, %d), (%d, %d)]\n",
__FUNCTION__, op->damage,
- (long)REGION_NUM_RECTS(region),
+ region_num_rects(region),
region->extents.x1, region->extents.y1,
region->extents.x2, region->extents.y2));
@@ -444,10 +444,10 @@ mono_span(struct mono *c, int x1, int x2, BoxPtr box)
pixman_region_init_rects(®ion, box, 1);
RegionIntersect(®ion, ®ion, &c->clip);
- if (REGION_NUM_RECTS(®ion)) {
+ if (region_num_rects(®ion)) {
c->op.boxes(c->sna, &c->op,
- REGION_RECTS(®ion),
- REGION_NUM_RECTS(®ion));
+ region_rects(®ion),
+ region_num_rects(®ion));
apply_damage(&c->op, ®ion);
}
pixman_region_fini(®ion);
@@ -505,10 +505,10 @@ thread_mono_span_clipped(struct mono *c, int x1, int x2, BoxPtr box)
pixman_region_init_rects(®ion, box, 1);
RegionIntersect(®ion, ®ion, &c->clip);
- if (REGION_NUM_RECTS(®ion))
+ if (region_num_rects(®ion))
thread_mono_span_add_boxes(c,
- REGION_RECTS(®ion),
- REGION_NUM_RECTS(®ion));
+ region_rects(®ion),
+ region_num_rects(®ion));
pixman_region_fini(®ion);
}
diff --git a/src/sna/sna_trapezoids_precise.c b/src/sna/sna_trapezoids_precise.c
index f0e8266..6cde824 100644
--- a/src/sna/sna_trapezoids_precise.c
+++ b/src/sna/sna_trapezoids_precise.c
@@ -106,9 +106,9 @@ static void _assert_pixmap_contains_box(PixmapPtr pixmap, BoxPtr box, const char
static void apply_damage(struct sna_composite_op *op, RegionPtr region)
{
- DBG(("%s: damage=%p, region=%ldx[(%d, %d), (%d, %d)]\n",
+ DBG(("%s: damage=%p, region=%dx[(%d, %d), (%d, %d)]\n",
__FUNCTION__, op->damage,
- (long)REGION_NUM_RECTS(region),
+ region_num_rects(region),
region->extents.x1, region->extents.y1,
region->extents.x2, region->extents.y2));
@@ -1012,10 +1012,10 @@ tor_blt_span_clipped(struct sna *sna,
pixman_region_init_rects(®ion, box, 1);
RegionIntersect(®ion, ®ion, clip);
- if (REGION_NUM_RECTS(®ion)) {
+ if (region_num_rects(®ion)) {
op->boxes(sna, op,
- REGION_RECTS(®ion),
- REGION_NUM_RECTS(®ion),
+ region_rects(®ion),
+ region_num_rects(®ion),
opacity);
apply_damage(&op->base, ®ion);
}
@@ -1667,10 +1667,10 @@ span_thread_clipped_box(struct sna *sna,
pixman_region_init_rects(®ion, box, 1);
RegionIntersect(®ion, ®ion, clip);
- if (REGION_NUM_RECTS(®ion)) {
+ if (region_num_rects(®ion)) {
span_thread_add_boxes(sna, op,
- REGION_RECTS(®ion),
- REGION_NUM_RECTS(®ion),
+ region_rects(®ion),
+ region_num_rects(®ion),
AREA_TO_FLOAT(coverage));
}
pixman_region_fini(®ion);
@@ -2231,8 +2231,8 @@ tor_blt_src_clipped(struct sna *sna,
pixman_region_init_rects(®ion, box, 1);
RegionIntersect(®ion, ®ion, clip);
- n = REGION_NUM_RECTS(®ion);
- box = REGION_RECTS(®ion);
+ n = region_num_rects(®ion);
+ box = region_rects(®ion);
while (n--)
tor_blt_src(sna, op, NULL, box++, coverage);
pixman_region_fini(®ion);
@@ -2281,8 +2281,8 @@ tor_blt_in_clipped(struct sna *sna,
pixman_region_init_rects(®ion, box, 1);
RegionIntersect(®ion, ®ion, clip);
- n = REGION_NUM_RECTS(®ion);
- box = REGION_RECTS(®ion);
+ n = region_num_rects(®ion);
+ box = region_rects(®ion);
while (n--)
tor_blt_in(sna, op, NULL, box++, coverage);
pixman_region_fini(®ion);
@@ -2338,8 +2338,8 @@ tor_blt_add_clipped(struct sna *sna,
pixman_region_init_rects(®ion, box, 1);
RegionIntersect(®ion, ®ion, clip);
- n = REGION_NUM_RECTS(®ion);
- box = REGION_RECTS(®ion);
+ n = region_num_rects(®ion);
+ box = region_rects(®ion);
while (n--)
tor_blt_add(sna, op, NULL, box++, coverage);
pixman_region_fini(®ion);
@@ -2410,8 +2410,8 @@ tor_blt_lerp32_clipped(struct sna *sna,
pixman_region_init_rects(®ion, box, 1);
RegionIntersect(®ion, ®ion, clip);
- n = REGION_NUM_RECTS(®ion);
- box = REGION_RECTS(®ion);
+ n = region_num_rects(®ion);
+ box = region_rects(®ion);
while (n--)
tor_blt_lerp32(sna, op, NULL, box++, coverage);
pixman_region_fini(®ion);
@@ -2456,8 +2456,8 @@ pixmask_span_solid__clipped(struct sna *sna,
pixman_region_init_rects(®ion, box, 1);
RegionIntersect(®ion, ®ion, clip);
- n = REGION_NUM_RECTS(®ion);
- box = REGION_RECTS(®ion);
+ n = region_num_rects(®ion);
+ box = region_rects(®ion);
while (n--)
pixmask_span_solid(sna, op, NULL, box++, coverage);
pixman_region_fini(®ion);
@@ -2494,8 +2494,8 @@ pixmask_span__clipped(struct sna *sna,
pixman_region_init_rects(®ion, box, 1);
RegionIntersect(®ion, ®ion, clip);
- n = REGION_NUM_RECTS(®ion);
- box = REGION_RECTS(®ion);
+ n = region_num_rects(®ion);
+ box = region_rects(®ion);
while (n--)
pixmask_span(sna, op, NULL, box++, coverage);
pixman_region_fini(®ion);
diff --git a/src/sna/sna_video_overlay.c b/src/sna/sna_video_overlay.c
index e0af919..a814773 100644
--- a/src/sna/sna_video_overlay.c
+++ b/src/sna/sna_video_overlay.c
@@ -516,8 +516,8 @@ sna_video_overlay_put_image(ClientPtr client,
drw_x, drw_y, drw_w, drw_h,
format->id, width, height, sync));
- DBG(("%s: region %ld:(%d, %d), (%d, %d)\n", __FUNCTION__,
- (long)RegionNumRects(&clip),
+ DBG(("%s: region %d:(%d, %d), (%d, %d)\n", __FUNCTION__,
+ region_num_rects(&clip),
clip.extents.x1, clip.extents.y1,
clip.extents.x2, clip.extents.y2));
@@ -581,8 +581,8 @@ sna_video_overlay_put_image(ClientPtr client,
__sna_pixmap_get_bo(sna->front),
sna->front->drawable.bitsPerPixel,
video->color_key,
- RegionRects(&clip),
- RegionNumRects(&clip)))
+ region_rects(&clip),
+ region_num_rects(&clip)))
RegionCopy(&video->clip, &clip);
sna_window_set_port((WindowPtr)draw, port);
} else {
diff --git a/src/sna/sna_video_sprite.c b/src/sna/sna_video_sprite.c
index de04638..78b046b 100644
--- a/src/sna/sna_video_sprite.c
+++ b/src/sna/sna_video_sprite.c
@@ -383,7 +383,7 @@ static int sna_video_sprite_put_image(ClientPtr client,
format->id, width, height, sync));
DBG(("%s: region %d:(%d, %d), (%d, %d)\n", __FUNCTION__,
- RegionNumRects(&clip),
+ region_num_rects(&clip),
clip.extents.x1, clip.extents.y1,
clip.extents.x2, clip.extents.y2));
@@ -522,8 +522,8 @@ off:
__sna_pixmap_get_bo(sna->front),
sna->front->drawable.bitsPerPixel,
video->color_key,
- RegionRects(&clip),
- RegionNumRects(&clip)))
+ region_rects(&clip),
+ region_num_rects(&clip)))
RegionCopy(&video->clip, &clip);
sna_window_set_port((WindowPtr)draw, port);
diff --git a/src/sna/sna_video_textured.c b/src/sna/sna_video_textured.c
index 335769c..d06aafd 100644
--- a/src/sna/sna_video_textured.c
+++ b/src/sna/sna_video_textured.c
@@ -193,8 +193,8 @@ sna_video_textured_put_image(ClientPtr client,
drw_x, drw_y, drw_w, drw_h,
format->id, width, height, sync));
- DBG(("%s: region %ld:(%d, %d), (%d, %d)\n", __FUNCTION__,
- (long)RegionNumRects(&clip),
+ DBG(("%s: region %d:(%d, %d), (%d, %d)\n", __FUNCTION__,
+ region_num_rects(&clip),
clip.extents.x1, clip.extents.y1,
clip.extents.x2, clip.extents.y2));
commit 085141348cfe8386059062a58172855f72d5e5b6
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Wed Jun 11 08:39:42 2014 +0100
sna: Squelch log messages for fb/pixmap tiling in the default case
The output is confusing, so hide it unless it is modified by the user.
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c
index ce2490b..0075936 100644
--- a/src/sna/sna_driver.c
+++ b/src/sna/sna_driver.c
@@ -611,6 +611,14 @@ static Bool sna_pre_init(ScrnInfoPtr scrn, int flags)
if (xf86ReturnOptValBool(sna->Options, OPTION_TILING_FB, FALSE))
sna->tiling &= ~SNA_TILING_FB;
+ if (sna->tiling != SNA_TILING_ALL) {
+ xf86DrvMsg(scrn->scrnIndex, X_CONFIG, "Framebuffer %s, pixmaps %s\n",
+ sna->tiling & SNA_TILING_FB ? "tiled" : "linear",
+ sna->tiling & SNA_TILING_2D ? "tiled" : "linear");
+ xf86DrvMsg(scrn->scrnIndex, X_WARNING,
+ "Tiling disabled, expect poor performance and increased power consumption.\n");
+ }
+
if (xf86ReturnOptValBool(sna->Options, OPTION_DELETE_DP12, FALSE))
sna->flags |= SNA_REMOVE_OUTPUTS;
@@ -633,19 +641,10 @@ static Bool sna_pre_init(ScrnInfoPtr scrn, int flags)
sna->flags |= SNA_TRIPLE_BUFFER;
DBG(("%s: triple buffer? %s\n", __FUNCTION__, sna->flags & SNA_TRIPLE_BUFFER ? "enabled" : "disabled"));
- if (xf86ReturnOptValBool(sna->Options, OPTION_CRTC_PIXMAPS, FALSE))
+ if (xf86ReturnOptValBool(sna->Options, OPTION_CRTC_PIXMAPS, FALSE)) {
+ xf86DrvMsg(scrn->scrnIndex, X_CONFIG, "Forcing per-crtc-pixmaps.\n");
sna->flags |= SNA_FORCE_SHADOW;
-
- xf86DrvMsg(scrn->scrnIndex, X_CONFIG, "Framebuffer %s\n",
- sna->tiling & SNA_TILING_FB ? "tiled" : "linear");
- xf86DrvMsg(scrn->scrnIndex, X_CONFIG, "Pixmaps %s\n",
- sna->tiling & SNA_TILING_2D ? "tiled" : "linear");
- xf86DrvMsg(scrn->scrnIndex, X_CONFIG, "Forcing per-crtc-pixmaps? %s\n",
- sna->flags & SNA_FORCE_SHADOW ? "yes" : "no");
-
- if (sna->tiling != SNA_TILING_ALL)
- xf86DrvMsg(scrn->scrnIndex, X_WARNING,
- "Tiling disabled, expect poor performance and increased power consumption.\n");
+ }
if (!sna_mode_pre_init(scrn, sna)) {
xf86DrvMsg(scrn->scrnIndex, X_ERROR,
More information about the xorg-commit
mailing list