The first 2 patches of this series should be added to branch 18.0 too.

On Fri, Jan 26, 2018 at 11:32:38AM -0800, Rafael Antognolli wrote:
> Fixes: ca19ee33d7d39cb89d948b1c983763065975ce5b
> Signed-off-by: Rafael Antognolli <rafael.antogno...@intel.com>
> Cc: Kenneth Graunke <kenn...@whitecape.org>
> ---
>  src/mesa/drivers/dri/i965/brw_pipe_control.c | 10 ++++------
>  1 file changed, 4 insertions(+), 6 deletions(-)
> 
> diff --git a/src/mesa/drivers/dri/i965/brw_pipe_control.c 
> b/src/mesa/drivers/dri/i965/brw_pipe_control.c
> index eb8ada63129..e5b3ffe640c 100644
> --- a/src/mesa/drivers/dri/i965/brw_pipe_control.c
> +++ b/src/mesa/drivers/dri/i965/brw_pipe_control.c
> @@ -353,12 +353,10 @@ gen7_emit_vs_workaround_flush(struct brw_context *brw)
>  void
>  gen10_emit_isp_disable(struct brw_context *brw)
>  {
> -   const struct gen_device_info *devinfo = &brw->screen->devinfo;
> -
> -   brw_emit_pipe_control_write(brw,
> -                               PIPE_CONTROL_ISP_DIS |
> -                               PIPE_CONTROL_WRITE_IMMEDIATE,
> -                               brw->workaround_bo, 0, 0);
> +   brw_emit_pipe_control(brw,
> +                         PIPE_CONTROL_ISP_DIS |
> +                         PIPE_CONTROL_CS_STALL,
> +                         NULL, 0, 0);
>  
>     brw->vs.base.push_constants_dirty = true;
>     brw->tcs.base.push_constants_dirty = true;
> -- 
> 2.14.3
> 
> _______________________________________________
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Reply via email to