Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 153b642f authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/core/gpuobj: remove embedded struct nvkm_object 



nvkm_gpuobj hasn't subclassed nvkm_object in a long time.

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 8e0042d5

drivers/gpu/drm/nouveau/include/nvkm/core/gpuobj.h

+0 −2
Original line number Original line Diff line number Diff line 
#ifndef __NVKM_GPUOBJ_H__

#ifndef __NVKM_GPUOBJ_H__

#define __NVKM_GPUOBJ_H__

#define __NVKM_GPUOBJ_H__

#include <core/object.h>

#include <core/memory.h>

#include <core/memory.h>

#include <core/mm.h>

#include <core/mm.h>

struct nvkm_vma;

struct nvkm_vma;
@@ -10,7 +9,6 @@ struct nvkm_vm; 
#define NVOBJ_FLAG_HEAP       0x00000004

#define NVOBJ_FLAG_HEAP       0x00000004





struct nvkm_gpuobj {

struct nvkm_gpuobj {

	struct nvkm_object object;

	const struct nvkm_gpuobj_func *func;

	const struct nvkm_gpuobj_func *func;

	struct nvkm_gpuobj *parent;

	struct nvkm_gpuobj *parent;

	struct nvkm_memory *memory;

	struct nvkm_memory *memory;

drivers/gpu/drm/nouveau/include/nvkm/core/ramht.h

+1 −0
Original line number Original line Diff line number Diff line 
#ifndef __NVKM_RAMHT_H__

#ifndef __NVKM_RAMHT_H__

#define __NVKM_RAMHT_H__

#define __NVKM_RAMHT_H__

#include <core/gpuobj.h>

#include <core/gpuobj.h>

struct nvkm_object;





struct nvkm_ramht_data {

struct nvkm_ramht_data {

	struct nvkm_gpuobj *inst;

	struct nvkm_gpuobj *inst;