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

Commit 8613e731 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/fb: remove ram oclass argument from base fb constructor 



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

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

+7 −6
Original line number Original line Diff line number Diff line
@@ -22,9 +22,10 @@ 
 * Authors: Ben Skeggs

 * Authors: Ben Skeggs

 */

 */





#include "subdev/fb.h"

#include <subdev/bios.h>

#include "subdev/bios.h"

#include <subdev/bios/bit.h>

#include "subdev/bios/bit.h"



#include "priv.h"





int

int

nouveau_fb_bios_memtype(struct nouveau_bios *bios)

nouveau_fb_bios_memtype(struct nouveau_bios *bios)
@@ -106,9 +107,9 @@ _nouveau_fb_dtor(struct nouveau_object *object) 




int

int

nouveau_fb_create_(struct nouveau_object *parent, struct nouveau_object *engine,

nouveau_fb_create_(struct nouveau_object *parent, struct nouveau_object *engine,

		   struct nouveau_oclass *oclass, struct nouveau_oclass *ramcls,

		   struct nouveau_oclass *oclass, int length, void **pobject)

		   int length, void **pobject)

{

{

	struct nouveau_fb_impl *impl = (void *)oclass;

	static const char *name[] = {

	static const char *name[] = {

		[NV_MEM_TYPE_UNKNOWN] = "unknown",

		[NV_MEM_TYPE_UNKNOWN] = "unknown",

		[NV_MEM_TYPE_STOLEN ] = "stolen system memory",

		[NV_MEM_TYPE_STOLEN ] = "stolen system memory",
@@ -133,7 +134,7 @@ nouveau_fb_create_(struct nouveau_object *parent, struct nouveau_object *engine, 
		return ret;

		return ret;





	ret = nouveau_object_ctor(nv_object(pfb), nv_object(pfb),

	ret = nouveau_object_ctor(nv_object(pfb), nv_object(pfb),

				  ramcls, NULL, 0, &ram);

				  impl->ram, NULL, 0, &ram);

	if (ret) {

	if (ret) {

		nv_fatal(pfb, "error detecting memory configuration!!\n");

		nv_fatal(pfb, "error detecting memory configuration!!\n");

		return ret;

		return ret;

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

+6 −5
Original line number Original line Diff line number Diff line
@@ -65,7 +65,7 @@ nv04_fb_ctor(struct nouveau_object *parent, struct nouveau_object *engine, 
	struct nv04_fb_priv *priv;

	struct nv04_fb_priv *priv;

	int ret;

	int ret;





	ret = nouveau_fb_create(parent, engine, oclass, &nv04_ram_oclass, &priv);

	ret = nouveau_fb_create(parent, engine, oclass, &priv);

	*pobject = nv_object(priv);

	*pobject = nv_object(priv);

	if (ret)

	if (ret)

		return ret;

		return ret;
@@ -75,12 +75,13 @@ nv04_fb_ctor(struct nouveau_object *parent, struct nouveau_object *engine, 
}

}





struct nouveau_oclass *

struct nouveau_oclass *

nv04_fb_oclass = &(struct nouveau_oclass) {

nv04_fb_oclass = &(struct nouveau_fb_impl) {

	.handle = NV_SUBDEV(FB, 0x04),

	.base.handle = NV_SUBDEV(FB, 0x04),

	.ofuncs = &(struct nouveau_ofuncs) {

	.base.ofuncs = &(struct nouveau_ofuncs) {

		.ctor = nv04_fb_ctor,

		.ctor = nv04_fb_ctor,

		.dtor = _nouveau_fb_dtor,

		.dtor = _nouveau_fb_dtor,

		.init = nv04_fb_init,

		.init = nv04_fb_init,

		.fini = _nouveau_fb_fini,

		.fini = _nouveau_fb_fini,

	},

	},

};
 
	.ram = &nv04_ram_oclass,

}.base;

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

+6 −5
Original line number Original line Diff line number Diff line
@@ -65,7 +65,7 @@ nv10_fb_ctor(struct nouveau_object *parent, struct nouveau_object *engine, 
	struct nv10_fb_priv *priv;

	struct nv10_fb_priv *priv;

	int ret;

	int ret;





	ret = nouveau_fb_create(parent, engine, oclass, &nv10_ram_oclass, &priv);

	ret = nouveau_fb_create(parent, engine, oclass, &priv);

	*pobject = nv_object(priv);

	*pobject = nv_object(priv);

	if (ret)

	if (ret)

		return ret;

		return ret;
@@ -79,12 +79,13 @@ nv10_fb_ctor(struct nouveau_object *parent, struct nouveau_object *engine, 
}

}





struct nouveau_oclass *

struct nouveau_oclass *

nv10_fb_oclass = &(struct nouveau_oclass) {

nv10_fb_oclass = &(struct nouveau_fb_impl) {

	.handle = NV_SUBDEV(FB, 0x10),

	.base.handle = NV_SUBDEV(FB, 0x10),

	.ofuncs = &(struct nouveau_ofuncs) {

	.base.ofuncs = &(struct nouveau_ofuncs) {

		.ctor = nv10_fb_ctor,

		.ctor = nv10_fb_ctor,

		.dtor = _nouveau_fb_dtor,

		.dtor = _nouveau_fb_dtor,

		.init = _nouveau_fb_init,

		.init = _nouveau_fb_init,

		.fini = _nouveau_fb_fini,

		.fini = _nouveau_fb_fini,

	},

	},

};
 
	.ram = &nv10_ram_oclass,

}.base;

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

+6 −5
Original line number Original line Diff line number Diff line
@@ -38,7 +38,7 @@ nv1a_fb_ctor(struct nouveau_object *parent, struct nouveau_object *engine, 
	struct nv1a_fb_priv *priv;

	struct nv1a_fb_priv *priv;

	int ret;

	int ret;





	ret = nouveau_fb_create(parent, engine, oclass, &nv1a_ram_oclass, &priv);

	ret = nouveau_fb_create(parent, engine, oclass, &priv);

	*pobject = nv_object(priv);

	*pobject = nv_object(priv);

	if (ret)

	if (ret)

		return ret;

		return ret;
@@ -52,12 +52,13 @@ nv1a_fb_ctor(struct nouveau_object *parent, struct nouveau_object *engine, 
}

}





struct nouveau_oclass *

struct nouveau_oclass *

nv1a_fb_oclass = &(struct nouveau_oclass) {

nv1a_fb_oclass = &(struct nouveau_fb_impl) {

	.handle = NV_SUBDEV(FB, 0x1a),

	.base.handle = NV_SUBDEV(FB, 0x1a),

	.ofuncs = &(struct nouveau_ofuncs) {

	.base.ofuncs = &(struct nouveau_ofuncs) {

		.ctor = nv1a_fb_ctor,

		.ctor = nv1a_fb_ctor,

		.dtor = _nouveau_fb_dtor,

		.dtor = _nouveau_fb_dtor,

		.init = _nouveau_fb_init,

		.init = _nouveau_fb_init,

		.fini = _nouveau_fb_fini,

		.fini = _nouveau_fb_fini,

	},

	},

};
 
	.ram = &nv10_ram_oclass,

}.base;

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

+6 −5
Original line number Original line Diff line number Diff line
@@ -88,7 +88,7 @@ nv20_fb_ctor(struct nouveau_object *parent, struct nouveau_object *engine, 
	struct nv20_fb_priv *priv;

	struct nv20_fb_priv *priv;

	int ret;

	int ret;





	ret = nouveau_fb_create(parent, engine, oclass, &nv20_ram_oclass, &priv);

	ret = nouveau_fb_create(parent, engine, oclass, &priv);

	*pobject = nv_object(priv);

	*pobject = nv_object(priv);

	if (ret)

	if (ret)

		return ret;

		return ret;
@@ -103,12 +103,13 @@ nv20_fb_ctor(struct nouveau_object *parent, struct nouveau_object *engine, 
}

}





struct nouveau_oclass *

struct nouveau_oclass *

nv20_fb_oclass = &(struct nouveau_oclass) {

nv20_fb_oclass = &(struct nouveau_fb_impl) {

	.handle = NV_SUBDEV(FB, 0x20),

	.base.handle = NV_SUBDEV(FB, 0x20),

	.ofuncs = &(struct nouveau_ofuncs) {

	.base.ofuncs = &(struct nouveau_ofuncs) {

		.ctor = nv20_fb_ctor,

		.ctor = nv20_fb_ctor,

		.dtor = _nouveau_fb_dtor,

		.dtor = _nouveau_fb_dtor,

		.init = _nouveau_fb_init,

		.init = _nouveau_fb_init,

		.fini = _nouveau_fb_fini,

		.fini = _nouveau_fb_fini,

	},

	},

};
 
	.ram = &nv20_ram_oclass,

}.base;