Mesa (master): freedreno/drm: don't pass thru 'DUMP' flag on older kernels

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 106c2a65dbd6b523a1a68f8b0e913294edc7bbd6
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=106c2a65dbd6b523a1a68f8b0e913294edc7bbd6

Author: Rob Clark <robdclark at chromium.org>
Date:   Sun May 17 13:01:30 2020 -0700

freedreno/drm: don't pass thru 'DUMP' flag on older kernels

"softpin" mode was introduced in the same kernel as the 'DUMP' flag.  So
if we are using the legacy non-softpin path, clear the dump flag.  OTOH
the 'DUMP' flag isn't quite so needed on older kernels, since we would
get all cmdstream, even SDS stateobjs, dumped regardless, as they would
have cmd table entries.

Fixes: b2c23b1e48f ("freedreno: Mark all ringbuffer BOs as to be dumped on crash.")
Signed-off-by: Rob Clark <robdclark at chromium.org>
Tested-by: Ilia Mirkin <imirkin at alum.mit.edu>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5081>

---

 src/freedreno/drm/msm_ringbuffer.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/freedreno/drm/msm_ringbuffer.c b/src/freedreno/drm/msm_ringbuffer.c
index 2ff4a3dfc56..0538859201a 100644
--- a/src/freedreno/drm/msm_ringbuffer.c
+++ b/src/freedreno/drm/msm_ringbuffer.c
@@ -153,7 +153,8 @@ append_bo(struct msm_submit *submit, struct fd_bo *bo)
 			idx = APPEND(submit, submit_bos);
 			idx = APPEND(submit, bos);
 
-			submit->submit_bos[idx].flags = bo->flags;
+			submit->submit_bos[idx].flags = bo->flags &
+					(MSM_SUBMIT_BO_READ | MSM_SUBMIT_BO_WRITE);
 			submit->submit_bos[idx].handle = bo->handle;
 			submit->submit_bos[idx].presumed = 0;