xf86-video-intel: 2 commits - src/sna/gen2_render.c 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/sna_blt.c src/sna/sna_render.h
Chris Wilson
ickle at kemper.freedesktop.org
Thu Sep 13 14:49:36 PDT 2012
src/sna/gen2_render.c | 4 +---
src/sna/gen3_render.c | 4 +---
src/sna/gen4_render.c | 4 +---
src/sna/gen5_render.c | 4 +---
src/sna/gen6_render.c | 4 +---
src/sna/gen7_render.c | 20 ++++++++++++++------
src/sna/sna_blt.c | 1 -
src/sna/sna_render.h | 1 -
8 files changed, 19 insertions(+), 23 deletions(-)
New commits:
commit 35d81d97b38d05f132a4823e57fff4012e966504
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Thu Sep 13 22:32:47 2012 +0100
sna/gen7: Defensively program default GT values
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/gen7_render.c b/src/sna/gen7_render.c
index 53fcb2a..383caa4 100644
--- a/src/sna/gen7_render.c
+++ b/src/sna/gen7_render.c
@@ -83,6 +83,13 @@ struct gt_info {
} urb;
};
+static const struct gt_info ivb_gt_info = {
+ .max_vs_threads = 16,
+ .max_gs_threads = 16,
+ .max_wm_threads = (16-1) << IVB_PS_MAX_THREADS_SHIFT,
+ .urb = { 128, 64, 64 },
+};
+
static const struct gt_info ivb_gt1_info = {
.max_vs_threads = 36,
.max_gs_threads = 36,
@@ -4255,9 +4262,12 @@ static bool gen7_render_setup(struct sna *sna)
int i, j, k, l, m;
if (sna->kgem.gen == 70) {
- state->info = &ivb_gt1_info;
- if (DEVICE_ID(sna->PciInfo) & 0x20)
- state->info = &ivb_gt2_info; /* XXX requires GT_MODE WiZ disabled */
+ state->info = &ivb_gt_info;
+ if (DEVICE_ID(sna->PciInfo) & 0xf) {
+ state->info = &ivb_gt1_info;
+ if (DEVICE_ID(sna->PciInfo) & 0x20)
+ state->info = &ivb_gt2_info; /* XXX requires GT_MODE WiZ disabled */
+ }
} else if (sna->kgem.gen == 75) {
state->info = &hsw_gt_info;
} else
commit 3fbdedbf9d509c5ca58ae0a01fe8e54dcc990cf8
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Thu Sep 13 22:10:08 2012 +0100
sna: Fix analysis of source extents for BLT composite
After we have computed the source offset vector for the transformed
source bo, we need to use that with respect to the destination rectangle
to verify that the source sample is wholly within bounds.
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/gen2_render.c b/src/sna/gen2_render.c
index 7d51823..ca61bd3 100644
--- a/src/sna/gen2_render.c
+++ b/src/sna/gen2_render.c
@@ -1780,9 +1780,7 @@ gen2_render_composite(struct sna *sna,
case 1:
if (mask == NULL && tmp->src.bo &&
sna_blt_composite__convert(sna,
- src_x, src_y,
- width, height,
- dst_x, dst_y,
+ dst_x, dst_y, width, height,
tmp))
return true;
break;
diff --git a/src/sna/gen3_render.c b/src/sna/gen3_render.c
index 60e197e..723dd5e 100644
--- a/src/sna/gen3_render.c
+++ b/src/sna/gen3_render.c
@@ -2868,9 +2868,7 @@ gen3_render_composite(struct sna *sna,
case 1:
if (mask == NULL && tmp->src.bo &&
sna_blt_composite__convert(sna,
- src_x, src_y,
- width, height,
- dst_x, dst_y,
+ dst_x, dst_y, width, height,
tmp))
return true;
diff --git a/src/sna/gen4_render.c b/src/sna/gen4_render.c
index d8b76a1..ceef528 100644
--- a/src/sna/gen4_render.c
+++ b/src/sna/gen4_render.c
@@ -2315,9 +2315,7 @@ gen4_render_composite(struct sna *sna,
case 1:
if (mask == NULL &&
sna_blt_composite__convert(sna,
- src_x, src_y,
- width, height,
- dst_x, dst_y,
+ dst_x, dst_y, width, height,
tmp))
return true;
diff --git a/src/sna/gen5_render.c b/src/sna/gen5_render.c
index 5eff871..c9a2cc0 100644
--- a/src/sna/gen5_render.c
+++ b/src/sna/gen5_render.c
@@ -2330,9 +2330,7 @@ gen5_render_composite(struct sna *sna,
case 1:
if (mask == NULL &&
sna_blt_composite__convert(sna,
- src_x, src_y,
- width, height,
- dst_x, dst_y,
+ dst_x, dst_y, width, height,
tmp))
return true;
diff --git a/src/sna/gen6_render.c b/src/sna/gen6_render.c
index 363e8db..8e10af3 100644
--- a/src/sna/gen6_render.c
+++ b/src/sna/gen6_render.c
@@ -2708,9 +2708,7 @@ gen6_render_composite(struct sna *sna,
if (mask == NULL &&
prefer_blt_composite(sna, tmp) &&
sna_blt_composite__convert(sna,
- src_x, src_y,
- width, height,
- dst_x, dst_y,
+ dst_x, dst_y, width, height,
tmp))
return true;
diff --git a/src/sna/gen7_render.c b/src/sna/gen7_render.c
index 705a17d..53fcb2a 100644
--- a/src/sna/gen7_render.c
+++ b/src/sna/gen7_render.c
@@ -2811,9 +2811,7 @@ gen7_render_composite(struct sna *sna,
if (mask == NULL &&
prefer_blt_composite(sna, tmp) &&
sna_blt_composite__convert(sna,
- src_x, src_y,
- width, height,
- dst_x, dst_y,
+ dst_x, dst_y, width, height,
tmp))
return true;
diff --git a/src/sna/sna_blt.c b/src/sna/sna_blt.c
index 757447b..b97df22 100644
--- a/src/sna/sna_blt.c
+++ b/src/sna/sna_blt.c
@@ -1914,7 +1914,6 @@ bool
sna_blt_composite__convert(struct sna *sna,
int x, int y,
int width, int height,
- int dst_x, int dst_y,
struct sna_composite_op *tmp)
{
uint32_t alpha_fixup;
diff --git a/src/sna/sna_render.h b/src/sna/sna_render.h
index 442c78d..03a7005 100644
--- a/src/sna/sna_render.h
+++ b/src/sna/sna_render.h
@@ -574,7 +574,6 @@ bool sna_blt_composite(struct sna *sna,
bool sna_blt_composite__convert(struct sna *sna,
int x, int y,
int width, int height,
- int dst_x, int dst_y,
struct sna_composite_op *tmp);
bool sna_blt_fill(struct sna *sna, uint8_t alu,
More information about the xorg-commit
mailing list