drm/i915/perf: ensure selftests select valid format
authorLionel Landwerlin <lionel.g.landwerlin@intel.com>
Tue, 29 Oct 2019 14:28:26 +0000 (16:28 +0200)
committerChris Wilson <chris@chris-wilson.co.uk>
Tue, 29 Oct 2019 18:58:07 +0000 (18:58 +0000)
Gen12 only support a single report format :
I915_OA_FORMAT_A32u40_A4u32_B8_C8

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Fixes: 00a7f0d7155c ("drm/i915/tgl: Add perf support on TGL")
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20191029142826.20014-1-lionel.g.landwerlin@intel.com
drivers/gpu/drm/i915/selftests/i915_perf.c

index dc6d689..aabd07f 100644 (file)
@@ -23,7 +23,8 @@ test_stream(struct i915_perf *perf)
                                                   I915_ENGINE_CLASS_RENDER,
                                                   0),
                .sample_flags = SAMPLE_OA_REPORT,
-               .oa_format = I915_OA_FORMAT_C4_B8,
+               .oa_format = IS_GEN(perf->i915, 12) ?
+               I915_OA_FORMAT_A32u40_A4u32_B8_C8 : I915_OA_FORMAT_C4_B8,
                .metrics_set = 1,
        };
        struct i915_perf_stream *stream;