diff options
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_context.c | 1 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_context.h | 1 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_mipmap_tree.c | 12 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_screen.c | 26 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_screen.h | 1 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_span.c | 28 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_span.h | 2 |
7 files changed, 49 insertions, 22 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c index c876694cead..7b2bdadc9de 100644 --- a/src/mesa/drivers/dri/intel/intel_context.c +++ b/src/mesa/drivers/dri/intel/intel_context.c @@ -629,6 +629,7 @@ intelInitContext(struct intel_context *intel, intel->must_use_separate_stencil = intel->intelScreen->hw_must_use_separate_stencil; intel->has_hiz = intel->intelScreen->hw_has_hiz; intel->has_llc = intel->intelScreen->hw_has_llc; + intel->has_swizzling = intel->intelScreen->hw_has_swizzling; memset(&ctx->TextureFormatSupported, 0, sizeof(ctx->TextureFormatSupported)); diff --git a/src/mesa/drivers/dri/intel/intel_context.h b/src/mesa/drivers/dri/intel/intel_context.h index 150e55f9797..ef024b10e96 100644 --- a/src/mesa/drivers/dri/intel/intel_context.h +++ b/src/mesa/drivers/dri/intel/intel_context.h @@ -214,6 +214,7 @@ struct intel_context bool must_use_separate_stencil; bool has_hiz; bool has_llc; + bool has_swizzling; int urb_size; diff --git a/src/mesa/drivers/dri/intel/intel_mipmap_tree.c b/src/mesa/drivers/dri/intel/intel_mipmap_tree.c index 5290da4d6f3..3601f5e8daf 100644 --- a/src/mesa/drivers/dri/intel/intel_mipmap_tree.c +++ b/src/mesa/drivers/dri/intel/intel_mipmap_tree.c @@ -830,7 +830,8 @@ intel_miptree_map_s8(struct intel_context *intel, for (uint32_t x = 0; x < map->w; x++) { ptrdiff_t offset = intel_offset_S8(mt->region->pitch, x + image_x + map->x, - y + image_y + map->y); + y + image_y + map->y, + intel->has_swizzling); untiled_s8_map[y * map->w + x] = tiled_s8_map[offset]; } } @@ -865,7 +866,8 @@ intel_miptree_unmap_s8(struct intel_context *intel, for (uint32_t x = 0; x < map->w; x++) { ptrdiff_t offset = intel_offset_S8(mt->region->pitch, x + map->x, - y + map->y); + y + map->y, + intel->has_swizzling); tiled_s8_map[offset] = untiled_s8_map[y * map->w + x]; } } @@ -925,7 +927,8 @@ intel_miptree_map_depthstencil(struct intel_context *intel, int map_x = map->x + x, map_y = map->y + y; ptrdiff_t s_offset = intel_offset_S8(s_mt->region->pitch, map_x + s_image_x, - map_y + s_image_y); + map_y + s_image_y, + intel->has_swizzling); ptrdiff_t z_offset = ((map_y + z_image_y) * z_mt->region->pitch + (map_x + z_image_x)); uint8_t s = s_map[s_offset]; @@ -983,7 +986,8 @@ intel_miptree_unmap_depthstencil(struct intel_context *intel, for (uint32_t x = 0; x < map->w; x++) { ptrdiff_t s_offset = intel_offset_S8(s_mt->region->pitch, x + s_image_x + map->x, - y + s_image_y + map->y); + y + s_image_y + map->y, + intel->has_swizzling); ptrdiff_t z_offset = ((y + z_image_y) * z_mt->region->pitch + (x + z_image_x)); diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c index ab15740026a..48762d00a3a 100644 --- a/src/mesa/drivers/dri/intel/intel_screen.c +++ b/src/mesa/drivers/dri/intel/intel_screen.c @@ -667,6 +667,30 @@ intel_override_separate_stencil(struct intel_screen *screen) } } +static bool +intel_detect_swizzling(struct intel_screen *screen) +{ + drm_intel_bo *buffer; + unsigned long flags = 0; + unsigned long aligned_pitch; + uint32_t tiling = I915_TILING_X; + uint32_t swizzle_mode = 0; + + buffer = drm_intel_bo_alloc_tiled(screen->bufmgr, "swizzle test", + 64, 64, 4, + &tiling, &aligned_pitch, flags); + if (buffer == NULL) + return false; + + drm_intel_bo_get_tiling(buffer, &tiling, &swizzle_mode); + drm_intel_bo_unreference(buffer); + + if (swizzle_mode == I915_BIT_6_SWIZZLE_NONE) + return false; + else + return true; +} + /** * This is the driver specific part of the createNewScreen entry point. * Called when using DRI2. @@ -765,6 +789,8 @@ __DRIconfig **intelInitScreen2(__DRIscreen *psp) if (!intel_init_bufmgr(intelScreen)) return false; + intelScreen->hw_has_swizzling = intel_detect_swizzling(intelScreen); + psp->extensions = intelScreenExtensions; msaa_samples_array[0] = 0; diff --git a/src/mesa/drivers/dri/intel/intel_screen.h b/src/mesa/drivers/dri/intel/intel_screen.h index a6baf1601b5..1998f7eb675 100644 --- a/src/mesa/drivers/dri/intel/intel_screen.h +++ b/src/mesa/drivers/dri/intel/intel_screen.h @@ -117,6 +117,7 @@ struct intel_screen bool kernel_has_gen7_sol_reset; bool hw_has_llc; + bool hw_has_swizzling; bool no_vbo; dri_bufmgr *bufmgr; diff --git a/src/mesa/drivers/dri/intel/intel_span.c b/src/mesa/drivers/dri/intel/intel_span.c index 3645720c060..b0dc72023f3 100644 --- a/src/mesa/drivers/dri/intel/intel_span.c +++ b/src/mesa/drivers/dri/intel/intel_span.c @@ -65,7 +65,7 @@ * mesa: Fix return type of _mesa_get_format_bytes() (#37351) */ intptr_t -intel_offset_S8(uint32_t stride, uint32_t x, uint32_t y) +intel_offset_S8(uint32_t stride, uint32_t x, uint32_t y, bool swizzled) { uint32_t tile_size = 4096; uint32_t tile_width = 64; @@ -90,22 +90,16 @@ intel_offset_S8(uint32_t stride, uint32_t x, uint32_t y) + 2 * (byte_y % 2) + 1 * (byte_x % 2); - /* - * Errata for Gen5: - * - * An additional offset is needed which is not documented in the PRM. - * - * if ((byte_x / 8) % 2 == 1) { - * if ((byte_y / 8) % 2) == 0) { - * u += 64; - * } else { - * u -= 64; - * } - * } - * - * The offset is expressed more tersely as - * u += ((int) x & 0x8) * (8 - (((int) y & 0x8) << 1)); - */ + if (swizzled) { + /* adjust for bit6 swizzling */ + if (((byte_x / 8) % 2) == 1) { + if (((byte_y / 8) % 2) == 0) { + u += 64; + } else { + u -= 64; + } + } + } return u; } diff --git a/src/mesa/drivers/dri/intel/intel_span.h b/src/mesa/drivers/dri/intel/intel_span.h index b2bd416412f..e5218691c65 100644 --- a/src/mesa/drivers/dri/intel/intel_span.h +++ b/src/mesa/drivers/dri/intel/intel_span.h @@ -38,6 +38,6 @@ extern void intelSpanRenderStart(struct gl_context * ctx); void intel_map_vertex_shader_textures(struct gl_context *ctx); void intel_unmap_vertex_shader_textures(struct gl_context *ctx); -intptr_t intel_offset_S8(uint32_t stride, uint32_t x, uint32_t y); +intptr_t intel_offset_S8(uint32_t stride, uint32_t x, uint32_t y, bool swizzled); #endif |