summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSonny Jiang <sonny.jiang@amd.com>2023-04-03 11:58:29 -0400
committerDylan Baker <dylan.c.baker@intel.com>2023-04-05 11:35:51 -0700
commit82f1ec9d14d85ad93c0377134aa0fbfaaf6b39ab (patch)
tree056955f645bed4ee8875895d11352899c1f81cba
parentb9df35b553119bf62aa7d5593f78bd60c29c46b8 (diff)
downloadmesa-82f1ec9d14d85ad93c0377134aa0fbfaaf6b39ab.tar.gz
gallium/pipe: change PIPE_DEFAULT_DECODER_FEEDBACK_TIMEOUT_NS to 1 second
Fixes: 5e1bd07a ("radeonsi: vcn: implement the get_decoder_fence vfunc") The commit [5e1bd07a] puts a timeout on fence_wait which causes a 8k AV1 decoding regression on gfx940. By adding DECODER_FEEDBACK_TIMEOUT to add fence wait time. Signed-off-by: Sonny Jiang <sonny.jiang@amd.com> Reviewed-by: Boyuan Zhang <Boyuan.Zhang@amd.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22268> (cherry picked from commit 7360aa020cf43fe22408e467e038f25d0028aaec)
-rw-r--r--.pick_status.json2
-rw-r--r--src/gallium/include/pipe/p_video_state.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/.pick_status.json b/.pick_status.json
index 389dedcf190..4daf595558c 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -445,7 +445,7 @@
"description": "gallium/pipe: change PIPE_DEFAULT_DECODER_FEEDBACK_TIMEOUT_NS to 1 second",
"nominated": true,
"nomination_type": 1,
- "resolution": 0,
+ "resolution": 1,
"main_sha": null,
"because_sha": "5e1bd07ac5733c3e7e5484f23a65a89e03f62d2c"
},
diff --git a/src/gallium/include/pipe/p_video_state.h b/src/gallium/include/pipe/p_video_state.h
index f3fe3d97789..73ff3215647 100644
--- a/src/gallium/include/pipe/p_video_state.h
+++ b/src/gallium/include/pipe/p_video_state.h
@@ -44,7 +44,7 @@ extern "C" {
#define PIPE_DEFAULT_FRAME_RATE_DEN 1
#define PIPE_DEFAULT_FRAME_RATE_NUM 30
#define PIPE_H2645_EXTENDED_SAR 255
-#define PIPE_DEFAULT_DECODER_FEEDBACK_TIMEOUT_NS 100000000
+#define PIPE_DEFAULT_DECODER_FEEDBACK_TIMEOUT_NS 1000000000
/*
* see table 6-12 in the spec