KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i965: Delete pending CCS and HiZ ops in intel_miptree_make_shareable() 

Fixes crash in piglit
`egl_khr_gl_renderbuffer_image-clear-shared-image GL_DEPTH_COMPONENT24`
on Skylake.

The crash happened because blorp attempted to execute a pending hiz
clear after the hiz buffer was deleted. Deleting the pending hiz ops
when the hiz buffer gets deleted fixes the crash.

For good measure, this patch also deletes all pending CCS/MCS ops when
the CCS/MCS buffer gets deleted. I'm now aware of any bugs
caused by the dangling ops, but deleting them is clearly the right thing
to do.

Cc: Ben Widawsky <ben@bwidawsk.net>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=99265
This commit is contained in:
Chad Versace 2017-01-04 12:33:56 -08:00
parent e0674e740b
commit de0b0a3a9c
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/mesa/drivers/dri/i965/intel_mipmap_tree.c
View File

@ -2338,6 +2338,12 @@ intel_miptree_make_shareable(struct brw_context *brw,
drm_intel_bo_unreference(mt->mcs_buf->bo);
free(mt->mcs_buf);
mt->mcs_buf = NULL;
/* Any pending MCS/CCS operations are no longer needed. Trying to
* execute any will likely crash due to the missing aux buffer. So let's
* delete all pending ops.
*/
exec_list_make_empty(&mt->color_resolve_map);
}
if (mt->hiz_buf) {
@ -2345,6 +2351,16 @@ intel_miptree_make_shareable(struct brw_context *brw,
intel_miptree_all_slices_resolve_depth(brw, mt);
intel_miptree_hiz_buffer_free(mt->hiz_buf);
mt->hiz_buf = NULL;
for (uint32_t l = mt->first_level; l <= mt->last_level; ++l) {
mt->level[l].has_hiz = false;
}
/* Any pending HiZ operations are no longer needed. Trying to execute
* any will likely crash due to the missing aux buffer. So let's delete
* all pending ops.
*/
exec_list_make_empty(&mt->hiz_map);
}
}