diff --git a/src/mesa/drivers/dri/i965/brw_oa_cflgt2.xml b/src/mesa/drivers/dri/i965/brw_oa_cflgt2.xml
index 29f71d47d2f..f098a4488c9 100644
--- a/src/mesa/drivers/dri/i965/brw_oa_cflgt2.xml
+++ b/src/mesa/drivers/dri/i965/brw_oa_cflgt2.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<metrics version="1522878594" merge_md5="">
+<metrics version="1553958552" merge_md5="">
   <set name="Render Metrics Basic Gen9"
        mdapi_supported_apis="OGL OCL IO BB"
        underscore_name="render_basic"
@@ -10265,6 +10265,170 @@
     </register_config>
   </set>
 
+  <set name="Gpu Rings Busyness"
+       mdapi_supported_apis="OGL OCL MEDIA IO BB"
+       underscore_name="gpu_busyness"
+       hw_config_guid="e2f162ae-5732-4af0-8b11-69510f57094a"
+       chipset="CFLGT2"
+       symbol_name="GpuBusyness"
+       >
+    <counter name="GPU Core Clocks"
+             description="The total number of GPU core clocks elapsed during the measurement."
+             data_type="uint64"
+             equation="GPU_CLOCK 0 READ"
+             underscore_name="gpu_core_clocks"
+             units="cycles"
+             symbol_name="GpuCoreClocks"
+             semantic_type="event"
+             mdapi_supported_apis=""
+             mdapi_usage_flags="Tier1 Frame Batch Draw"
+             mdapi_hw_unit_type="gpu"
+             mdapi_group="GPU"
+             />
+    <counter name="Vebox Ring Busy"
+             description="The percentage of time when vebox command streamer was busy."
+             data_type="float"
+             max_equation="100"
+             equation="C 5 READ 100 UMUL $GpuCoreClocks FDIV"
+             underscore_name="vebox_busy"
+             units="percent"
+             symbol_name="VeboxBusy"
+             semantic_type="duration"
+             mdapi_supported_apis=""
+             mdapi_usage_flags="System Frame Batch"
+             mdapi_group="GPU"
+             mdapi_hw_unit_type="gpu"
+             />
+    <counter name="GPU Time Elapsed"
+             description="Time elapsed on the GPU during the measurement."
+             data_type="uint64"
+             equation="GPU_TIME 0 READ 1000000000 UMUL $GpuTimestampFrequency UDIV"
+             underscore_name="gpu_time"
+             units="ns"
+             symbol_name="GpuTime"
+             semantic_type="duration"
+             mdapi_supported_apis=""
+             mdapi_usage_flags="Tier1 Overview System Frame Batch Draw"
+             mdapi_hw_unit_type="gpu"
+             mdapi_group="GPU"
+             />
+    <counter name="AVG GPU Core Frequency"
+             description="Average GPU Core Frequency in the measurement."
+             data_type="uint64"
+             max_equation="$GpuMaxFrequency"
+             equation="$GpuCoreClocks 1000000000 UMUL $GpuTime UDIV"
+             underscore_name="avg_gpu_core_frequency"
+             units="hz"
+             symbol_name="AvgGpuCoreFrequency"
+             semantic_type="event"
+             mdapi_supported_apis=""
+             mdapi_usage_flags="Tier1 Overview System Frame Batch Draw"
+             mdapi_group="GPU"
+             mdapi_hw_unit_type="gpu"
+             />
+    <counter name="Render Ring Busy"
+             description="The percentage of time when render command streamer was busy."
+             data_type="float"
+             max_equation="100"
+             equation="C 7 READ 100 UMUL $GpuCoreClocks FDIV"
+             underscore_name="render_busy"
+             units="percent"
+             symbol_name="RenderBusy"
+             semantic_type="duration"
+             mdapi_supported_apis=""
+             mdapi_usage_flags="System Frame Batch"
+             mdapi_group="GPU"
+             mdapi_hw_unit_type="gpu"
+             />
+    <counter name="Vdbox0 Ring Busy"
+             description="The percentage of time when Vdbox0 command streamer was busy."
+             data_type="float"
+             max_equation="100"
+             equation="C 6 READ 100 UMUL $GpuCoreClocks FDIV"
+             underscore_name="vdbox0_busy"
+             units="percent"
+             symbol_name="Vdbox0Busy"
+             semantic_type="duration"
+             mdapi_supported_apis=""
+             mdapi_usage_flags="System Frame Batch"
+             mdapi_group="GPU"
+             mdapi_hw_unit_type="gpu"
+             />
+    <counter name="Blitter Ring Busy"
+             description="The percentage of time when blitter command streamer was busy."
+             data_type="float"
+             max_equation="100"
+             equation="C 4 READ 100 UMUL $GpuCoreClocks FDIV"
+             underscore_name="blitter_busy"
+             units="percent"
+             symbol_name="BlitterBusy"
+             semantic_type="duration"
+             mdapi_supported_apis=""
+             mdapi_usage_flags="System Frame Batch"
+             mdapi_group="GPU"
+             mdapi_hw_unit_type="gpu"
+             />
+    <counter name="AnyRingBusy"
+             description="The percentage of time when any command streamer was busy."
+             data_type="float"
+             max_equation="100"
+             equation="B 0 READ 100 UMUL $GpuCoreClocks FDIV"
+             underscore_name="any_ring_busy"
+             units="percent"
+             symbol_name="AnyRingBusy"
+             semantic_type="duration"
+             mdapi_supported_apis=""
+             mdapi_usage_flags="Frame Batch Draw"
+             mdapi_group="GPU"
+             mdapi_hw_unit_type="gpu"
+             />
+    <register_config type="NOA">
+        <register type="NOA" address="0x00009840" value="0x00000080" />
+        <register type="NOA" address="0x00009888" value="0x13805800" />
+        <register type="NOA" address="0x00009888" value="0x05962C00" />
+        <register type="NOA" address="0x00009888" value="0x19950016" />
+        <register type="NOA" address="0x00009888" value="0x19C05800" />
+        <register type="NOA" address="0x00009888" value="0x07800035" />
+        <register type="NOA" address="0x00009888" value="0x11800000" />
+        <register type="NOA" address="0x00009888" value="0x1D810400" />
+        <register type="NOA" address="0x00009888" value="0x07960025" />
+        <register type="NOA" address="0x00009888" value="0x21960000" />
+        <register type="NOA" address="0x00009888" value="0x0B964000" />
+        <register type="NOA" address="0x00009888" value="0x1B930062" />
+        <register type="NOA" address="0x00009888" value="0x17948000" />
+        <register type="NOA" address="0x00009888" value="0x1B940008" />
+        <register type="NOA" address="0x00009888" value="0x05950075" />
+        <register type="NOA" address="0x00009888" value="0x1D950000" />
+        <register type="NOA" address="0x00009888" value="0x07E54000" />
+        <register type="NOA" address="0x00009888" value="0x09924000" />
+        <register type="NOA" address="0x00009888" value="0x05982000" />
+        <register type="NOA" address="0x00009888" value="0x19908000" />
+        <register type="NOA" address="0x00009888" value="0x1B904000" />
+        <register type="NOA" address="0x00009888" value="0x1D908000" />
+        <register type="NOA" address="0x00009888" value="0x1F908000" />
+        <register type="NOA" address="0x00009888" value="0x09978000" />
+        <register type="NOA" address="0x00009888" value="0x05C08500" />
+        <register type="NOA" address="0x00009888" value="0x25C00000" />
+        <register type="NOA" address="0x00009888" value="0x1BC00000" />
+        <register type="NOA" address="0x00009888" value="0x0BC54000" />
+        <register type="NOA" address="0x00009888" value="0x11900000" />
+        <register type="NOA" address="0x00009888" value="0x37900000" />
+        <register type="NOA" address="0x00009888" value="0x53900000" />
+        <register type="NOA" address="0x00009888" value="0x43900C60" />
+        <register type="NOA" address="0x00009888" value="0x45900040" />
+        <register type="NOA" address="0x00009888" value="0x33900000" />
+    </register_config>
+    <register_config type="OA">
+        <register type="OA" address="0x00002740" value="0x00000000" />
+        <register type="OA" address="0x00002710" value="0x00000000" />
+        <register type="OA" address="0x00002714" value="0x10800000" />
+        <register type="OA" address="0x00002720" value="0x00000000" />
+        <register type="OA" address="0x00002724" value="0x00800000" />
+        <register type="OA" address="0x00002770" value="0x00078000" />
+        <register type="OA" address="0x00002774" value="0x00000FFF" />
+    </register_config>
+  </set>
+
   <set name="MDAPI testing set Gen9.5"
        mdapi_supported_apis="OGL OCL IO BB"
        underscore_name="test_oa"