Module: Mesa Branch: master Commit: 9de6a601ce61fd3466aed0054b1759fa3fcdf162 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9de6a601ce61fd3466aed0054b1759fa3fcdf162
Author: Rob Clark <[email protected]> Date: Sun Nov 22 09:07:02 2020 -0800 freedreno/drm: Quiet timedout error msg This isn't terribly interesting, but got more chatty when we converted to mesa_loge() vs debug_printf() Fixes: 156d7e45f74 ("freedreno: Convert to mesa_log*()") Signed-off-by: Rob Clark <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7717> --- src/freedreno/drm/msm_pipe.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/freedreno/drm/msm_pipe.c b/src/freedreno/drm/msm_pipe.c index 2eef493b5d4..ff9b6a3f2cc 100644 --- a/src/freedreno/drm/msm_pipe.c +++ b/src/freedreno/drm/msm_pipe.c @@ -117,12 +117,11 @@ static int msm_pipe_wait(struct fd_pipe *pipe, uint32_t timestamp, get_abs_timeout(&req.timeout, timeout); ret = drmCommandWrite(dev->fd, DRM_MSM_WAIT_FENCE, &req, sizeof(req)); - if (ret) { + if (ret && (ret != -ETIMEDOUT)) { ERROR_MSG("wait-fence failed! %d (%s)", ret, strerror(errno)); - return ret; } - return 0; + return ret; } static int open_submitqueue(struct fd_pipe *pipe, uint32_t prio) _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
