Commit 4fc3e66a authored by Christian Gmeiner's avatar Christian Gmeiner Committed by Lucas Stach
Browse files

drm/etnaviv: extend etnaviv_gpu_cmdbuf_new(..) with nr_pmrs 



This commits extends etnaviv_gpu_cmdbuf_new(..) to define the number
of struct etnaviv_perfmon elements gets used.

Changes from v1 -> v2:
- make use of goto as requested by Lucas

Signed-off-by: default avatarChristian Gmeiner <christian.gmeiner@gmail.com>
Signed-off-by: default avatarLucas Stach <l.stach@pengutronix.de>
parent 8d3d56ce

drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.c

+14 −1
Original line number Diff line number Diff line
@@ -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,12 @@ 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)

		goto out_free_cmdbuf;



	cmdbuf->pmrs = pmrs;

	cmdbuf->suballoc = suballoc;

	cmdbuf->size = size;
@@ -124,6 +132,10 @@ retry: 
	cmdbuf->vaddr = suballoc->vaddr + cmdbuf->suballoc_offset;



	return cmdbuf;



out_free_cmdbuf:

	kfree(cmdbuf);

	return NULL;

}



void etnaviv_cmdbuf_free(struct etnaviv_cmdbuf *cmdbuf)
@@ -139,6 +151,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);

}

drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c

+1 −1
Original line number Diff line number Diff line
@@ -350,7 +350,7 @@ int etnaviv_ioctl_gem_submit(struct drm_device *dev, void *data, 
	stream = kvmalloc_array(1, args->stream_size, GFP_KERNEL);

	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;

drivers/gpu/drm/etnaviv/etnaviv_gpu.c

+1 −1
Original line number Diff line number Diff line
@@ -726,7 +726,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");

CRA Git | Maintained and supported by SUSTech CRA and CCSE