fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-04-27 17:30:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

pan/fb: Force pre-frame shaders to ALWAYS for clean tiles

Browse source 
If we set clean_tile_enable but don't also force-enable pre-frame
shaders, we have a problem.

Fixes: 6a56d35705 ("pan/fb: Fill out our own descriptors")
Reviewed-by: Christoph Pillmayer <christoph.pillmayer@arm.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/39324>
This commit is contained in:
Faith Ekstrand 2026-02-24 23:53:03 -05:00 • committed by Marge Bot
parent 0c4f2aba51
commit c015759629
1 changed files with 28 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/panfrost/lib/pan_fb.c
View file

@ -468,14 +468,14 @@ pan_fb_get_clean_tile(const struct pan_fb_desc_info *info)
ct.zs = z_always_load || zs_always_store;
if (store && store->zs.store) {
const struct pan_image *zs_img =
const struct pan_image *img =
pan_image_view_get_zs_plane(store->zs.iview).image;
assert(util_format_get_depth_bits(zs_img->props.format) ==
assert(util_format_get_depth_bits(img->props.format) ==
util_format_get_depth_bits(fb->z_format));
assert(util_format_get_depth_bits(store->zs.iview->format) ==
util_format_get_depth_bits(fb->z_format));
const struct util_format_description *zs_fmt_desc =
util_format_description(zs_img->props.format);
util_format_description(img->props.format);
/* If ZS writes stencil, we have to also include stencil loads */
if (util_format_has_stencil(zs_fmt_desc) && s_always_load)
@ -648,6 +648,27 @@ emit_rgb_rt_desc(const struct pan_fb_desc_info *info,
pan_merge(rgb_rt, &desc, RGB_RENDER_TARGET);
}
#if PAN_ARCH >= 6
/* All GPUs starting from Bifrost are affected by issue TSIX-2033:
*
* Forcing clean_tile_writes breaks INTERSECT readbacks
*
* To workaround, use the pre-frame shader mode ALWAYS instead of INTERSECT if
* clean_tile_write_enable is set on either one of the color, depth or stencil
* buffers. Since INTERSECT is a hint that the hardware may ignore, this
* cannot affect correctness, only performance. */
static enum mali_pre_post_frame_shader_mode
pan_fix_frame_shader_mode(enum mali_pre_post_frame_shader_mode mode,
bool force_clean_tile)
{
if (force_clean_tile && mode == MALI_PRE_POST_FRAME_SHADER_MODE_INTERSECT)
return MALI_PRE_POST_FRAME_SHADER_MODE_ALWAYS;
else
return mode;
}
#endif
uint32_t
GENX(pan_emit_fb_desc)(const struct pan_fb_desc_info *info, void *out)
{
@ -667,8 +688,10 @@ GENX(pan_emit_fb_desc)(const struct pan_fb_desc_info *info, void *out)
pan_section_pack(&fbd, FRAMEBUFFER, PARAMETERS, cfg) {
#if PAN_ARCH >= 6
cfg.pre_frame_0 = info->frame_shaders.modes[0];
cfg.pre_frame_1 = info->frame_shaders.modes[1];
cfg.pre_frame_0 = pan_fix_frame_shader_mode(info->frame_shaders.modes[0],
ct.rts || ct.zs || ct.s);
cfg.pre_frame_1 = pan_fix_frame_shader_mode(info->frame_shaders.modes[1],
ct.rts || ct.zs || ct.s);
cfg.post_frame = info->frame_shaders.modes[2];
cfg.frame_shader_dcds = info->frame_shaders.dcd_pointer;