Module: Mesa Branch: master Commit: de0b0a3a9cfd25ac5082223322002710a23da8ab URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=de0b0a3a9cfd25ac5082223322002710a23da8ab
Author: Chad Versace <[email protected]> Date: Wed Jan 4 12:33:56 2017 -0800 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 <[email protected]> Reviewed-by: Jason Ekstrand <[email protected]> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=99265 --- src/mesa/drivers/dri/i965/intel_mipmap_tree.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c index 25f8f39..ed51423 100644 --- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c +++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c @@ -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); } } _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
