diff options
| author | Daniel Stone <[email protected]> | 2016-05-02 15:34:40 +0100 |
|---|---|---|
| committer | Daniel Stone <[email protected]> | 2016-05-09 10:35:55 +0100 |
| commit | e54b2e902aba22f697c0ba8622cd0a905f1edfff (patch) | |
| tree | 7a49e670de554dc46c23fc754fdcf48201f68f18 /src/mesa/drivers/dri/i965/intel_mipmap_tree.h | |
| parent | 920d78a32c25eae051599896fe186aa8507cd007 (diff) | |
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 6a0d036483caf87d43ebe2edd1905873446c9589.
Signed-off-by: Daniel Stone <[email protected]>
Acked-by: Ben Widawsky <[email protected]>
Tested-by: Hans de Goede <[email protected]>
Diffstat (limited to 'src/mesa/drivers/dri/i965/intel_mipmap_tree.h')
| -rw-r--r-- | src/mesa/drivers/dri/i965/intel_mipmap_tree.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.h b/src/mesa/drivers/dri/i965/intel_mipmap_tree.h index 21e4718513b..7862152cd97 100644 --- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.h +++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.h @@ -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 |