xf86-video-intel: 3 commits - src/sna/kgem.c src/sna/kgem.h src/sna/sna_accel.c
Chris Wilson
ickle at kemper.freedesktop.org
Wed May 2 11:21:37 PDT 2012
src/sna/kgem.c | 18 +++++++++++++-----
src/sna/kgem.h | 1 +
src/sna/sna_accel.c | 37 ++++++++++++++++++++++++++++++++++---
3 files changed, 48 insertions(+), 8 deletions(-)
New commits:
commit f4c34e9ab32f31669896b8f626195827a85af337
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Wed May 2 19:09:10 2012 +0100
sna: Bring back the minimum alignment for G33
The underlying cause is still not fixed. It should be possible to use
the much laxer alignment for single-stream linear. Still no idea how I
fail to convince the GPU to drop the depth buffer.
Reported-by: Matti Hamalainen <ccr at tnsp.org>
References: https://bugs.freedesktop.org/show_bug.cgi?id=49391
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/kgem.c b/src/sna/kgem.c
index d519ed6..49fa173 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -600,6 +600,10 @@ void kgem_init(struct kgem *kgem, int fd, struct pci_device *dev, int gen)
/* 865g cannot handle a batch spanning multiple pages */
kgem->max_batch_size = PAGE_SIZE / sizeof(uint32_t);
+ kgem->min_alignment = 4;
+ if (gen < 40)
+ kgem->min_alignment = 64;
+
kgem->half_cpu_cache_pages = cpu_cache_size() >> 13;
list_init(&kgem->active_partials);
@@ -770,8 +774,8 @@ static uint32_t kgem_untiled_pitch(struct kgem *kgem,
uint32_t width, uint32_t bpp,
bool scanout)
{
- width = ALIGN(width, 4) * bpp >> 3;
- return ALIGN(width, scanout ? 64 : 4);
+ width = ALIGN(width, 2) * bpp >> 3;
+ return ALIGN(width, scanout ? 64 : kgem->min_alignment);
}
void kgem_get_tile_size(struct kgem *kgem, int tiling,
@@ -832,13 +836,17 @@ static uint32_t kgem_surface_size(struct kgem *kgem,
tile_width = 512;
tile_height = kgem->gen < 30 ? 16 : 8;
} else {
- tile_width = scanout ? 64 : 4 * bpp >> 3;
- tile_height = 4;
+ tile_width = 2 * bpp >> 3;
+ tile_width = ALIGN(tile_width,
+ scanout ? 64 : kgem->min_alignment);
+ tile_height = 2;
}
} else switch (tiling) {
default:
case I915_TILING_NONE:
- tile_width = scanout ? 64 : 4 * bpp >> 3;
+ tile_width = 2 * bpp >> 3;
+ tile_width = ALIGN(tile_width,
+ scanout ? 64 : kgem->min_alignment);
tile_height = 2;
break;
case I915_TILING_X:
diff --git a/src/sna/kgem.h b/src/sna/kgem.h
index ad2fe84..51025ea 100644
--- a/src/sna/kgem.h
+++ b/src/sna/kgem.h
@@ -143,6 +143,7 @@ struct kgem {
uint16_t nfence;
uint16_t wait;
uint16_t max_batch_size;
+ uint16_t min_alignment;
uint32_t flush:1;
uint32_t need_expire:1;
commit 10b4a9bb5f46ab9d9c8b165084ce4174b54a8d39
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Wed May 2 12:45:09 2012 +0100
sna: Always try to operate inplace if we an LLC gpu bo
diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index db2442a..8b52a40 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -904,6 +904,9 @@ static inline bool pixmap_inplace(struct sna *sna,
if (priv->mapped)
return true;
+ if (sna->kgem.has_llc && pixmap != sna->front)
+ return !priv->cpu_bo;
+
return (pixmap->devKind * pixmap->drawable.height >> 12) >
sna->kgem.half_cpu_cache_pages;
}
@@ -1264,6 +1267,9 @@ static inline bool region_inplace(struct sna *sna,
return false;
}
+ if (sna->kgem.has_llc && pixmap != sna->front)
+ return !priv->cpu_bo;
+
DBG(("%s: (%dx%d), inplace? %d\n",
__FUNCTION__,
region->extents.x2 - region->extents.x1,
commit dd80fb00bf7acf37dc3b9125431a12b67d7e92d3
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Wed May 2 11:31:42 2012 +0100
sna: Fallback for glyphs too large for XY_TEXT_IMMEDIATE
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 12017bd..db2442a 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -6746,7 +6746,6 @@ spans_fallback:
}
gc->ops = (GCOps *)&sna_gc_ops;
- assert_pixmap_contains_box(data.pixmap, &data.region.extents);
if (data.damage) {
if (data.dx | data.dy)
pixman_region_translate(&data.region, data.dx, data.dy);
@@ -10622,8 +10621,6 @@ sna_glyph_extents(FontPtr font,
extents->overallWidth += p->metrics.characterWidth;
}
-
- assert(extents->overallWidth > 0);
}
static bool sna_set_glyph(CharInfoPtr in, CharInfoPtr out)
@@ -10716,6 +10713,16 @@ inline static bool sna_get_glyph16(FontPtr font, struct sna_font *priv,
return sna_set_glyph(ret, *out = p);
}
+static inline bool sna_font_too_large(FontPtr font)
+{
+ int top = max(FONTMAXBOUNDS(font, ascent), FONTASCENT(font));
+ int bot = max(FONTMAXBOUNDS(font, descent), FONTDESCENT(font));
+ int width = max(FONTMAXBOUNDS(font, characterWidth), -FONTMINBOUNDS(font, characterWidth));
+ DBG(("%s: (%d + %d) x %d: %d\n", __FUNCTION__,
+ top, bot, width, (top + bot) * (width + 7)/8));
+ return (top + bot) * (width + 7)/8 > 124;
+}
+
static int
sna_poly_text8(DrawablePtr drawable, GCPtr gc,
int x, int y,
@@ -10731,6 +10738,9 @@ sna_poly_text8(DrawablePtr drawable, GCPtr gc,
if (drawable->depth < 8)
goto fallback;
+ if (sna_font_too_large(gc->font))
+ goto fallback;
+
for (i = n = 0; i < count; i++) {
if (sna_get_glyph8(gc->font, priv, chars[i], &info[n]))
n++;
@@ -10820,6 +10830,9 @@ sna_poly_text16(DrawablePtr drawable, GCPtr gc,
if (drawable->depth < 8)
goto fallback;
+ if (sna_font_too_large(gc->font))
+ goto fallback;
+
for (i = n = 0; i < count; i++) {
if (sna_get_glyph16(gc->font, priv, chars[i], &info[n]))
n++;
@@ -10909,6 +10922,9 @@ sna_image_text8(DrawablePtr drawable, GCPtr gc,
if (drawable->depth < 8)
goto fallback;
+ if (sna_font_too_large(gc->font))
+ goto fallback;
+
for (i = n = 0; i < count; i++) {
if (sna_get_glyph8(gc->font, priv, chars[i], &info[n]))
n++;
@@ -11000,6 +11016,9 @@ sna_image_text16(DrawablePtr drawable, GCPtr gc,
if (drawable->depth < 8)
goto fallback;
+ if (sna_font_too_large(gc->font))
+ goto fallback;
+
for (i = n = 0; i < count; i++) {
if (sna_get_glyph16(gc->font, priv, chars[i], &info[n]))
n++;
@@ -11335,6 +11354,9 @@ sna_image_glyph(DrawablePtr drawable, GCPtr gc,
if (!PM_IS_SOLID(drawable, gc->planemask))
goto fallback;
+ if (sna_font_too_large(gc->font))
+ goto fallback;
+
if ((bo = sna_drawable_use_bo(drawable, true,
®ion.extents, &damage)) &&
sna_reversed_glyph_blt(drawable, gc, x, y, n, info, base,
@@ -11412,6 +11434,9 @@ sna_poly_glyph(DrawablePtr drawable, GCPtr gc,
if (!gc_is_solid(gc, &fg))
goto fallback;
+ if (sna_font_too_large(gc->font))
+ goto fallback;
+
if ((bo = sna_drawable_use_bo(drawable, true,
®ion.extents, &damage)) &&
sna_reversed_glyph_blt(drawable, gc, x, y, n, info, base,
More information about the xorg-commit
mailing list