freedreno: add support for FD_TIMESTAMP

[platform/upstream/libdrm.git] / freedreno / msm / msm_pipe.c

diff --git a/freedreno/msm/msm_pipe.c b/freedreno/msm/msm_pipe.c
index ece4de5..f872e24 100644 (file)
--- a/freedreno/msm/msm_pipe.c
+++ b/freedreno/msm/msm_pipe.c
@@ -26,8 +26,31 @@
  *    Rob Clark <robclark@freedesktop.org>
  */
 
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include "msm_priv.h"
 
+static int query_param(struct fd_pipe *pipe, uint32_t param,
+               uint64_t *value)
+{
+       struct msm_pipe *msm_pipe = to_msm_pipe(pipe);
+       struct drm_msm_param req = {
+                       .pipe = msm_pipe->pipe,
+                       .param = param,
+       };
+       int ret;
+
+       ret = drmCommandWriteRead(pipe->dev->fd, DRM_MSM_GET_PARAM,
+                       &req, sizeof(req));
+       if (ret)
+               return ret;
+
+       *value = req.value;
+
+       return 0;
+}
 
 static int msm_pipe_get_param(struct fd_pipe *pipe,
                enum fd_param_id param, uint64_t *value)
@@ -41,13 +64,21 @@ static int msm_pipe_get_param(struct fd_pipe *pipe,
        case FD_GMEM_SIZE:
                *value = msm_pipe->gmem;
                return 0;
+       case FD_CHIP_ID:
+               *value = msm_pipe->chip_id;
+               return 0;
+       case FD_MAX_FREQ:
+               return query_param(pipe, MSM_PARAM_MAX_FREQ, value);
+       case FD_TIMESTAMP:
+               return query_param(pipe, MSM_PARAM_TIMESTAMP, value);
        default:
                ERROR_MSG("invalid param id: %d", param);
                return -1;
        }
 }
 
-static int msm_pipe_wait(struct fd_pipe *pipe, uint32_t timestamp)
+static int msm_pipe_wait(struct fd_pipe *pipe, uint32_t timestamp,
+               uint64_t timeout)
 {
        struct fd_device *dev = pipe->dev;
        struct drm_msm_wait_fence req = {
@@ -55,7 +86,7 @@ static int msm_pipe_wait(struct fd_pipe *pipe, uint32_t timestamp)
        };
        int ret;
 
-       get_abs_timeout(&req.timeout, 5000);
+       get_abs_timeout(&req.timeout, timeout);
 
        ret = drmCommandWrite(dev->fd, DRM_MSM_WAIT_FENCE, &req, sizeof(req));
        if (ret) {
@@ -72,31 +103,26 @@ static void msm_pipe_destroy(struct fd_pipe *pipe)
        free(msm_pipe);
 }
 
-static struct fd_pipe_funcs funcs = {
+static const struct fd_pipe_funcs funcs = {
                .ringbuffer_new = msm_ringbuffer_new,
                .get_param = msm_pipe_get_param,
                .wait = msm_pipe_wait,
                .destroy = msm_pipe_destroy,
 };
 
-static uint64_t get_param(struct fd_device *dev, uint32_t pipe, uint32_t param)
+static uint64_t get_param(struct fd_pipe *pipe, uint32_t param)
 {
-       struct drm_msm_param req = {
-                       .pipe = pipe,
-                       .param = param,
-       };
-       int ret;
-
-       ret = drmCommandWriteRead(dev->fd, DRM_MSM_GET_PARAM, &req, sizeof(req));
+       uint64_t value;
+       int ret = query_param(pipe, param, &value);
        if (ret) {
                ERROR_MSG("get-param failed! %d (%s)", ret, strerror(errno));
                return 0;
        }
-
-       return req.value;
+       return value;
 }
 
-struct fd_pipe * msm_pipe_new(struct fd_device *dev, enum fd_pipe_id id)
+drm_private struct fd_pipe * msm_pipe_new(struct fd_device *dev,
+               enum fd_pipe_id id)
 {
        static const uint32_t pipe_id[] = {
                        [FD_PIPE_3D] = MSM_PIPE_3D0,
@@ -114,15 +140,21 @@ struct fd_pipe * msm_pipe_new(struct fd_device *dev, enum fd_pipe_id id)
        pipe = &msm_pipe->base;
        pipe->funcs = &funcs;
 
+       /* initialize before get_param(): */
+       pipe->dev = dev;
        msm_pipe->pipe = pipe_id[id];
-       msm_pipe->gpu_id = get_param(dev, pipe_id[id], MSM_PARAM_GPU_ID);
-       msm_pipe->gmem   = get_param(dev, pipe_id[id], MSM_PARAM_GMEM_SIZE);
+
+       /* these params should be supported since the first version of drm/msm: */
+       msm_pipe->gpu_id = get_param(pipe, MSM_PARAM_GPU_ID);
+       msm_pipe->gmem   = get_param(pipe, MSM_PARAM_GMEM_SIZE);
+       msm_pipe->chip_id = get_param(pipe, MSM_PARAM_CHIP_ID);
 
        if (! msm_pipe->gpu_id)
                goto fail;
 
        INFO_MSG("Pipe Info:");
        INFO_MSG(" GPU-id:          %d", msm_pipe->gpu_id);
+       INFO_MSG(" Chip-id:         0x%08x", msm_pipe->chip_id);
        INFO_MSG(" GMEM size:       0x%08x", msm_pipe->gmem);
 
        return pipe;