Module: Mesa
Branch: staging/20.1
Commit: 350dc8c67c36427ee1c42110c8d84b5cb2ccb18f
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=350dc8c67c36427ee1c42110c8d84b5cb2ccb18f
Author: Alyssa Rosenzweig <alyssa.rosenzw...@collabora.com>
Date: Thu Jul 16 14:07:09 2020 -0400
panfrost: Revert "Disable frame throttling"
This reverts commit 4fee7b30c0ecc56d7659ecad1d8b140ab253f0db, which was
intended to be a temporary workaround for a leak introduced in
a65e29ccb26 ("gallium: simplify throttle implementation"). However, that
leak was then fixed in 023282a4f667695ea1dbbe9fbe1cd3a9d550a426 and we
forgot to revert this hack.
Closes: #2108
Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzw...@collabora.com>
Cc: mesa-stable
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5858>
(cherry picked from commit 40b99bb79e19a413da5e2f9717b219336919367b)
---
.pick_status.json | 2 +-
src/gallium/drivers/panfrost/pan_screen.c | 3 ---
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/.pick_status.json b/.pick_status.json
index 5d762f7374a..a7a789370fe 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -355,7 +355,7 @@
"description": "panfrost: Revert \"Disable frame throttling\"",
"nominated": true,
"nomination_type": 0,
- "resolution": 0,
+ "resolution": 1,
"master_sha": null,
"because_sha": null
},
diff --git a/src/gallium/drivers/panfrost/pan_screen.c
b/src/gallium/drivers/panfrost/pan_screen.c
index 78b0fafaa64..8d3ed98413b 100644
--- a/src/gallium/drivers/panfrost/pan_screen.c
+++ b/src/gallium/drivers/panfrost/pan_screen.c
@@ -111,9 +111,6 @@ panfrost_get_param(struct pipe_screen *screen, enum
pipe_cap param)
case PIPE_CAP_MAX_RENDER_TARGETS:
return is_gles3 ? 4 : 1;
- /* Throttling frames breaks pipelining */
- case PIPE_CAP_THROTTLE:
- return 0;
case PIPE_CAP_OCCLUSION_QUERY:
return 1;
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
