[PATCH 04/21] drm/etnaviv: extend etnaviv_gpu_cmdbuf_new(..) with nr_pmrs

[Christian Gmeiner]

2017-06-26 15:02 GMT+02:00 Lucas Stach <l.stach at pengutronix.de>:
> Am Freitag, den 09.06.2017, 12:21 +0200 schrieb Christian Gmeiner:
>> This commits extends etnaviv_gpu_cmdbuf_new(..) to define the number
>> of struct etnaviv_perfmon elements gets stored.
>>
>> Signed-off-by: Christian Gmeiner <christian.gmeiner at gmail.com>
>> ---
>>  drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.c     | 13 ++++++++++++-
>>  drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.h     |  2 +-
>>  drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c |  2 +-
>>  drivers/gpu/drm/etnaviv/etnaviv_gpu.c        |  2 +-
>>  4 files changed, 15 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.c
>> b/drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.c
>> index 633e0f0..bb3f82e 100644
>> --- a/drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.c
>> +++ b/drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.c
>> @@ -19,6 +19,7 @@
>>  #include "etnaviv_cmdbuf.h"
>>  #include "etnaviv_gpu.h"
>>  #include "etnaviv_mmu.h"
>> +#include "etnaviv_perfmon.h"
>>
>>  #define SUBALLOC_SIZE                SZ_256K
>>  #define SUBALLOC_GRANULE     SZ_4K
>> @@ -87,9 +88,10 @@ void etnaviv_cmdbuf_suballoc_destroy(struct
>> etnaviv_cmdbuf_suballoc *suballoc)
>>
>>  struct etnaviv_cmdbuf *
>>  etnaviv_cmdbuf_new(struct etnaviv_cmdbuf_suballoc *suballoc, u32
>> size,
>> -                size_t nr_bos)
>> +                size_t nr_bos, size_t nr_pmrs)
>>  {
>>       struct etnaviv_cmdbuf *cmdbuf;
>> +     struct etnaviv_perfmon_request *pmrs;
>>       size_t sz = size_vstruct(nr_bos, sizeof(cmdbuf->bo_map[0]),
>>                                sizeof(*cmdbuf));
>>       int granule_offs, order, ret;
>> @@ -98,6 +100,14 @@ etnaviv_cmdbuf_new(struct etnaviv_cmdbuf_suballoc
>> *suballoc, u32 size,
>>       if (!cmdbuf)
>>               return NULL;
>>
>> +     sz = sizeof(*pmrs) * nr_pmrs;
>> +     pmrs = kzalloc(sz, GFP_KERNEL);
>> +     if (!pmrs) {
>> +             kfree(cmdbuf);
>> +             return NULL;
>> +     }
>
> While this is okay as-is, I have some more additions to this code
> planned, so I would appreciate if you could change this into a "goto
> out_free_cmdbuf" and move this down to the end of the function.
>

Sure - will change it that way.

greets
--
Christian Gmeiner, MSc

https://www.youtube.com/user/AloryOFFICIAL
https://soundcloud.com/christian-gmeiner

> Regards,
> Lucas
>
>> +     cmdbuf->pmrs = pmrs;
>>       cmdbuf->suballoc = suballoc;
>>       cmdbuf->size = size;
>>
>> @@ -139,6 +149,7 @@ void etnaviv_cmdbuf_free(struct etnaviv_cmdbuf
>> *cmdbuf)
>>       suballoc->free_space = 1;
>>       mutex_unlock(&suballoc->lock);
>>       wake_up_all(&suballoc->free_event);
>> +     kfree(cmdbuf->pmrs);
>>       kfree(cmdbuf);
>>  }
>>
>> diff --git a/drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.h
>> b/drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.h
>> index 1b549f0..b6348b9 100644
>> --- a/drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.h
>> +++ b/drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.h
>> @@ -53,7 +53,7 @@ void etnaviv_cmdbuf_suballoc_destroy(struct
>> etnaviv_cmdbuf_suballoc *suballoc);
>>
>>  struct etnaviv_cmdbuf *
>>  etnaviv_cmdbuf_new(struct etnaviv_cmdbuf_suballoc *suballoc, u32
>> size,
>> -                size_t nr_bos);
>> +                size_t nr_bos, size_t nr_pmrs);
>>  void etnaviv_cmdbuf_free(struct etnaviv_cmdbuf *cmdbuf);
>>
>>  u32 etnaviv_cmdbuf_get_va(struct etnaviv_cmdbuf *buf);
>> diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c
>> b/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c
>> index de80ee1..fdfe31d 100644
>> --- a/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c
>> +++ b/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c
>> @@ -350,7 +350,7 @@ int etnaviv_ioctl_gem_submit(struct drm_device
>> *dev, void *data,
>>       stream = drm_malloc_ab(1, args->stream_size);
>>       cmdbuf = etnaviv_cmdbuf_new(gpu->cmdbuf_suballoc,
>>                                   ALIGN(args->stream_size, 8) + 8,
>> -                                 args->nr_bos);
>> +                                 args->nr_bos, 0);
>>       if (!bos || !relocs || !stream || !cmdbuf) {
>>               ret = -ENOMEM;
>>               goto err_submit_cmds;
>> diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
>> b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
>> index ada45fd..037087e 100644
>> --- a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
>> +++ b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
>> @@ -721,7 +721,7 @@ int etnaviv_gpu_init(struct etnaviv_gpu *gpu)
>>       }
>>
>>       /* Create buffer: */
>> -     gpu->buffer = etnaviv_cmdbuf_new(gpu->cmdbuf_suballoc,
>> PAGE_SIZE, 0);
>> +     gpu->buffer = etnaviv_cmdbuf_new(gpu->cmdbuf_suballoc,
>> PAGE_SIZE, 0, 0);
>>       if (!gpu->buffer) {
>>               ret = -ENOMEM;
>>               dev_err(gpu->dev, "could not create command
>> buffer\n");