drm: Branch 'master' - 2 commits

 freedreno/freedreno_drmif.h |    1 +
 freedreno/kgsl/kgsl_pipe.c  |    1 +
 freedreno/msm/msm_drm.h     |    1 +
 freedreno/msm/msm_pipe.c    |    2 ++
 4 files changed, 5 insertions(+)

New commits:
commit 49041c3613dde0b11bf6096b3da498915303abed
Author: Rob Clark <[email protected]>
Date:   Tue Feb 23 11:47:33 2016 -0500

    freedreno: add support for FD_TIMESTAMP
    
    Signed-off-by: Rob Clark <[email protected]>

diff --git a/freedreno/freedreno_drmif.h b/freedreno/freedreno_drmif.h
index 950fd63..02dcfd2 100644
--- a/freedreno/freedreno_drmif.h
+++ b/freedreno/freedreno_drmif.h
@@ -51,6 +51,7 @@ enum fd_param_id {
 	FD_GPU_ID,
 	FD_CHIP_ID,
 	FD_MAX_FREQ,
+	FD_TIMESTAMP,
 };
 
 /* bo flags: */
diff --git a/freedreno/kgsl/kgsl_pipe.c b/freedreno/kgsl/kgsl_pipe.c
index 5569da0..3546718 100644
--- a/freedreno/kgsl/kgsl_pipe.c
+++ b/freedreno/kgsl/kgsl_pipe.c
@@ -51,6 +51,7 @@ static int kgsl_pipe_get_param(struct fd_pipe *pipe,
 		*value = kgsl_pipe->devinfo.chip_id;
 		return 0;
 	case FD_MAX_FREQ:
+	case FD_TIMESTAMP:
 		/* unsupported on kgsl */
 		return -1;
 	default:
diff --git a/freedreno/msm/msm_pipe.c b/freedreno/msm/msm_pipe.c
index f539b9a..f872e24 100644
--- a/freedreno/msm/msm_pipe.c
+++ b/freedreno/msm/msm_pipe.c
@@ -69,6 +69,8 @@ static int msm_pipe_get_param(struct fd_pipe *pipe,
 		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;
commit 67e7103cdb498d2acfb880ea01ad151d4039feda
Author: Rob Clark <[email protected]>
Date:   Tue Feb 23 11:39:53 2016 -0500

    freedreno: update uapi
    
    In drm-next.. needed for timestamp queries in mesa.
    
    Signed-off-by: Rob Clark <[email protected]>

diff --git a/freedreno/msm/msm_drm.h b/freedreno/msm/msm_drm.h
index baf505c..6a2a265 100644
--- a/freedreno/msm/msm_drm.h
+++ b/freedreno/msm/msm_drm.h
@@ -59,6 +59,7 @@ struct drm_msm_timespec {
 #define MSM_PARAM_GMEM_SIZE  0x02
 #define MSM_PARAM_CHIP_ID    0x03
 #define MSM_PARAM_MAX_FREQ   0x04
+#define MSM_PARAM_TIMESTAMP  0x05
 
 struct drm_msm_param {
 	uint32_t pipe;           /* in, MSM_PIPE_x */

------------------------------------------------------------------------------
Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785111&iu=/4140
--