2019-09-19 14:43:19 +00:00
|
|
|
From 49281ec9b6f3c7bda94c798133dd35d50eb69649 Mon Sep 17 00:00:00 2001
|
2019-07-09 18:32:28 +00:00
|
|
|
From: Eric Anholt <eric@anholt.net>
|
|
|
|
|
Date: Fri, 30 Nov 2018 16:57:59 -0800
|
2019-09-19 14:43:19 +00:00
|
|
|
Subject: [PATCH 565/806] drm/v3d: Add missing fence timeline name for TFU.
|
2019-07-09 18:32:28 +00:00
|
|
|
|
|
|
|
|
We shouldn't be returning v3d-render for our new queue.
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Eric Anholt <eric@anholt.net>
|
|
|
|
|
Fixes: 83d5139982db ("drm/v3d: Add support for submitting jobs to the TFU.")
|
|
|
|
|
Link: https://patchwork.freedesktop.org/patch/msgid/20181201005759.28093-6-eric@anholt.net
|
|
|
|
|
Reviewed-by: Dave Emett <david.emett@broadcom.com>
|
|
|
|
|
(cherry picked from commit db176f6ba1da39ad0016c77b9775a6bb3d0ce88a)
|
|
|
|
|
---
|
|
|
|
|
drivers/gpu/drm/v3d/v3d_fence.c | 10 ++++++++--
|
|
|
|
|
1 file changed, 8 insertions(+), 2 deletions(-)
|
|
|
|
|
|
|
|
|
|
--- a/drivers/gpu/drm/v3d/v3d_fence.c
|
|
|
|
|
+++ b/drivers/gpu/drm/v3d/v3d_fence.c
|
|
|
|
|
@@ -29,10 +29,16 @@ static const char *v3d_fence_get_timelin
|
|
|
|
|
{
|
|
|
|
|
struct v3d_fence *f = to_v3d_fence(fence);
|
|
|
|
|
|
|
|
|
|
- if (f->queue == V3D_BIN)
|
|
|
|
|
+ switch (f->queue) {
|
|
|
|
|
+ case V3D_BIN:
|
|
|
|
|
return "v3d-bin";
|
|
|
|
|
- else
|
|
|
|
|
+ case V3D_RENDER:
|
|
|
|
|
return "v3d-render";
|
|
|
|
|
+ case V3D_TFU:
|
|
|
|
|
+ return "v3d-tfu";
|
|
|
|
|
+ default:
|
|
|
|
|
+ return NULL;
|
|
|
|
|
+ }
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const struct dma_fence_ops v3d_fence_ops = {
|
