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

Commit 266f8b5e authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/devinit: cosmetic changes 



This is purely preparation for upcoming commits, there should be no
code changes here.

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

drivers/gpu/drm/nouveau/include/nvkm/subdev/devinit.h

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
#include <core/subdev.h>



struct nvkm_devinit {

	struct nvkm_subdev base;

	struct nvkm_subdev subdev;

	bool post;

	void (*meminit)(struct nvkm_devinit *);

	int  (*pll_set)(struct nvkm_devinit *, u32 type, u32 freq);

drivers/gpu/drm/nouveau/nvkm/subdev/devinit/base.c

+17 −17
Original line number Diff line number Diff line
@@ -29,47 +29,47 @@ 
int

_nvkm_devinit_fini(struct nvkm_object *object, bool suspend)

{

	struct nvkm_devinit *devinit = (void *)object;

	struct nvkm_devinit *init = (void *)object;



	/* force full reinit on resume */

	if (suspend)

		devinit->post = true;

		init->post = true;



	/* unlock the extended vga crtc regs */

	nv_lockvgac(devinit, false);

	nv_lockvgac(init, false);



	return nvkm_subdev_fini(&devinit->base, suspend);

	return nvkm_subdev_fini(&init->subdev, suspend);

}



int

_nvkm_devinit_init(struct nvkm_object *object)

{

	struct nvkm_devinit_impl *impl = (void *)object->oclass;

	struct nvkm_devinit *devinit = (void *)object;

	struct nvkm_devinit *init = (void *)object;

	int ret;



	ret = nvkm_subdev_init(&devinit->base);

	ret = nvkm_subdev_init(&init->subdev);

	if (ret)

		return ret;



	ret = impl->post(&devinit->base, devinit->post);

	ret = impl->post(&init->subdev, init->post);

	if (ret)

		return ret;



	if (impl->disable)

		nv_device(devinit)->disable_mask |= impl->disable(devinit);

		nv_device(init)->disable_mask |= impl->disable(init);

	return 0;

}



void

_nvkm_devinit_dtor(struct nvkm_object *object)

{

	struct nvkm_devinit *devinit = (void *)object;

	struct nvkm_devinit *init = (void *)object;



	/* lock crtc regs */

	nv_lockvgac(devinit, true);

	nv_lockvgac(init, true);



	nvkm_subdev_destroy(&devinit->base);

	nvkm_subdev_destroy(&init->subdev);

}



int
@@ -78,18 +78,18 @@ nvkm_devinit_create_(struct nvkm_object *parent, struct nvkm_object *engine, 
{

	struct nvkm_devinit_impl *impl = (void *)oclass;

	struct nvkm_device *device = nv_device(parent);

	struct nvkm_devinit *devinit;

	struct nvkm_devinit *init;

	int ret;



	ret = nvkm_subdev_create_(parent, engine, oclass, 0, "DEVINIT",

				  "init", size, pobject);

	devinit = *pobject;

	init = *pobject;

	if (ret)

		return ret;



	devinit->post = nvkm_boolopt(device->cfgopt, "NvForcePost", false);

	devinit->meminit = impl->meminit;

	devinit->pll_set = impl->pll_set;

	devinit->mmio    = impl->mmio;

	init->post = nvkm_boolopt(device->cfgopt, "NvForcePost", false);

	init->meminit = impl->meminit;

	init->pll_set = impl->pll_set;

	init->mmio    = impl->mmio;

	return 0;

}

drivers/gpu/drm/nouveau/nvkm/subdev/devinit/g84.c

+3 −3
Original line number Diff line number Diff line
@@ -29,9 +29,9 @@ 
static u64

g84_devinit_disable(struct nvkm_devinit *devinit)

{

	struct nv50_devinit_priv *priv = (void *)devinit;

	u32 r001540 = nv_rd32(priv, 0x001540);

	u32 r00154c = nv_rd32(priv, 0x00154c);

	struct nv50_devinit *init = (void *)devinit;

	u32 r001540 = nv_rd32(init, 0x001540);

	u32 r00154c = nv_rd32(init, 0x00154c);

	u64 disable = 0ULL;



	if (!(r001540 & 0x40000000)) {

drivers/gpu/drm/nouveau/nvkm/subdev/devinit/g98.c

+3 −3
Original line number Diff line number Diff line
@@ -29,9 +29,9 @@ 
static u64

g98_devinit_disable(struct nvkm_devinit *devinit)

{

	struct nv50_devinit_priv *priv = (void *)devinit;

	u32 r001540 = nv_rd32(priv, 0x001540);

	u32 r00154c = nv_rd32(priv, 0x00154c);

	struct nv50_devinit *init = (void *)devinit;

	u32 r001540 = nv_rd32(init, 0x001540);

	u32 r00154c = nv_rd32(init, 0x00154c);

	u64 disable = 0ULL;



	if (!(r001540 & 0x40000000)) {

drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gf100.c

+13 −13
Original line number Diff line number Diff line
@@ -31,8 +31,8 @@ 
int

gf100_devinit_pll_set(struct nvkm_devinit *devinit, u32 type, u32 freq)

{

	struct nv50_devinit_priv *priv = (void *)devinit;

	struct nvkm_bios *bios = nvkm_bios(priv);

	struct nv50_devinit *init = (void *)devinit;

	struct nvkm_bios *bios = nvkm_bios(init);

	struct nvbios_pll info;

	int N, fN, M, P;

	int ret;
@@ -50,12 +50,12 @@ gf100_devinit_pll_set(struct nvkm_devinit *devinit, u32 type, u32 freq) 
	case PLL_VPLL1:

	case PLL_VPLL2:

	case PLL_VPLL3:

		nv_mask(priv, info.reg + 0x0c, 0x00000000, 0x00000100);

		nv_wr32(priv, info.reg + 0x04, (P << 16) | (N << 8) | M);

		nv_wr32(priv, info.reg + 0x10, fN << 16);

		nv_mask(init, info.reg + 0x0c, 0x00000000, 0x00000100);

		nv_wr32(init, info.reg + 0x04, (P << 16) | (N << 8) | M);

		nv_wr32(init, info.reg + 0x10, fN << 16);

		break;

	default:

		nv_warn(priv, "0x%08x/%dKhz unimplemented\n", type, freq);

		nv_warn(init, "0x%08x/%dKhz unimplemented\n", type, freq);

		ret = -EINVAL;

		break;

	}
@@ -66,8 +66,8 @@ gf100_devinit_pll_set(struct nvkm_devinit *devinit, u32 type, u32 freq) 
static u64

gf100_devinit_disable(struct nvkm_devinit *devinit)

{

	struct nv50_devinit_priv *priv = (void *)devinit;

	u32 r022500 = nv_rd32(priv, 0x022500);

	struct nv50_devinit *init = (void *)devinit;

	u32 r022500 = nv_rd32(init, 0x022500);

	u64 disable = 0ULL;



	if (r022500 & 0x00000001)
@@ -96,18 +96,18 @@ gf100_devinit_ctor(struct nvkm_object *parent, struct nvkm_object *engine, 
		   struct nvkm_object **pobject)

{

	struct nvkm_devinit_impl *impl = (void *)oclass;

	struct nv50_devinit_priv *priv;

	struct nv50_devinit *init;

	u64 disable;

	int ret;



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

	*pobject = nv_object(priv);

	ret = nvkm_devinit_create(parent, engine, oclass, &init);

	*pobject = nv_object(init);

	if (ret)

		return ret;



	disable = impl->disable(&priv->base);

	disable = impl->disable(&init->base);

	if (disable & (1ULL << NVDEV_ENGINE_DISP))

		priv->base.post = true;

		init->base.post = true;



	return 0;

}