diff options
| -rw-r--r-- | src/mesa/drivers/dri/i965/intel_screen.c | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c index 3d9e283d07..3d6ad61615 100644 --- a/src/mesa/drivers/dri/i965/intel_screen.c +++ b/src/mesa/drivers/dri/i965/intel_screen.c @@ -525,6 +525,8 @@ select_best_modifier(struct gen_device_info *devinfo, const uint64_t *modifiers, const unsigned count) { +#define YfTILE_CCS (1 << 4) +#define YTILE_CCS (1 << 3) #define YTILE (1 << 2) #define XTILE (1 << 1) #define LINEAR (1 << 0) @@ -532,7 +534,9 @@ select_best_modifier(struct gen_device_info *devinfo, const uint64_t prio_modifiers[] = { DRM_FORMAT_MOD_LINEAR, I915_FORMAT_MOD_X_TILED, - I915_FORMAT_MOD_Y_TILED}; + I915_FORMAT_MOD_Y_TILED, + /* I915_FORMAT_MOD_Y_TILED_CCS */ fourcc_mod_code(INTEL, 4), + /* I915_FORMAT_MOD_Yf_TILED_CCS */ fourcc_mod_code(INTEL, 5)}; uint32_t modifier_bitmask = 0; /* API only allows 32 */ for (int i = 0; i < count; i++) { @@ -551,6 +555,12 @@ select_best_modifier(struct gen_device_info *devinfo, modifier_bitmask |= YTILE; break; + case /* I915_FORMAT_MOD_Y_TILED_CCS */ fourcc_mod_code(INTEL, 4): + modifier_bitmask |= YTILE_CCS; + break; + case /* I915_FORMAT_MOD_Yf_TILED_CCS */ fourcc_mod_code(INTEL, 5): + modifier_bitmask |= YfTILE_CCS; + break; } } @@ -562,6 +572,8 @@ select_best_modifier(struct gen_device_info *devinfo, #undef LINEAR #undef XTILE #undef YTILE +#undef YTILE_CCS +#undef YTILE_CCS_Yf } static int @@ -575,6 +587,10 @@ create_image_with_modifier(struct intel_screen *screen, unsigned ccs_height = 0; switch (modifier) { + case /* I915_FORMAT_MOD_Yf_TILED_CCS */ fourcc_mod_code(INTEL, 5): + case /* I915_FORMAT_MOD_Y_TILED_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); @@ -725,6 +741,8 @@ intel_create_image_with_modifiers(__DRIscreen *dri_screen, /* This compacts the actual modifiers to the ones we know how to handle */ for (int i = 0; i < count; i++) { switch (modifiers[i]) { + case /* I915_FORMAT_MOD_Yf_TILED_CCS */ fourcc_mod_code(INTEL, 5): + case /* I915_FORMAT_MOD_Y_TILED_CCS */ fourcc_mod_code(INTEL, 4): case I915_FORMAT_MOD_Y_TILED: case I915_FORMAT_MOD_X_TILED: case DRM_FORMAT_MOD_LINEAR: |