Re: [igt-dev] [i-g-t, V2, 13/40] lib/igt_draw: Add gpu draw routine support for XE

["Modem, Bhanuprakash" <bhanuprakash.modem@intel.com>]

Hi Nidhi,

On Wed-26-04-2023 08:00 am, Gupta, Nidhi1 wrote:
> 
> 
> On 4/25/2023 12:19 PM, Bhanuprakash Modem wrote:
>> Add GPU blt, render & WC draw routine support for XE driver.
>>
>> Credits-to: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
>> Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem@intel.com>
>> ---
>>   lib/igt_draw.c | 82 +++++++++++++++++++++++++++++++++++---------------
>>   lib/igt_draw.h |  2 ++
>>   2 files changed, 60 insertions(+), 24 deletions(-)
>>
>> diff --git a/lib/igt_draw.c b/lib/igt_draw.c
>> index ac512fac5..1b793c0df 100644
>> --- a/lib/igt_draw.c
>> +++ b/lib/igt_draw.c
>> @@ -37,6 +37,8 @@
>>   #include "i915/gem_create.h"
>>   #include "i915/gem_mman.h"
>>   #include "i915/intel_mocs.h"
>> +#include "xe/xe_ioctl.h"
>> +#include "xe/xe_query.h"
>>   #ifndef PAGE_ALIGN
>>   #ifndef PAGE_SIZE
>> @@ -493,24 +495,29 @@ static void draw_rect_mmap_wc(int fd, struct 
>> buf_data *buf, struct rect *rect,
>>   {
>>       uint32_t *ptr;
>> -    gem_set_domain(fd, buf->handle, I915_GEM_DOMAIN_GTT,
>> -               I915_GEM_DOMAIN_GTT);
>> -
>> -    /* We didn't implement suport for the older tiling methods yet. */
>> -    if (tiling != I915_TILING_NONE)
>> -        igt_require(intel_display_ver(intel_get_drm_devid(fd)) >= 5);
>> -
>> -    if (gem_has_lmem(fd))
>> -        ptr = gem_mmap_offset__fixed(fd, buf->handle, 0,
>> -                         PAGE_ALIGN(buf->size),
>> -                         PROT_READ | PROT_WRITE);
>> -    else if (gem_has_legacy_mmap(fd))
>> -        ptr = gem_mmap__wc(fd, buf->handle, 0, PAGE_ALIGN(buf->size),
>> -                   PROT_READ | PROT_WRITE);
>> -    else
> Can we add check for xe driver also? "if (is_xe_device(first_fd))"
> 
>> -        ptr = gem_mmap_offset__wc(fd, buf->handle, 0,
>> -                      PAGE_ALIGN(buf->size),
>> -                      PROT_READ | PROT_WRITE); > +    if 
>> (is_i915_device(fd)) {
>> +        gem_set_domain(fd, buf->handle, I915_GEM_DOMAIN_GTT,
>> +                   I915_GEM_DOMAIN_GTT);
>> +
>> +        /* We didn't implement suport for the older tiling methods 
>> yet. */
>> +        if (tiling != I915_TILING_NONE)
>> +            igt_require(intel_display_ver(intel_get_drm_devid(fd)) >= 
>> 5);
>> +
>> +        if (gem_has_lmem(fd))
>> +            ptr = gem_mmap_offset__fixed(fd, buf->handle, 0,
>> +                             PAGE_ALIGN(buf->size),
>> +                             PROT_READ | PROT_WRITE);
>> +        else if (gem_has_legacy_mmap(fd))
>> +            ptr = gem_mmap__wc(fd, buf->handle, 0, 
>> PAGE_ALIGN(buf->size),
>> +                       PROT_READ | PROT_WRITE);
>> +        else
>> +            ptr = gem_mmap_offset__wc(fd, buf->handle, 0,
>> +                          PAGE_ALIGN(buf->size),
>> +                          PROT_READ | PROT_WRITE);
>> +    } else {
> Can we add check for xe driver also? "if (is_xe_device(first_fd))"

As this library is intel specific, no need to check for each driver.

if (i915) {} else {} is enough.

- Bhanu

>> +        ptr = xe_bo_mmap_ext(fd, buf->handle, buf->size,
>> +                     PROT_READ | PROT_WRITE);
>> +    }
>>       switch (tiling) {
>>       case I915_TILING_NONE:
>> @@ -663,11 +670,14 @@ static void draw_rect_blt(int fd, struct 
>> cmd_data *cmd_data,
>>       int gen = intel_gen(devid);
>>       int pitch;
>> +    if (tiling)
>> +        igt_require_i915(fd);
>> +
>>       dst = create_buf(fd, cmd_data->bops, buf, tiling);
>>       ibb = intel_bb_create(fd, PAGE_SIZE);
>>       intel_bb_add_intel_buf(ibb, dst, true);
>> -    if (HAS_4TILE(intel_get_drm_devid(fd))) {
>> +    if (is_i915_device(fd) && HAS_4TILE(intel_get_drm_devid(fd))) {
>>           int buf_height = buf->size / buf->stride;
>>           switch (buf->bpp) {
>> @@ -772,11 +782,21 @@ static void draw_rect_render(int fd, struct 
>> cmd_data *cmd_data,
>>       /* We create a temporary buffer and copy from it using 
>> rendercopy. */
>>       tmp.size = rect->w * rect->h * pixel_size;
>> -    tmp.handle = gem_create(fd, tmp.size);
>> +    if (is_i915_device(fd))
>> +        tmp.handle = gem_create(fd, tmp.size);
>> +    else
>> +        tmp.handle = xe_bo_create_flags(fd, 0,
>> +                        ALIGN(tmp.size, xe_get_default_alignment(fd)),
>> +                        vram_if_possible(fd, 0));
>> +
>>       tmp.stride = rect->w * pixel_size;
>>       tmp.bpp = buf->bpp;
>> -    draw_rect_mmap_cpu(fd, &tmp, &(struct rect){0, 0, rect->w, rect->h},
>> -               I915_TILING_NONE, I915_BIT_6_SWIZZLE_NONE, color);
>> +    if (is_i915_device(fd))
>> +        draw_rect_mmap_cpu(fd, &tmp, &(struct rect){0, 0, rect->w, 
>> rect->h},
>> +                   I915_TILING_NONE, I915_BIT_6_SWIZZLE_NONE, color);
>> +    else
>> +        draw_rect_mmap_wc(fd, &tmp, &(struct rect){0, 0, rect->w, 
>> rect->h},
>> +                  I915_TILING_NONE, I915_BIT_6_SWIZZLE_NONE, color);
>>       src = create_buf(fd, cmd_data->bops, &tmp, I915_TILING_NONE);
>>       dst = create_buf(fd, cmd_data->bops, buf, tiling);
>> @@ -904,7 +924,21 @@ void igt_draw_rect_fb(int fd, struct buf_ops *bops,
>>   void igt_draw_fill_fb(int fd, struct igt_fb *fb, uint32_t color)
>>   {
>>       igt_draw_rect_fb(fd, NULL, 0, fb,
>> -             gem_has_mappable_ggtt(fd) ? IGT_DRAW_MMAP_GTT :
>> -                             IGT_DRAW_MMAP_WC,
>> +             igt_draw_supports_method(fd, IGT_DRAW_MMAP_GTT) ?
>> +             IGT_DRAW_MMAP_GTT : IGT_DRAW_MMAP_WC,
>>                0, 0, fb->width, fb->height, color);
>>   }
>> +
>> +bool igt_draw_supports_method(int fd, enum igt_draw_method method)
>> +{
>> +    if (method == IGT_DRAW_MMAP_GTT)
>> +        return is_i915_device(fd) && gem_has_mappable_ggtt(fd);
>> +
>> +    if (method == IGT_DRAW_MMAP_WC)
>> +        return (is_i915_device(fd) && gem_mmap__has_wc(fd)) || 
>> is_xe_device(fd);
>> +
>> +    if (method == IGT_DRAW_MMAP_CPU || method == IGT_DRAW_PWRITE)
>> +        return is_i915_device(fd);
>> +
>> +    return true;
>> +}
>> diff --git a/lib/igt_draw.h b/lib/igt_draw.h
>> index 2d18ef6c9..fe7531b79 100644
>> --- a/lib/igt_draw.h
>> +++ b/lib/igt_draw.h
>> @@ -50,6 +50,8 @@ enum igt_draw_method {
>>   const char *igt_draw_get_method_name(enum igt_draw_method method);
>> +bool igt_draw_supports_method(int fd, enum igt_draw_method method);
>> +
>>   void igt_draw_rect(int fd, struct buf_ops *bops, uint32_t ctx,
>>              uint32_t buf_handle, uint32_t buf_size, uint32_t buf_stride,
>>              uint32_t tiling, enum igt_draw_method method,
>