diff options
| author | Ben Widawsky <ben@bwidawsk.net> | 2016-10-06 21:49:45 -0700 |
|---|---|---|
| committer | Ben Widawsky <ben@bwidawsk.net> | 2017-01-02 17:38:07 -0800 |
| commit | 2e7d3825f43f5cd00e0ab66faa372085ce59d5f5 (patch) | |
| tree | 7e48e394524e1e919cf3cb7bd82c763ba3554683 | |
| parent | f90af2f6a76f2508f3f6b6003b0c3b7247219688 (diff) | |
i965: Handle compression modifiermodifiersv2
FINISHME: Use the kernel's final choice for the fb modifier
bwidawsk@norris2:~/intel-gfx/kmscube (modifiers $) ~/scripts/measure_bandwidth.sh ./kmscube none
Read bandwidth: 603.91 MiB/s
Write bandwidth: 615.28 MiB/s
bwidawsk@norris2:~/intel-gfx/kmscube (modifiers $) ~/scripts/measure_bandwidth.sh ./kmscube ytile
Read bandwidth: 571.13 MiB/s
Write bandwidth: 555.51 MiB/s
bwidawsk@norris2:~/intel-gfx/kmscube (modifiers $) ~/scripts/measure_bandwidth.sh ./kmscube ccs
Read bandwidth: 259.34 MiB/s
Write bandwidth: 337.83 MiB/s
v2: Move all references to the new fourcc code(s) to this patch.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
| -rw-r--r-- | src/mesa/drivers/dri/i965/intel_screen.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c index dfd642893a..62fea4589a 100644 --- a/src/mesa/drivers/dri/i965/intel_screen.c +++ b/src/mesa/drivers/dri/i965/intel_screen.c @@ -552,6 +552,9 @@ create_image_with_modifier(struct intel_screen *screen, unsigned ccs_height = 0; switch (modifier) { + case /* I915_FORMAT_MOD_CCS */ fourcc_mod_code(INTEL, 4): + ccs_height = ALIGN(DIV_ROUND_UP(height, 16), 32); + /* fallthrough */ case I915_FORMAT_MOD_Y_TILED: requested_tiling = tiling = I915_TILING_Y; tiled_height = ALIGN(height, 32); @@ -660,6 +663,11 @@ __intel_create_image(__DRIscreen *dri_screen, image->modifier = I915_FORMAT_MOD_X_TILED; break; case I915_FORMAT_MOD_Y_TILED: + /* Y-tiling is the lowest priority modifier */ + if (modifier) + continue; + /* fallthrough */ + case /* I915_FORMAT_MOD_CCS */ fourcc_mod_code(INTEL, 4): /* Kernel provides no way to query support for this. Assume GEN check * is enough :/ */ @@ -669,12 +677,11 @@ __intel_create_image(__DRIscreen *dri_screen, } if (tiling == I915_TILING_NONE) { - _mesa_warning(NULL, "Invalid use/modifier combination (%x %llx)\n", - use, I915_FORMAT_MOD_Y_TILED); + _mesa_warning(NULL, "Invalid use/modifier combination (%x %" PRIx64")\n", + use, modifiers[i]); continue; } - - modifier = I915_FORMAT_MOD_Y_TILED; + modifier = modifiers[i]; break; } } @@ -729,7 +736,8 @@ intel_create_image_with_modifiers(__DRIscreen *dri_screen, local_mods[local_count++] = I915_FORMAT_MOD_X_TILED; break; case I915_FORMAT_MOD_Y_TILED: - local_mods[local_count++] = I915_FORMAT_MOD_Y_TILED; + case /* I915_FORMAT_MOD_CCS */ fourcc_mod_code(INTEL, 4): + local_mods[local_count++] = modifiers[i]; break; } } |