[Mesa-dev] [PATCH 26/32] i965: Make CCS stride match kernel's expectations

[Ben Widawsky]

On 17-01-02 18:37:17, Ben Widawsky wrote:
>v2: Put the commit message as a comment (Topi)
>
>Cc: Topi Pohjolainen <topi.pohjolainen at gmail.com>
>Cc: Ville Syrjälä <ville.syrjala at linux.intel.com>
>Cc: Jason Ekstrand <jason at jlekstrand.net>
>Signed-off-by: Ben Widawsky <ben at bwidawsk.net>
>Acked-by: Daniel Stone <daniels at collabora.com>
>---
> src/mesa/drivers/dri/i965/intel_screen.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
>diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c
>index b65ed76720..dfd642893a 100644
>--- a/src/mesa/drivers/dri/i965/intel_screen.c
>+++ b/src/mesa/drivers/dri/i965/intel_screen.c
>@@ -983,7 +983,10 @@ intel_from_planar(__DRIimage *parent, int plane, void *loaderPrivate)
>     if (parent == NULL || parent->planar_format == NULL) {
>        if (is_aux) {
>           offset = parent->aux_offset;
>-          stride = ALIGN(parent->pitch / 32, 128);
>+          /* Make CCS stride match kernel's expectations. Mesa's internals
>+           * expect: stride = ALIGN(parent->pitch / 32, 128)
>+           */
>+          stride = ALIGN(parent->pitch / 64, 128);
>           height = ALIGN(DIV_ROUND_UP(parent->height, 16), 32);
>           dri_format = parent->dri_format;
>           goto done;

Jason, Ville, can one of you two ack or review this?