1 files changed, 7 insertions, 17 deletions
diff --git a/src/intel/ds/intel_pps_perf.h b/src/intel/ds/intel_pps_perf.h
index 14f4a343d3c..2db622ae466 100644
--- a/src/intel/ds/intel_pps_perf.h
+++ b/src/intel/ds/intel_pps_perf.h
@@ -11,32 +11,21 @@
 #include <string>
 #include <vector>
 
-#include <intel/dev/intel_device_info.h>
-#include <intel/perf/intel_perf.h>
-#include <intel/perf/intel_perf_query.h>
+#include "dev/intel_device_info.h"
+#include "perf/intel_perf.h"
+#include "perf/intel_perf_query.h"
 
 namespace pps
 {
-int perf_ioctl(int fd, unsigned long request, void *arg);
-
 class IntelPerf
 {
    public:
    IntelPerf(int drm_fd);
-
-   IntelPerf(const IntelPerf &) = delete;
-   IntelPerf &operator=(const IntelPerf &) = delete;
-
-   IntelPerf(IntelPerf &&);
-   IntelPerf &operator=(IntelPerf &&) noexcept;
-
    ~IntelPerf();
 
-   std::optional<struct intel_perf_query_info> find_query_by_name(const std::string &name) const;
-
    std::vector<struct intel_perf_query_info*> get_queries() const;
 
-   bool open(uint64_t sampling_period_ns);
+   bool open(uint64_t sampling_period_ns, struct intel_perf_query_info *query);
    void close();
 
    bool oa_stream_ready() const;
@@ -50,9 +39,10 @@ class IntelPerf
    struct intel_perf_context *ctx = nullptr;
    struct intel_perf_config *cfg = nullptr;
 
-   struct intel_device_info devinfo = {};
+   // Accumulations are stored here
+   struct intel_perf_query_result result = {};
 
-   std::optional<struct intel_perf_query_info> query = std::nullopt;
+   struct intel_device_info devinfo = {};
 };
 
 } // namespace pps