From: Marek Olšák Date: Tue, 9 Aug 2016 10:43:13 +0000 (+0200) Subject: radeonsi: only set dual source blending for MRT0 X-Git-Tag: android-x86-6.0-r1^2~81 X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fexternal-mesa.git;a=commitdiff_plain;h=659d9f189cac0665f2632a5b558986fc71563a34 radeonsi: only set dual source blending for MRT0 This is the proper fix for Overlord and Witcher 2 hangs. The hang condition is that 1 app must write to MRT0 and MRT1 from a pixel shader while MRT1 is disabled in CB_TARGET_MASK (does this generate unflushable pixel quads? I don't know), and another app (e.g. Glamor) must enable dual source blending in both MRT0 and MRT1. The hw gets confused, which leads to corruption and hangs. Cc: 12.0 11.2 Reviewed-by: Michel Dänzer Reviewed-by: Edward O'Callaghan (cherry picked from commit 947e0614d091c260651e4f3d6209bd6bcc2cfa0d) --- diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c index 366f56bec63..ba226554fbb 100644 --- a/src/gallium/drivers/radeonsi/si_state.c +++ b/src/gallium/drivers/radeonsi/si_state.c @@ -460,6 +460,10 @@ static void *si_create_blend_state_mode(struct pipe_context *ctx, S_028760_COLOR_COMB_FCN(V_028760_OPT_COMB_BLEND_DISABLED) | S_028760_ALPHA_COMB_FCN(V_028760_OPT_COMB_BLEND_DISABLED); + /* Only set dual source blending for MRT0 to avoid a hang. */ + if (i >= 1 && blend->dual_src_blend) + continue; + if (!state->rt[j].colormask) continue;