i915/perf: Add additional OA formats for gen12

Gen12 supports additional OA formats as compared to what was added
earlier. Include the additional OA formats.

Signed-off-by: Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210208174029.45621-3-umesh.nerlige.ramappa@intel.com

diff --git a/drivers/gpu/drm/i915/i915_perf.c b/drivers/gpu/drm/i915/i915_perf.c
index adf7c2b..e08c0db 100644 (file)
--- a/drivers/gpu/drm/i915/i915_perf.c
+++ b/drivers/gpu/drm/i915/i915_perf.c
@@ -4292,17 +4292,14 @@ static void oa_init_supported_formats(struct i915_perf *perf)
        case INTEL_ICELAKE:
        case INTEL_ELKHARTLAKE:
        case INTEL_JASPERLAKE:
-               oa_format_add(perf, I915_OA_FORMAT_A12);
-               oa_format_add(perf, I915_OA_FORMAT_A12_B8_C8);
-               oa_format_add(perf, I915_OA_FORMAT_A32u40_A4u32_B8_C8);
-               oa_format_add(perf, I915_OA_FORMAT_C4_B8);
-               break;
-
        case INTEL_TIGERLAKE:
        case INTEL_ROCKETLAKE:
        case INTEL_DG1:
        case INTEL_ALDERLAKE_S:
+               oa_format_add(perf, I915_OA_FORMAT_A12);
+               oa_format_add(perf, I915_OA_FORMAT_A12_B8_C8);
                oa_format_add(perf, I915_OA_FORMAT_A32u40_A4u32_B8_C8);
+               oa_format_add(perf, I915_OA_FORMAT_C4_B8);
                break;
 
        default: