xf86-video-intel: 3 commits - 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/kgem.c src/sna/kgem.h src/sna/sna_accel.c src/sna/sna_video_textured.c
Chris Wilson
ickle at kemper.freedesktop.org
Mon Nov 9 00:53:39 PST 2015
src/sna/gen3_render.c | 37 +++----------------------------------
src/sna/gen4_render.c | 32 ++++++--------------------------
src/sna/gen5_render.c | 34 +++++++---------------------------
src/sna/gen6_render.c | 34 +++++++---------------------------
src/sna/gen7_render.c | 37 ++++++++-----------------------------
src/sna/gen8_render.c | 35 +++++++----------------------------
src/sna/kgem.c | 8 ++++----
src/sna/kgem.h | 2 +-
src/sna/sna_accel.c | 2 +-
src/sna/sna_video_textured.c | 6 +++++-
10 files changed, 49 insertions(+), 178 deletions(-)
New commits:
commit fb0c0adbee3e37d9094bc02354fc3f8c4dc292b8
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Mon Nov 9 08:52:38 2015 +0000
sna: Allow a CPU bo to be read by the GPU as we read from it
Just a minor assertion relaxation to treat a bo as being read by both
parties as still coherent.
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 937d6a8..7d7731b 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -1544,7 +1544,7 @@ static inline bool has_coherent_ptr(struct sna *sna, struct sna_pixmap *priv, un
if (!priv->cpu_bo)
return true;
- assert(!priv->cpu_bo->needs_flush);
+ assert(!priv->cpu_bo->needs_flush || (flags & MOVE_WRITE) == 0);
assert(priv->pixmap->devKind == priv->cpu_bo->pitch);
return priv->pixmap->devPrivate.ptr == MAP(priv->cpu_bo->map__cpu);
}
commit 54b3adc23fbfdc5f6983bca2bcd01de2404911cf
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Sun Nov 8 20:14:50 2015 +0000
sna: Simply retire-requests
Since we have the ring member available in the request structure, let's
use it directly rather than attempt a more fragile method of recomputing
it.
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/kgem.c b/src/sna/kgem.c
index b80fde7..ac4da4b 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -3275,18 +3275,18 @@ bool __kgem_ring_is_idle(struct kgem *kgem, int ring)
bool __kgem_retire_requests_upto(struct kgem *kgem, struct kgem_bo *bo)
{
- struct kgem_request *rq = bo->rq, *tmp;
- struct list *requests = &kgem->requests[RQ_RING(rq) == KGEM_BLT];
+ struct kgem_request * const rq = RQ(bo->rq), *tmp;
+ struct list *requests = &kgem->requests[rq->ring];
- DBG(("%s(handle=%d)\n", __FUNCTION__, bo->handle));
+ DBG(("%s(handle=%d, ring=%d)\n", __FUNCTION__, bo->handle, rq->ring));
- rq = RQ(rq);
assert(rq != &kgem->static_request);
if (rq == (struct kgem_request *)kgem) {
__kgem_bo_clear_busy(bo);
return false;
}
+ assert(rq->ring < ARRAY_SIZE(kgem->requests));
do {
tmp = list_first_entry(requests, struct kgem_request, list);
assert(tmp->ring == rq->ring);
diff --git a/src/sna/kgem.h b/src/sna/kgem.h
index 9e6db0f..6cf877c 100644
--- a/src/sna/kgem.h
+++ b/src/sna/kgem.h
@@ -104,7 +104,7 @@ struct kgem_request {
struct list list;
struct kgem_bo *bo;
struct list buffers;
- int ring;
+ unsigned ring;
};
enum {
commit 7fc15ec3975e3a99a6bbb869c07172cdee6e5f63
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Sun Nov 8 12:54:09 2015 +0000
sna/video: Move the composite offsets into the dstRegion
Move the application of the composite offset from the backends into the
caller so that we correctly apply the offset to the dstRegion prior to
calling move-to-gpu with that set of boxes.
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 3c87b36..322de02 100644
--- a/src/sna/gen3_render.c
+++ b/src/sna/gen3_render.c
@@ -5495,17 +5495,7 @@ gen3_render_video(struct sna *sna,
pix_yoff = -dstRegion->extents.y1;
copy = 1;
} else {
- /* Set up the offset for translating from the given region
- * (in screen coordinates) to the backing pixmap.
- */
-#ifdef COMPOSITE
- pix_xoff = -pixmap->screen_x + pixmap->drawable.x;
- pix_yoff = -pixmap->screen_y + pixmap->drawable.y;
-#else
- pix_xoff = 0;
- pix_yoff = 0;
-#endif
-
+ pix_xoff = pix_yoff = 0;
dst_width = pixmap->drawable.width;
dst_height = pixmap->drawable.height;
}
@@ -5561,16 +5551,9 @@ gen3_render_video(struct sna *sna,
} while (nbox);
if (copy) {
-#ifdef COMPOSITE
- pix_xoff = -pixmap->screen_x + pixmap->drawable.x;
- pix_yoff = -pixmap->screen_y + pixmap->drawable.y;
-#else
- pix_xoff = 0;
- pix_yoff = 0;
-#endif
sna_blt_copy_boxes(sna, GXcopy,
dst_bo, -dstRegion->extents.x1, -dstRegion->extents.y1,
- priv->gpu_bo, pix_xoff, pix_yoff,
+ priv->gpu_bo, 0, 0,
pixmap->drawable.bitsPerPixel,
region_rects(dstRegion),
region_num_rects(dstRegion));
@@ -5578,21 +5561,7 @@ gen3_render_video(struct sna *sna,
kgem_bo_destroy(&sna->kgem, dst_bo);
}
- if (!DAMAGE_IS_ALL(priv->gpu_damage)) {
- if ((pix_xoff | pix_yoff) == 0) {
- sna_damage_add(&priv->gpu_damage, dstRegion);
- sna_damage_subtract(&priv->cpu_damage, dstRegion);
- } else {
- sna_damage_add_boxes(&priv->gpu_damage,
- 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),
- pix_xoff, pix_yoff);
- }
- }
+ sna_damage_add(&priv->gpu_damage, dstRegion);
return true;
}
diff --git a/src/sna/gen4_render.c b/src/sna/gen4_render.c
index 0500676..6316f54 100644
--- a/src/sna/gen4_render.c
+++ b/src/sna/gen4_render.c
@@ -1405,8 +1405,8 @@ gen4_render_video(struct sna *sna,
int src_height = frame->src.y2 - frame->src.y1;
float src_offset_x, src_offset_y;
float src_scale_x, src_scale_y;
- int nbox, pix_xoff, pix_yoff;
const BoxRec *box;
+ int nbox;
DBG(("%s: %dx%d -> %dx%d\n", __FUNCTION__,
src_width, src_height, dst_width, dst_height));
@@ -1445,17 +1445,6 @@ gen4_render_video(struct sna *sna,
gen4_align_vertex(sna, &tmp);
gen4_video_bind_surfaces(sna, &tmp);
- /* Set up the offset for translating from the given region (in screen
- * coordinates) to the backing pixmap.
- */
-#ifdef COMPOSITE
- pix_xoff = -pixmap->screen_x + pixmap->drawable.x;
- pix_yoff = -pixmap->screen_y + pixmap->drawable.y;
-#else
- pix_xoff = 0;
- pix_yoff = 0;
-#endif
-
src_scale_x = (float)src_width / dst_width / frame->width;
src_offset_x = (float)frame->src.x1 / frame->width - dstRegion->extents.x1 * src_scale_x;
@@ -1473,34 +1462,25 @@ gen4_render_video(struct sna *sna,
nbox -= n;
do {
- BoxRec r;
-
- r.x1 = box->x1 + pix_xoff;
- r.x2 = box->x2 + pix_xoff;
- r.y1 = box->y1 + pix_yoff;
- r.y2 = box->y2 + pix_yoff;
-
- OUT_VERTEX(r.x2, r.y2);
+ OUT_VERTEX(box->x2, box->y2);
OUT_VERTEX_F(box->x2 * src_scale_x + src_offset_x);
OUT_VERTEX_F(box->y2 * src_scale_y + src_offset_y);
- OUT_VERTEX(r.x1, r.y2);
+ OUT_VERTEX(box->x1, box->y2);
OUT_VERTEX_F(box->x1 * src_scale_x + src_offset_x);
OUT_VERTEX_F(box->y2 * src_scale_y + src_offset_y);
- OUT_VERTEX(r.x1, r.y1);
+ OUT_VERTEX(box->x1, box->y1);
OUT_VERTEX_F(box->x1 * src_scale_x + src_offset_x);
OUT_VERTEX_F(box->y1 * src_scale_y + src_offset_y);
- if (!DAMAGE_IS_ALL(priv->gpu_damage)) {
- sna_damage_add_box(&priv->gpu_damage, &r);
- sna_damage_subtract_box(&priv->cpu_damage, &r);
- }
box++;
} while (--n);
} while (nbox);
gen4_vertex_flush(sna);
+ sna_damage_add(&priv->gpu_damage, dstRegion);
+
return true;
}
diff --git a/src/sna/gen5_render.c b/src/sna/gen5_render.c
index 099efb2..2de30f5 100644
--- a/src/sna/gen5_render.c
+++ b/src/sna/gen5_render.c
@@ -1355,8 +1355,8 @@ gen5_render_video(struct sna *sna,
int src_height = frame->src.y2 - frame->src.y1;
float src_offset_x, src_offset_y;
float src_scale_x, src_scale_y;
- int nbox, pix_xoff, pix_yoff;
const BoxRec *box;
+ int nbox;
DBG(("%s: %dx%d -> %dx%d\n", __FUNCTION__,
src_width, src_height, dst_width, dst_height));
@@ -1395,17 +1395,6 @@ gen5_render_video(struct sna *sna,
gen5_align_vertex(sna, &tmp);
gen5_video_bind_surfaces(sna, &tmp);
- /* Set up the offset for translating from the given region (in screen
- * coordinates) to the backing pixmap.
- */
-#ifdef COMPOSITE
- pix_xoff = -pixmap->screen_x + pixmap->drawable.x;
- pix_yoff = -pixmap->screen_y + pixmap->drawable.y;
-#else
- pix_xoff = 0;
- pix_yoff = 0;
-#endif
-
src_scale_x = (float)src_width / dst_width / frame->width;
src_offset_x = (float)frame->src.x1 / frame->width - dstRegion->extents.x1 * src_scale_x;
@@ -1415,35 +1404,26 @@ gen5_render_video(struct sna *sna,
box = region_rects(dstRegion);
nbox = region_num_rects(dstRegion);
while (nbox--) {
- BoxRec r;
-
- r.x1 = box->x1 + pix_xoff;
- r.x2 = box->x2 + pix_xoff;
- r.y1 = box->y1 + pix_yoff;
- r.y2 = box->y2 + pix_yoff;
-
gen5_get_rectangles(sna, &tmp, 1, gen5_video_bind_surfaces);
- OUT_VERTEX(r.x2, r.y2);
+ OUT_VERTEX(box->x2, box->y2);
OUT_VERTEX_F(box->x2 * src_scale_x + src_offset_x);
OUT_VERTEX_F(box->y2 * src_scale_y + src_offset_y);
- OUT_VERTEX(r.x1, r.y2);
+ OUT_VERTEX(box->x1, box->y2);
OUT_VERTEX_F(box->x1 * src_scale_x + src_offset_x);
OUT_VERTEX_F(box->y2 * src_scale_y + src_offset_y);
- OUT_VERTEX(r.x1, r.y1);
+ OUT_VERTEX(box->x1, box->y1);
OUT_VERTEX_F(box->x1 * src_scale_x + src_offset_x);
OUT_VERTEX_F(box->y1 * src_scale_y + src_offset_y);
- if (!DAMAGE_IS_ALL(priv->gpu_damage)) {
- sna_damage_add_box(&priv->gpu_damage, &r);
- sna_damage_subtract_box(&priv->cpu_damage, &r);
- }
box++;
}
-
gen4_vertex_flush(sna);
+
+ sna_damage_add(&priv->gpu_damage, dstRegion);
+
return true;
}
diff --git a/src/sna/gen6_render.c b/src/sna/gen6_render.c
index 0fc1021..23943aa 100644
--- a/src/sna/gen6_render.c
+++ b/src/sna/gen6_render.c
@@ -1633,9 +1633,9 @@ gen6_render_video(struct sna *sna,
int src_height = frame->src.y2 - frame->src.y1;
float src_offset_x, src_offset_y;
float src_scale_x, src_scale_y;
- int nbox, pix_xoff, pix_yoff;
unsigned filter;
const BoxRec *box;
+ int nbox;
DBG(("%s: src=(%d, %d), dst=(%d, %d), %dx[(%d, %d), (%d, %d)...]\n",
__FUNCTION__,
@@ -1686,17 +1686,6 @@ gen6_render_video(struct sna *sna,
gen6_align_vertex(sna, &tmp);
gen6_emit_video_state(sna, &tmp);
- /* Set up the offset for translating from the given region (in screen
- * coordinates) to the backing pixmap.
- */
-#ifdef COMPOSITE
- pix_xoff = -pixmap->screen_x + pixmap->drawable.x;
- pix_yoff = -pixmap->screen_y + pixmap->drawable.y;
-#else
- pix_xoff = 0;
- pix_yoff = 0;
-#endif
-
src_scale_x = (float)src_width / dst_width / frame->width;
src_offset_x = (float)frame->src.x1 / frame->width - dstRegion->extents.x1 * src_scale_x;
@@ -1706,35 +1695,26 @@ gen6_render_video(struct sna *sna,
box = region_rects(dstRegion);
nbox = region_num_rects(dstRegion);
while (nbox--) {
- BoxRec r;
-
- r.x1 = box->x1 + pix_xoff;
- r.x2 = box->x2 + pix_xoff;
- r.y1 = box->y1 + pix_yoff;
- r.y2 = box->y2 + pix_yoff;
-
gen6_get_rectangles(sna, &tmp, 1, gen6_emit_video_state);
- OUT_VERTEX(r.x2, r.y2);
+ OUT_VERTEX(box->x2, box->y2);
OUT_VERTEX_F(box->x2 * src_scale_x + src_offset_x);
OUT_VERTEX_F(box->y2 * src_scale_y + src_offset_y);
- OUT_VERTEX(r.x1, r.y2);
+ OUT_VERTEX(box->x1, box->y2);
OUT_VERTEX_F(box->x1 * src_scale_x + src_offset_x);
OUT_VERTEX_F(box->y2 * src_scale_y + src_offset_y);
- OUT_VERTEX(r.x1, r.y1);
+ OUT_VERTEX(box->x1, box->y1);
OUT_VERTEX_F(box->x1 * src_scale_x + src_offset_x);
OUT_VERTEX_F(box->y1 * src_scale_y + src_offset_y);
- if (!DAMAGE_IS_ALL(priv->gpu_damage)) {
- sna_damage_add_box(&priv->gpu_damage, &r);
- sna_damage_subtract_box(&priv->cpu_damage, &r);
- }
box++;
}
-
gen4_vertex_flush(sna);
+
+ sna_damage_add(&priv->gpu_damage, dstRegion);
+
return true;
}
diff --git a/src/sna/gen7_render.c b/src/sna/gen7_render.c
index 8ff9150..6a38f68 100644
--- a/src/sna/gen7_render.c
+++ b/src/sna/gen7_render.c
@@ -1839,9 +1839,9 @@ gen7_render_video(struct sna *sna,
int src_height = frame->src.y2 - frame->src.y1;
float src_offset_x, src_offset_y;
float src_scale_x, src_scale_y;
- int nbox, pix_xoff, pix_yoff;
unsigned filter;
const BoxRec *box;
+ int nbox;
DBG(("%s: src=(%d, %d), dst=(%d, %d), %dx[(%d, %d), (%d, %d)...]\n",
__FUNCTION__,
@@ -1894,17 +1894,6 @@ gen7_render_video(struct sna *sna,
gen7_align_vertex(sna, &tmp);
gen7_emit_video_state(sna, &tmp);
- /* Set up the offset for translating from the given region (in screen
- * coordinates) to the backing pixmap.
- */
-#ifdef COMPOSITE
- pix_xoff = -pixmap->screen_x + pixmap->drawable.x;
- pix_yoff = -pixmap->screen_y + pixmap->drawable.y;
-#else
- pix_xoff = 0;
- pix_yoff = 0;
-#endif
-
DBG(("%s: src=(%d, %d)x(%d, %d); frame=(%dx%d), dst=(%dx%d)\n",
__FUNCTION__,
frame->src.x1, frame->src.y1,
@@ -1926,45 +1915,35 @@ gen7_render_video(struct sna *sna,
box = region_rects(dstRegion);
nbox = region_num_rects(dstRegion);
while (nbox--) {
- BoxRec r;
-
- DBG(("%s: dst=(%d, %d), (%d, %d) + (%d, %d); src=(%f, %f), (%f, %f)\n",
+ DBG(("%s: dst=(%d, %d), (%d, %d); src=(%f, %f), (%f, %f)\n",
__FUNCTION__,
box->x1, box->y1,
box->x2, box->y2,
- pix_xoff, pix_yoff,
box->x1 * src_scale_x + src_offset_x,
box->y1 * src_scale_y + src_offset_y,
box->x2 * src_scale_x + src_offset_x,
box->y2 * src_scale_y + src_offset_y));
- r.x1 = box->x1 + pix_xoff;
- r.x2 = box->x2 + pix_xoff;
- r.y1 = box->y1 + pix_yoff;
- r.y2 = box->y2 + pix_yoff;
-
gen7_get_rectangles(sna, &tmp, 1, gen7_emit_video_state);
- OUT_VERTEX(r.x2, r.y2);
+ OUT_VERTEX(box->x2, box->y2);
OUT_VERTEX_F(box->x2 * src_scale_x + src_offset_x);
OUT_VERTEX_F(box->y2 * src_scale_y + src_offset_y);
- OUT_VERTEX(r.x1, r.y2);
+ OUT_VERTEX(box->x1, box->y2);
OUT_VERTEX_F(box->x1 * src_scale_x + src_offset_x);
OUT_VERTEX_F(box->y2 * src_scale_y + src_offset_y);
- OUT_VERTEX(r.x1, r.y1);
+ OUT_VERTEX(box->x1, box->y1);
OUT_VERTEX_F(box->x1 * src_scale_x + src_offset_x);
OUT_VERTEX_F(box->y1 * src_scale_y + src_offset_y);
- if (!DAMAGE_IS_ALL(priv->gpu_damage)) {
- sna_damage_add_box(&priv->gpu_damage, &r);
- sna_damage_subtract_box(&priv->cpu_damage, &r);
- }
box++;
}
-
gen4_vertex_flush(sna);
+
+ sna_damage_add(&priv->gpu_damage, dstRegion);
+
return true;
}
diff --git a/src/sna/gen8_render.c b/src/sna/gen8_render.c
index 0b4638a..2a40bd1 100644
--- a/src/sna/gen8_render.c
+++ b/src/sna/gen8_render.c
@@ -3780,9 +3780,9 @@ gen8_render_video(struct sna *sna,
int src_height = frame->src.y2 - frame->src.y1;
float src_offset_x, src_offset_y;
float src_scale_x, src_scale_y;
- int nbox, pix_xoff, pix_yoff;
unsigned filter;
const BoxRec *box;
+ int nbox;
DBG(("%s: src=(%d, %d), dst=(%d, %d), %dx[(%d, %d), (%d, %d)...]\n",
__FUNCTION__,
@@ -3838,17 +3838,6 @@ gen8_render_video(struct sna *sna,
gen8_align_vertex(sna, &tmp);
gen8_emit_video_state(sna, &tmp);
- /* Set up the offset for translating from the given region (in screen
- * coordinates) to the backing pixmap.
- */
-#ifdef COMPOSITE
- pix_xoff = -pixmap->screen_x + pixmap->drawable.x;
- pix_yoff = -pixmap->screen_y + pixmap->drawable.y;
-#else
- pix_xoff = 0;
- pix_yoff = 0;
-#endif
-
DBG(("%s: src=(%d, %d)x(%d, %d); frame=(%dx%d), dst=(%dx%d)\n",
__FUNCTION__,
frame->src.x1, frame->src.y1,
@@ -3870,45 +3859,35 @@ gen8_render_video(struct sna *sna,
box = region_rects(dstRegion);
nbox = region_num_rects(dstRegion);
while (nbox--) {
- BoxRec r;
-
DBG(("%s: dst=(%d, %d), (%d, %d) + (%d, %d); src=(%f, %f), (%f, %f)\n",
__FUNCTION__,
box->x1, box->y1,
box->x2, box->y2,
- pix_xoff, pix_yoff,
box->x1 * src_scale_x + src_offset_x,
box->y1 * src_scale_y + src_offset_y,
box->x2 * src_scale_x + src_offset_x,
box->y2 * src_scale_y + src_offset_y));
- r.x1 = box->x1 + pix_xoff;
- r.x2 = box->x2 + pix_xoff;
- r.y1 = box->y1 + pix_yoff;
- r.y2 = box->y2 + pix_yoff;
-
gen8_get_rectangles(sna, &tmp, 1, gen8_emit_video_state);
- OUT_VERTEX(r.x2, r.y2);
+ OUT_VERTEX(box->x2, box->y2);
OUT_VERTEX_F(box->x2 * src_scale_x + src_offset_x);
OUT_VERTEX_F(box->y2 * src_scale_y + src_offset_y);
- OUT_VERTEX(r.x1, r.y2);
+ OUT_VERTEX(box->x1, box->y2);
OUT_VERTEX_F(box->x1 * src_scale_x + src_offset_x);
OUT_VERTEX_F(box->y2 * src_scale_y + src_offset_y);
- OUT_VERTEX(r.x1, r.y1);
+ OUT_VERTEX(box->x1, box->y1);
OUT_VERTEX_F(box->x1 * src_scale_x + src_offset_x);
OUT_VERTEX_F(box->y1 * src_scale_y + src_offset_y);
- if (!DAMAGE_IS_ALL(priv->gpu_damage)) {
- sna_damage_add_box(&priv->gpu_damage, &r);
- sna_damage_subtract_box(&priv->cpu_damage, &r);
- }
box++;
}
-
gen8_vertex_flush(sna);
+
+ sna_damage_add(&priv->gpu_damage, dstRegion);
+
return true;
}
#endif
diff --git a/src/sna/sna_video_textured.c b/src/sna/sna_video_textured.c
index cea8887..3f14a59 100644
--- a/src/sna/sna_video_textured.c
+++ b/src/sna/sna_video_textured.c
@@ -149,6 +149,7 @@ sna_video_textured_put_image(ddPutImage_ARGS)
BoxRec dstBox;
RegionRec clip;
xf86CrtcPtr crtc;
+ int16_t dx, dy;
bool flush = false;
bool ret;
@@ -184,6 +185,9 @@ sna_video_textured_put_image(ddPutImage_ARGS)
&clip))
return Success;
+ if (get_drawable_deltas(draw, pixmap, &dx, &dy))
+ RegionTranslate(&clip, dx, dy);
+
flags = MOVE_WRITE | __MOVE_FORCE;
if (clip.data)
flags |= MOVE_READ;
@@ -237,7 +241,7 @@ sna_video_textured_put_image(ddPutImage_ARGS)
DBG(("%s: failed to render video\n", __FUNCTION__));
ret = BadAlloc;
} else
- DamageDamageRegion(draw, &clip);
+ DamageDamageRegion(&pixmap->drawable, &clip);
kgem_bo_destroy(&sna->kgem, frame.bo);
More information about the xorg-commit
mailing list