From: Marek Olšák <marek.olsak@amd.com>
Date: Fri, 26 Jan 2018 02:48:37 +0000 (+0100)
Subject: winsys/amdgpu: fix assertion failure with UVD and VCE rings
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=17423c993d0b083c7a77a404b85788687f5efe36;p=mesa.git

winsys/amdgpu: fix assertion failure with UVD and VCE rings

Cc: 18.0 <mesa-stable@lists.freedesktop.org>
---

diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c b/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c
index 0c778534606..66ba23d2319 100644
--- a/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c
+++ b/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c
@@ -670,11 +670,10 @@ static bool amdgpu_ib_new_buffer(struct amdgpu_winsys *ws, struct amdgpu_ib *ib,
                                ws->info.gart_page_size,
                                RADEON_DOMAIN_GTT,
                                RADEON_FLAG_NO_INTERPROCESS_SHARING |
-                               RADEON_FLAG_READ_ONLY |
                                (ring_type == RING_GFX ||
                                 ring_type == RING_COMPUTE ||
                                 ring_type == RING_DMA ?
-                                   RADEON_FLAG_GTT_WC : 0));
+                                   RADEON_FLAG_READ_ONLY | RADEON_FLAG_GTT_WC : 0));
    if (!pb)
       return false;