diff --git a/src/intel/perf/intel_perf.h b/src/intel/perf/intel_perf.h
index b761b6a452e..625b03104e6 100644
--- a/src/intel/perf/intel_perf.h
+++ b/src/intel/perf/intel_perf.h
@@ -131,8 +131,12 @@ struct intel_pipeline_stat {
 #define STATS_BO_END_OFFSET_BYTES   (STATS_BO_SIZE / 2)
 #define MAX_STAT_COUNTERS           (STATS_BO_END_OFFSET_BYTES / 8)
 
-#define I915_PERF_OA_SAMPLE_SIZE (8 +   /* drm_i915_perf_record_header */ \
-                                  256)  /* OA counter report */
+/* Up to now all platforms uses the same sample size */
+#define INTEL_PERF_OA_SAMPLE_SIZE 256
+
+/* header + sample */
+#define INTEL_PERF_OA_HEADER_SAMPLE_SIZE (sizeof(struct intel_perf_record_header) + \
+                                          INTEL_PERF_OA_SAMPLE_SIZE)
 
 struct intel_perf_query_result {
    /**
diff --git a/src/intel/perf/intel_perf_query.c b/src/intel/perf/intel_perf_query.c
index f223d31c3aa..be7fa7d6802 100644
--- a/src/intel/perf/intel_perf_query.c
+++ b/src/intel/perf/intel_perf_query.c
@@ -165,7 +165,7 @@ struct oa_sample_buf {
    struct exec_node link;
    int refcount;
    int len;
-   uint8_t buf[I915_PERF_OA_SAMPLE_SIZE * 10];
+   uint8_t buf[INTEL_PERF_OA_HEADER_SAMPLE_SIZE * 10];
    uint32_t last_timestamp;
 };