Commit 587f7a5b authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/core: rename subclass.base to subclass.superclass 



Makes things a bit more readable.  This is specially important now as
upcoming commits are going to be gradually removing the use of macros
for down-casts, in favour of compile-time checking.

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

drivers/gpu/drm/nouveau/core/core/client.c

+1 −1
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ nouveau_client_dtor(struct nouveau_object *object) 
		nvkm_client_notify_del(client, i);

	nouveau_object_ref(NULL, &client->device);

	nouveau_handle_destroy(client->root);

	nouveau_namedb_destroy(&client->base);

	nouveau_namedb_destroy(&client->namedb);

}



static struct nouveau_oclass

drivers/gpu/drm/nouveau/core/core/engctx.c

+5 −5
Original line number Diff line number Diff line
@@ -125,10 +125,10 @@ nouveau_engctx_destroy(struct nouveau_engctx *engctx) 
	if (client->vm)

		atomic_dec(&client->vm->engref[nv_engidx(engobj)]);



	if (engctx->base.size)

		nouveau_gpuobj_destroy(&engctx->base);

	if (engctx->gpuobj.size)

		nouveau_gpuobj_destroy(&engctx->gpuobj);

	else

		nouveau_object_destroy(&engctx->base.base);

		nouveau_object_destroy(&engctx->gpuobj.object);

}



int
@@ -140,7 +140,7 @@ nouveau_engctx_init(struct nouveau_engctx *engctx) 
	struct nouveau_subdev *pardev;

	int ret;



	ret = nouveau_gpuobj_init(&engctx->base);

	ret = nouveau_gpuobj_init(&engctx->gpuobj);

	if (ret)

		return ret;
@@ -186,7 +186,7 @@ nouveau_engctx_fini(struct nouveau_engctx *engctx, bool suspend) 
	}



	nv_debug(parent, "detached %s context\n", subdev->name);

	return nouveau_gpuobj_fini(&engctx->base, suspend);

	return nouveau_gpuobj_fini(&engctx->gpuobj, suspend);

}



int

drivers/gpu/drm/nouveau/core/core/gpuobj.c

+2 −2
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ nouveau_gpuobj_destroy(struct nouveau_gpuobj *gpuobj) 
	if (gpuobj->heap.block_size)

		nouveau_mm_fini(&gpuobj->heap);



	nouveau_object_destroy(&gpuobj->base);

	nouveau_object_destroy(&gpuobj->object);

}



int
@@ -290,7 +290,7 @@ nouveau_gpudup_dtor(struct nouveau_object *object) 
{

	struct nouveau_gpuobj *gpuobj = (void *)object;

	nouveau_object_ref(NULL, &gpuobj->parent);

	nouveau_object_destroy(&gpuobj->base);

	nouveau_object_destroy(&gpuobj->object);

}



static struct nouveau_oclass

drivers/gpu/drm/nouveau/core/core/parent.c

+1 −1
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ nouveau_parent_destroy(struct nouveau_parent *parent) 
		kfree(sclass);

	}



	nouveau_object_destroy(&parent->base);

	nouveau_object_destroy(&parent->object);

}

drivers/gpu/drm/nouveau/core/core/subdev.c

+4 −4
Original line number Diff line number Diff line
@@ -38,11 +38,11 @@ nouveau_subdev_reset(struct nouveau_object *subdev) 
int

nouveau_subdev_init(struct nouveau_subdev *subdev)

{

	int ret = nouveau_object_init(&subdev->base);

	int ret = nouveau_object_init(&subdev->object);

	if (ret)

		return ret;



	nouveau_subdev_reset(&subdev->base);

	nouveau_subdev_reset(&subdev->object);

	return 0;

}
@@ -60,7 +60,7 @@ nouveau_subdev_fini(struct nouveau_subdev *subdev, bool suspend) 
		nv_mask(subdev, 0x000200, subdev->unit, subdev->unit);

	}



	return nouveau_object_fini(&subdev->base, suspend);

	return nouveau_object_fini(&subdev->object, suspend);

}



int
@@ -74,7 +74,7 @@ nouveau_subdev_destroy(struct nouveau_subdev *subdev) 
{

	int subidx = nv_hclass(subdev) & 0xff;

	nv_device(subdev)->subdev[subidx] = NULL;

	nouveau_object_destroy(&subdev->base);

	nouveau_object_destroy(&subdev->object);

}



void

CRA Git | Maintained and supported by SUSTech CRA and CCSE