Commit ea1f5729 authored by Lucas Stach's avatar Lucas Stach
Browse files

drm/etnaviv: move cmdbuf de-/allocation into own file 



This will get more complex with the following changes, so move it
into its own place.

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

drivers/gpu/drm/etnaviv/Makefile

+1 −0
Original line number Diff line number Diff line 
etnaviv-y := \

	etnaviv_buffer.o \

	etnaviv_cmd_parser.o \

	etnaviv_cmdbuf.o \

	etnaviv_drv.o \

	etnaviv_dump.o \

	etnaviv_gem_prime.o \

drivers/gpu/drm/etnaviv/etnaviv_buffer.c

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
 * this program.  If not, see <http://www.gnu.org/licenses/>.

 */



#include "etnaviv_cmdbuf.h"

#include "etnaviv_gpu.h"

#include "etnaviv_gem.h"

#include "etnaviv_mmu.h"

drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.c

0 → 100644
+54 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2017 Etnaviv Project

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms of the GNU General Public License version 2 as published by

 * the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful, but WITHOUT

 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

 * more details.

 *

 * You should have received a copy of the GNU General Public License along with

 * this program.  If not, see <http://www.gnu.org/licenses/>.

 */



#include "etnaviv_cmdbuf.h"

#include "etnaviv_gpu.h"

#include "etnaviv_mmu.h"



struct etnaviv_cmdbuf *etnaviv_cmdbuf_new(struct etnaviv_gpu *gpu, u32 size,

	size_t nr_bos)

{

	struct etnaviv_cmdbuf *cmdbuf;

	size_t sz = size_vstruct(nr_bos, sizeof(cmdbuf->bo_map[0]),

				 sizeof(*cmdbuf));



	cmdbuf = kzalloc(sz, GFP_KERNEL);

	if (!cmdbuf)

		return NULL;



	if (gpu->mmu->version == ETNAVIV_IOMMU_V2)

		size = ALIGN(size, SZ_4K);



	cmdbuf->vaddr = dma_alloc_wc(gpu->dev, size, &cmdbuf->paddr,

				     GFP_KERNEL);

	if (!cmdbuf->vaddr) {

		kfree(cmdbuf);

		return NULL;

	}



	cmdbuf->gpu = gpu;

	cmdbuf->size = size;



	return cmdbuf;

}



void etnaviv_cmdbuf_free(struct etnaviv_cmdbuf *cmdbuf)

{

	etnaviv_iommu_put_cmdbuf_va(cmdbuf->gpu, cmdbuf);

	dma_free_wc(cmdbuf->gpu->dev, cmdbuf->size, cmdbuf->vaddr,

		    cmdbuf->paddr);

	kfree(cmdbuf);

}

drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.h

0 → 100644
+46 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2017 Etnaviv Project

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms of the GNU General Public License version 2 as published by

 * the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful, but WITHOUT

 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

 * more details.

 *

 * You should have received a copy of the GNU General Public License along with

 * this program.  If not, see <http://www.gnu.org/licenses/>.

 */



#ifndef __ETNAVIV_CMDBUF_H__

#define __ETNAVIV_CMDBUF_H__



#include <drm/drm_mm.h>

#include <linux/types.h>



struct etnaviv_cmdbuf {

	/* device this cmdbuf is allocated for */

	struct etnaviv_gpu *gpu;

	/* user context key, must be unique between all active users */

	struct etnaviv_file_private *ctx;

	/* cmdbuf properties */

	void *vaddr;

	dma_addr_t paddr;

	u32 size;

	u32 user_size;

	/* vram node used if the cmdbuf is mapped through the MMUv2 */

	struct drm_mm_node vram_node;

	/* fence after which this buffer is to be disposed */

	struct dma_fence *fence;

	/* target exec state */

	u32 exec_state;

	/* per GPU in-flight list */

	struct list_head node;

	/* BOs attached to this command buffer */

	unsigned int nr_bos;

	struct etnaviv_vram_mapping *bo_map[0];

};



#endif /* __ETNAVIV_CMDBUF_H__ */

drivers/gpu/drm/etnaviv/etnaviv_drv.c

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/of_platform.h>

#include <drm/drm_of.h>



#include "etnaviv_cmdbuf.h"

#include "etnaviv_drv.h"

#include "etnaviv_gpu.h"

#include "etnaviv_gem.h"