diff options
| author | Eric Anholt <eric@anholt.net> | 2010-10-18 13:28:44 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2010-10-18 14:39:25 -0700 |
| commit | a1c54f69643671ce296c57d132852e9846cc41d3 (patch) | |
| tree | 19b29ed50465fcd6f0880b6606503510b26ec1cc | |
| parent | 33133a1d38a4dce60d2e135663b545895fc85abc (diff) | |
Fix violation of gen6 requirements for depthbuffer tiling.
In general, demoting of tiling of DRI2 buffers seems dubious, as we've
got various bits of functionality that won't all work together unless
buffers are tiled as expected. This just covers one instance of the
problem, caught by assertions in Mesa.
Fixes:
fbo-1d
fbo-d24s8.
glean/readPixSanity
glean/rgbTriStrip
glean/scissor
| -rw-r--r-- | src/intel_uxa.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/intel_uxa.c b/src/intel_uxa.c index 23679bc8..14c47a0b 100644 --- a/src/intel_uxa.c +++ b/src/intel_uxa.c @@ -133,7 +133,8 @@ static unsigned int intel_uxa_pixmap_compute_size(PixmapPtr pixmap, int w, int h, uint32_t *tiling, - int *stride) + int *stride, + unsigned usage) { ScrnInfoPtr scrn = xf86Screens[pixmap->drawable.pScreen->myNum]; intel_screen_private *intel = intel_get_screen_private(scrn); @@ -157,7 +158,7 @@ intel_uxa_pixmap_compute_size(PixmapPtr pixmap, */ if (pitch > KB(8)) *tiling = I915_TILING_NONE; - } else if (size <= 4096) { + } else if (!(usage & INTEL_CREATE_PIXMAP_DRI2) && size <= 4096) { /* Disable tiling beneath a page size, we will not see * any benefit from reducing TLB misses and instead * just incur extra cost when we require a fence. @@ -167,7 +168,7 @@ intel_uxa_pixmap_compute_size(PixmapPtr pixmap, } pitch = (w * pixmap->drawable.bitsPerPixel + 7) / 8; - if (pitch <= 256) + if (!(usage & INTEL_CREATE_PIXMAP_DRI2) && pitch <= 256) *tiling = I915_TILING_NONE; if (*tiling != I915_TILING_NONE) { @@ -772,7 +773,7 @@ static Bool intel_uxa_put_image(PixmapPtr pixmap, /* Replace busy bo. */ size = intel_uxa_pixmap_compute_size (pixmap, w, h, - &tiling, &stride); + &tiling, &stride, 0); if (size > intel->max_gtt_map_size) return FALSE; @@ -978,13 +979,13 @@ intel_uxa_create_pixmap(ScreenPtr screen, int w, int h, int depth, if (!intel->tiling) tiling = I915_TILING_NONE; - if (tiling != I915_TILING_NONE) { + if (tiling != I915_TILING_NONE && !(usage & INTEL_CREATE_PIXMAP_DRI2)) { if (h <= 4) tiling = I915_TILING_NONE; if (h <= 16 && tiling == I915_TILING_Y) tiling = I915_TILING_X; } - size = intel_uxa_pixmap_compute_size(pixmap, w, h, &tiling, &stride); + size = intel_uxa_pixmap_compute_size(pixmap, w, h, &tiling, &stride, usage); /* Fail very large allocations. Large BOs will tend to hit SW fallbacks * frequently, and also will tend to fail to successfully map when doing |