[Intel-gfx] [PATCH 02/19] drm/i915/perf: Add OA formats for DG2

[Umesh Nerlige Ramappa]

On Tue, Sep 13, 2022 at 08:40:22AM -0700, Dixit, Ashutosh wrote:
>On Tue, 23 Aug 2022 13:41:38 -0700, Umesh Nerlige Ramappa wrote:
>>
>> Add new OA formats for DG2.
>
>Should we change the patch title and commit message a bit to 'Add OAR and
>OAG formats for DG2'?

Hmm, I assumed OAR was also part of TGL, but looks like it's not. I can 
change the title as suggested.

>
>> Some of the newer OA formats are not
>> multples of 64 bytes and are not powers of 2. For those formats, adjust
>> hw_tail accordingly when checking for new reports.
>>
>> Signed-off-by: Umesh Nerlige Ramappa <umesh.nerlige.ramampa at intel.com>
>> ---
>>  drivers/gpu/drm/i915/i915_perf.c | 63 ++++++++++++++++++++------------
>>  include/uapi/drm/i915_drm.h      |  6 +++
>>  2 files changed, 46 insertions(+), 23 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/i915_perf.c b/drivers/gpu/drm/i915/i915_perf.c
>> index 735244a3aedd..c8331b549d31 100644
>> --- a/drivers/gpu/drm/i915/i915_perf.c
>> +++ b/drivers/gpu/drm/i915/i915_perf.c
>> @@ -306,7 +306,8 @@ static u32 i915_oa_max_sample_rate = 100000;
>>
>>  /* XXX: beware if future OA HW adds new report formats that the current
>>   * code assumes all reports have a power-of-two size and ~(size - 1) can
>> - * be used as a mask to align the OA tail pointer.
>> + * be used as a mask to align the OA tail pointer. In some of the
>> + * formats, R is used to denote reserved field.
>>   */
>>  static const struct i915_oa_format oa_formats[I915_OA_FORMAT_MAX] = {
>>	[I915_OA_FORMAT_A13]	    = { 0, 64 },
>> @@ -320,6 +321,10 @@ static const struct i915_oa_format oa_formats[I915_OA_FORMAT_MAX] = {
>>	[I915_OA_FORMAT_A12]		    = { 0, 64 },
>>	[I915_OA_FORMAT_A12_B8_C8]	    = { 2, 128 },
>>	[I915_OA_FORMAT_A32u40_A4u32_B8_C8] = { 5, 256 },
>> +	[I915_OAR_FORMAT_A32u40_A4u32_B8_C8]    = { 5, 256 },
>> +	[I915_OA_FORMAT_A24u40_A14u32_B8_C8]    = { 5, 256 },
>> +	[I915_OAR_FORMAT_A36u64_B8_C8]		= { 1, 384 },
>> +	[I915_OA_FORMAT_A38u64_R2u64_B8_C8]	= { 1, 448 },
>
>Isn't the size for this last one 416 (or 400)? Bspec: 52198. Unless the
>size has to be a multiple of 64?

Format size is multiple of 64 bytes, so it is rounded up.

>
>Looks like Lionel's R-b is not showing up on Patchwork, might need to be
>manually added. For now this is:
>
>Acked-by: Ashutosh Dixit <ashutosh.dixit at intel.com>

Thanks,
Umesh