diff mbox series

drm/i915/perf: ensure selftests select valid format

Message ID 20191029142826.20014-1-lionel.g.landwerlin@intel.com (mailing list archive)
State New, archived
Headers show
Series drm/i915/perf: ensure selftests select valid format | expand

Commit Message

Lionel Landwerlin Oct. 29, 2019, 2:28 p.m. UTC
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")
---
 drivers/gpu/drm/i915/selftests/i915_perf.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Chris Wilson Oct. 29, 2019, 3:41 p.m. UTC | #1
Quoting Lionel Landwerlin (2019-10-29 14:28:26)
> 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")
> ---
>  drivers/gpu/drm/i915/selftests/i915_perf.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/selftests/i915_perf.c b/drivers/gpu/drm/i915/selftests/i915_perf.c
> index dc6d689e4251..aabd07f67e49 100644
> --- a/drivers/gpu/drm/i915/selftests/i915_perf.c
> +++ b/drivers/gpu/drm/i915/selftests/i915_perf.c
> @@ -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,

Matches gen12_oa_formats[], must be good :)
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
-Chris
diff mbox series

Patch

diff --git a/drivers/gpu/drm/i915/selftests/i915_perf.c b/drivers/gpu/drm/i915/selftests/i915_perf.c
index dc6d689e4251..aabd07f67e49 100644
--- a/drivers/gpu/drm/i915/selftests/i915_perf.c
+++ b/drivers/gpu/drm/i915/selftests/i915_perf.c
@@ -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;