drm/nouveau/imem/nv40: embed nvkm_instobj directly into nv04_instobj (62465ac5) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv40.c

+7 −7

Original line number	Original line	Diff line number	Diff line
	@@ -24,7 +24,6 @@
	#define nv40_instmem(p) container_of((p), struct nv40_instmem, base)		#define nv40_instmem(p) container_of((p), struct nv40_instmem, base)
	#include "priv.h"		#include "priv.h"

	#include <core/memory.h>
	#include <core/ramht.h>		#include <core/ramht.h>
	#include <engine/gr/nv40.h>		#include <engine/gr/nv40.h>

	@@ -37,10 +36,10 @@ struct nv40_instmem {
	/******************************************************************************		/******************************************************************************
	* instmem object implementation		* instmem object implementation
	*****************************************************************************/		*****************************************************************************/
	#define nv40_instobj(p) container_of((p), struct nv40_instobj, memory)		#define nv40_instobj(p) container_of((p), struct nv40_instobj, base.memory)

	struct nv40_instobj {		struct nv40_instobj {
	struct nvkm_memory memory;		struct nvkm_instobj base;
	struct nv40_instmem *imem;		struct nv40_instmem *imem;
	struct nvkm_mm_node *node;		struct nvkm_mm_node *node;
	};		};
	@@ -102,6 +101,7 @@ nv40_instobj_dtor(struct nvkm_memory *memory)
	mutex_lock(&iobj->imem->base.subdev.mutex);		mutex_lock(&iobj->imem->base.subdev.mutex);
	nvkm_mm_free(&iobj->imem->heap, &iobj->node);		nvkm_mm_free(&iobj->imem->heap, &iobj->node);
	mutex_unlock(&iobj->imem->base.subdev.mutex);		mutex_unlock(&iobj->imem->base.subdev.mutex);
			nvkm_instobj_dtor(&iobj->imem->base, &iobj->base);
	return iobj;		return iobj;
	}		}

	@@ -125,10 +125,10 @@ nv40_instobj_new(struct nvkm_instmem *base, u32 size, u32 align, bool zero,

	if (!(iobj = kzalloc(sizeof(*iobj), GFP_KERNEL)))		if (!(iobj = kzalloc(sizeof(*iobj), GFP_KERNEL)))
	return -ENOMEM;		return -ENOMEM;
	*pmemory = &iobj->memory;		*pmemory = &iobj->base.memory;

	nvkm_memory_ctor(&nv40_instobj_func, &iobj->memory);		nvkm_instobj_ctor(&nv40_instobj_func, &imem->base, &iobj->base);
	iobj->memory.ptrs = &nv40_instobj_ptrs;		iobj->base.memory.ptrs = &nv40_instobj_ptrs;
	iobj->imem = imem;		iobj->imem = imem;

	mutex_lock(&imem->base.subdev.mutex);		mutex_lock(&imem->base.subdev.mutex);
	@@ -231,7 +231,7 @@ nv40_instmem = {
	.rd32 = nv40_instmem_rd32,		.rd32 = nv40_instmem_rd32,
	.wr32 = nv40_instmem_wr32,		.wr32 = nv40_instmem_wr32,
	.memory_new = nv40_instobj_new,		.memory_new = nv40_instobj_new,
	.persistent = false,		.persistent = true,
	.zero = false,		.zero = false,
	};		};