[PATCH 4/7] drm/xe: add function to convert xe hw engine class to user class

[Riana Tauro]

Hi Umesh

Thank you for the review comments

On 11/14/2024 9:44 PM, Umesh Nerlige Ramappa wrote:
> On Wed, Nov 13, 2024 at 10:25:46AM +0530, Riana Tauro wrote:
>> add a function to convert xe hw engine class to
>> user engine class
>>
>> Signed-off-by: Riana Tauro <riana.tauro at intel.com>
>> ---
>> drivers/gpu/drm/xe/xe_hw_engine.c | 25 +++++++++++++++++++++++++
>> drivers/gpu/drm/xe/xe_hw_engine.h |  1 +
>> drivers/gpu/drm/xe/xe_query.c     | 12 ++----------
>> 3 files changed, 28 insertions(+), 10 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/xe/xe_hw_engine.c b/drivers/gpu/drm/xe/ 
>> xe_hw_engine.c
>> index 1557acee3523..ba40f2692f34 100644
>> --- a/drivers/gpu/drm/xe/xe_hw_engine.c
>> +++ b/drivers/gpu/drm/xe/xe_hw_engine.c
>> @@ -981,6 +981,31 @@ const char *xe_hw_engine_class_to_str(enum 
>> xe_engine_class class)
>>     return NULL;
>> }
>>
>> +/**
>> + * xe_hw_engine_to_user_class - converts xe hw engine to user engine 
>> class
>> + * @engine_class: hw engine class
>> + *
>> + * Returns: user engine class on success, -1 on error
>> + */
>> +u16 xe_hw_engine_to_user_class(enum xe_engine_class engine_class)
>> +{
>> +    switch (engine_class) {
>> +    case XE_ENGINE_CLASS_RENDER:
>> +        return DRM_XE_ENGINE_CLASS_RENDER;
>> +    case XE_ENGINE_CLASS_COPY:
>> +        return DRM_XE_ENGINE_CLASS_COPY;
>> +    case XE_ENGINE_CLASS_VIDEO_DECODE:
>> +        return DRM_XE_ENGINE_CLASS_VIDEO_DECODE;
>> +    case XE_ENGINE_CLASS_VIDEO_ENHANCE:
>> +        return DRM_XE_ENGINE_CLASS_VIDEO_ENHANCE;
>> +    case XE_ENGINE_CLASS_COMPUTE:
>> +        return DRM_XE_ENGINE_CLASS_COMPUTE;
>> +    default:
>> +        XE_WARN_ON(engine_class);
>> +        return -1;
> 
> This can be something like:
> 
> const u16 xe_to_user_engine_class[] = {
>      [XE_ENGINE_CLASS_RENDER] = DRM_XE_ENGINE_CLASS_RENDER,
>      [XE_ENGINE_CLASS_COPY] = DRM_XE_ENGINE_CLASS_COPY,
>      [XE_ENGINE_CLASS_VIDEO_DECODE] = DRM_XE_ENGINE_CLASS_VIDEO_DECODE,
>      [XE_ENGINE_CLASS_VIDEO_ENHANCE] = DRM_XE_ENGINE_CLASS_VIDEO_ENHANCE,
>      [XE_ENGINE_CLASS_COMPUTE] = DRM_XE_ENGINE_CLASS_COMPUTE,
> 
> WARN_ON(engine_class >= ARRAY_SIZE(xe_to_user_engine_class));
> 
> return xe_to_user_engine_class[engine_class];
> };
> 
Okay. will add this.

Thanks,
Riana
> Regards,
> Umesh
> 
>> +    }
>> +}
>> +
>> u64 xe_hw_engine_read_timestamp(struct xe_hw_engine *hwe)
>> {
>>     return xe_mmio_read64_2x32(&hwe->gt->mmio, RING_TIMESTAMP(hwe- 
>> >mmio_base));
>> diff --git a/drivers/gpu/drm/xe/xe_hw_engine.h b/drivers/gpu/drm/xe/ 
>> xe_hw_engine.h
>> index da0a6922a26f..3aca7751a482 100644
>> --- a/drivers/gpu/drm/xe/xe_hw_engine.h
>> +++ b/drivers/gpu/drm/xe/xe_hw_engine.h
>> @@ -74,6 +74,7 @@ static inline bool xe_hw_engine_is_valid(struct 
>> xe_hw_engine *hwe)
>>
>> const char *xe_hw_engine_class_to_str(enum xe_engine_class class);
>> u64 xe_hw_engine_read_timestamp(struct xe_hw_engine *hwe);
>> +u16 xe_hw_engine_to_user_class(enum xe_engine_class engine_class);
>> enum xe_force_wake_domains xe_hw_engine_to_fw_domain(struct 
>> xe_hw_engine *hwe);
>>
>> void xe_hw_engine_mmio_write32(struct xe_hw_engine *hwe, struct xe_reg 
>> reg, u32 val);
>> diff --git a/drivers/gpu/drm/xe/xe_query.c b/drivers/gpu/drm/xe/ 
>> xe_query.c
>> index 170ae72d1a7b..98b036678eee 100644
>> --- a/drivers/gpu/drm/xe/xe_query.c
>> +++ b/drivers/gpu/drm/xe/xe_query.c
>> @@ -26,14 +26,6 @@
>> #include "xe_ttm_vram_mgr.h"
>> #include "xe_wa.h"
>>
>> -static const u16 xe_to_user_engine_class[] = {
>> -    [XE_ENGINE_CLASS_RENDER] = DRM_XE_ENGINE_CLASS_RENDER,
>> -    [XE_ENGINE_CLASS_COPY] = DRM_XE_ENGINE_CLASS_COPY,
>> -    [XE_ENGINE_CLASS_VIDEO_DECODE] = DRM_XE_ENGINE_CLASS_VIDEO_DECODE,
>> -    [XE_ENGINE_CLASS_VIDEO_ENHANCE] = DRM_XE_ENGINE_CLASS_VIDEO_ENHANCE,
>> -    [XE_ENGINE_CLASS_COMPUTE] = DRM_XE_ENGINE_CLASS_COMPUTE,
>> -};
>> -
>> static const enum xe_engine_class user_to_xe_engine_class[] = {
>>     [DRM_XE_ENGINE_CLASS_RENDER] = XE_ENGINE_CLASS_RENDER,
>>     [DRM_XE_ENGINE_CLASS_COPY] = XE_ENGINE_CLASS_COPY,
>> @@ -206,7 +198,7 @@ static int query_engines(struct xe_device *xe,
>>                 continue;
>>
>>             engines->engines[i].instance.engine_class =
>> -                xe_to_user_engine_class[hwe->class];
>> +                xe_hw_engine_to_user_class(hwe->class);
>>             engines->engines[i].instance.engine_instance =
>>                 hwe->logical_instance;
>>             engines->engines[i].instance.gt_id = gt->info.id;
>> @@ -677,7 +669,7 @@ static int query_oa_units(struct xe_device *xe,
>>                 if (!xe_hw_engine_is_reserved(hwe) &&
>>                     xe_oa_unit_id(hwe) == u->oa_unit_id) {
>>                     du->eci[j].engine_class =
>> -                        xe_to_user_engine_class[hwe->class];
>> +                        xe_hw_engine_to_user_class(hwe->class);
>>                     du->eci[j].engine_instance = hwe->logical_instance;
>>                     du->eci[j].gt_id = gt->info.id;
>>                     j++;
>> -- 
>> 2.40.0
>>