Commit e54b2e90 authored by Daniel Stone's avatar Daniel Stone

Revert "i965: Always use Y-tiled buffers on SKL+"

This commit broke Weston, Mutter, and xf86-video-modesetting, on KMS.

In order to use Y-tiled buffers, the kernel requires the tiling mode to
be explicitly named through the I915_FORMAT_MOD_Y_TILED AddFB2 modifier;
it disallows any attempt to infer the buffer's tiling mode.

As the GBM API does not have a way to extract modifiers for a buffer,
this commit broke all users of GBM on SKL+. Revert it for now, until we
get a way to extract modifier information from GBM, and also let GBM
users inform the implementation that it intends to use the modifiers.

This reverts commit 6a0d0364.
Signed-off-by: Daniel Stone's avatarDaniel Stone <daniels@collabora.com>
Acked-by: Ben Widawsky's avatarBen Widawsky <ben@bwidawsk.net>
Tested-by: default avatarHans de Goede <hdegoede@redhat.com>
parent 920d78a3
......@@ -244,7 +244,7 @@ brw_get_fast_clear_rect(const struct brw_context *brw,
* alignment size returned by intel_get_non_msrt_mcs_alignment(), but
* with X alignment multiplied by 16 and Y alignment multiplied by 32.
*/
intel_get_non_msrt_mcs_alignment(brw, mt, &x_align, &y_align);
intel_get_non_msrt_mcs_alignment(mt, &x_align, &y_align);
x_align *= 16;
/* SKL+ line alignment requirement for Y-tiled are half those of the prior
......@@ -838,7 +838,7 @@ brw_get_resolve_rect(const struct brw_context *brw,
* by a factor of 2.
*/
intel_get_non_msrt_mcs_alignment(brw, mt, &x_align, &y_align);
intel_get_non_msrt_mcs_alignment(mt, &x_align, &y_align);
if (brw->gen >= 9) {
x_scaledown = x_align * 8;
y_scaledown = y_align * 8;
......
......@@ -144,8 +144,7 @@ compute_msaa_layout(struct brw_context *brw, mesa_format format,
* by half the block width, and Y coordinates by half the block height.
*/
void
intel_get_non_msrt_mcs_alignment(const struct brw_context *brw,
const struct intel_mipmap_tree *mt,
intel_get_non_msrt_mcs_alignment(const struct intel_mipmap_tree *mt,
unsigned *width_px, unsigned *height)
{
switch (mt->tiling) {
......@@ -157,11 +156,6 @@ intel_get_non_msrt_mcs_alignment(const struct brw_context *brw,
*height = 4;
break;
case I915_TILING_X:
/* The docs are somewhat confusing with the way the tables are displayed.
* However, it does clearly state: "MCS and Lossless compression is
* supported for TiledY/TileYs/TileYf non-MSRTs only."
*/
assert(brw->gen < 9);
*width_px = 64 / mt->cpp;
*height = 2;
}
......@@ -1558,7 +1552,7 @@ intel_miptree_alloc_non_msrt_mcs(struct brw_context *brw,
const mesa_format format = MESA_FORMAT_R_UINT32;
unsigned block_width_px;
unsigned block_height;
intel_get_non_msrt_mcs_alignment(brw, mt, &block_width_px, &block_height);
intel_get_non_msrt_mcs_alignment(mt, &block_width_px, &block_height);
unsigned width_divisor = block_width_px * 4;
unsigned height_divisor = block_height * 8;
......
......@@ -663,8 +663,7 @@ struct intel_mipmap_tree
};
void
intel_get_non_msrt_mcs_alignment(const struct brw_context *brw,
const struct intel_mipmap_tree *mt,
intel_get_non_msrt_mcs_alignment(const struct intel_mipmap_tree *mt,
unsigned *width_px, unsigned *height);
bool
......
......@@ -516,11 +516,7 @@ intel_create_image(__DRIscreen *screen,
int cpp;
unsigned long pitch;
if (intelScreen->devinfo->gen >= 9) {
tiling = I915_TILING_Y;
} else {
tiling = I915_TILING_X;
}
tiling = I915_TILING_X;
if (use & __DRI_IMAGE_USE_CURSOR) {
if (width != 64 || height != 64)
return NULL;
......@@ -1148,14 +1144,8 @@ 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;
uint32_t tiling;
if (screen->devinfo->gen >= 9) {
tiling = I915_TILING_Y;
} else {
tiling = I915_TILING_X;
}
buffer = drm_intel_bo_alloc_tiled(screen->bufmgr, "swizzle test",
64, 64, 4,
......@@ -1581,12 +1571,7 @@ intelAllocateBuffer(__DRIscreen *screen,
return NULL;
/* The front and back buffers are color buffers, which are X tiled. */
uint32_t tiling;
if (intelScreen->devinfo->gen >= 9) {
tiling = I915_TILING_Y;
} else {
tiling = I915_TILING_X;
}
uint32_t tiling = I915_TILING_X;
unsigned long pitch;
int cpp = format / 8;
intelBuffer->bo = drm_intel_bo_alloc_tiled(intelScreen->bufmgr,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment