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

Commit 25e3a463 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/mc: switch to device pri macros 



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

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

+12 −8
Original line number Diff line number Diff line
@@ -36,7 +36,8 @@ nvkm_mc_unk260(struct nvkm_mc *mc, u32 data) 
static inline u32

nvkm_mc_intr_mask(struct nvkm_mc *mc)

{

	u32 intr = nv_rd32(mc, 0x000100);

	struct nvkm_device *device = mc->subdev.device;

	u32 intr = nvkm_rd32(device, 0x000100);

	if (intr == 0xffffffff) /* likely fallen off the bus */

		intr = 0x00000000;

	return intr;
@@ -46,13 +47,14 @@ static irqreturn_t 
nvkm_mc_intr(int irq, void *arg)

{

	struct nvkm_mc *mc = arg;

	struct nvkm_device *device = mc->subdev.device;

	const struct nvkm_mc_oclass *oclass = (void *)nv_object(mc)->oclass;

	const struct nvkm_mc_intr *map = oclass->intr;

	struct nvkm_subdev *unit;

	u32 intr;



	nv_wr32(mc, 0x000140, 0x00000000);

	nv_rd32(mc, 0x000140);

	nvkm_wr32(device, 0x000140, 0x00000000);

	nvkm_rd32(device, 0x000140);

	intr = nvkm_mc_intr_mask(mc);

	if (mc->use_msi)

		oclass->msi_rearm(mc);
@@ -73,7 +75,7 @@ nvkm_mc_intr(int irq, void *arg) 
			nv_error(mc, "unknown intr 0x%08x\n", stat);

	}



	nv_wr32(mc, 0x000140, 0x00000001);

	nvkm_wr32(device, 0x000140, 0x00000001);

	return intr ? IRQ_HANDLED : IRQ_NONE;

}
@@ -81,7 +83,8 @@ int 
_nvkm_mc_fini(struct nvkm_object *object, bool suspend)

{

	struct nvkm_mc *mc = (void *)object;

	nv_wr32(mc, 0x000140, 0x00000000);

	struct nvkm_device *device = mc->subdev.device;

	nvkm_wr32(device, 0x000140, 0x00000000);

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

}
@@ -89,18 +92,19 @@ int 
_nvkm_mc_init(struct nvkm_object *object)

{

	struct nvkm_mc *mc = (void *)object;

	struct nvkm_device *device = mc->subdev.device;

	int ret = nvkm_subdev_init(&mc->subdev);

	if (ret)

		return ret;

	nv_wr32(mc, 0x000140, 0x00000001);

	nvkm_wr32(device, 0x000140, 0x00000001);

	return 0;

}



void

_nvkm_mc_dtor(struct nvkm_object *object)

{

	struct nvkm_device *device = nv_device(object);

	struct nvkm_mc *mc = (void *)object;

	struct nvkm_device *device = mc->subdev.device;

	free_irq(mc->irq, mc);

	if (mc->use_msi)

		pci_disable_msi(device->pdev);
@@ -112,7 +116,7 @@ nvkm_mc_create_(struct nvkm_object *parent, struct nvkm_object *engine, 
		struct nvkm_oclass *bclass, int length, void **pobject)

{

	const struct nvkm_mc_oclass *oclass = (void *)bclass;

	struct nvkm_device *device = nv_device(parent);

	struct nvkm_device *device = (void *)parent;

	struct nvkm_mc *mc;

	int ret;

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

+2 −2
Original line number Diff line number Diff line
@@ -51,13 +51,13 @@ gf100_mc_intr[] = { 
static void

gf100_mc_msi_rearm(struct nvkm_mc *mc)

{

	nv_wr32(mc, 0x088704, 0x00000000);

	nvkm_wr32(mc->subdev.device, 0x088704, 0x00000000);

}



void

gf100_mc_unk260(struct nvkm_mc *mc, u32 data)

{

	nv_wr32(mc, 0x000260, data);

	nvkm_wr32(mc->subdev.device, 0x000260, data);

}



struct nvkm_oclass *

drivers/gpu/drm/nouveau/nvkm/subdev/mc/nv04.c

+3 −2
Original line number Diff line number Diff line
@@ -42,9 +42,10 @@ int 
nv04_mc_init(struct nvkm_object *object)

{

	struct nvkm_mc *mc = (void *)object;

	struct nvkm_device *device = mc->subdev.device;



	nv_wr32(mc, 0x000200, 0xffffffff); /* everything enabled */

	nv_wr32(mc, 0x001850, 0x00000001); /* disable rom access */

	nvkm_wr32(device, 0x000200, 0xffffffff); /* everything enabled */

	nvkm_wr32(device, 0x001850, 0x00000001); /* disable rom access */



	return nvkm_mc_init(mc);

}

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

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
void

nv40_mc_msi_rearm(struct nvkm_mc *mc)

{

	nv_wr08(mc, 0x088068, 0xff);

	nvkm_wr08(mc->subdev.device, 0x088068, 0xff);

}



struct nvkm_oclass *

drivers/gpu/drm/nouveau/nvkm/subdev/mc/nv44.c

+7 −6
Original line number Diff line number Diff line
@@ -27,14 +27,15 @@ int 
nv44_mc_init(struct nvkm_object *object)

{

	struct nvkm_mc *mc = (void *)object;

	u32 tmp = nv_rd32(mc, 0x10020c);

	struct nvkm_device *device = mc->subdev.device;

	u32 tmp = nvkm_rd32(device, 0x10020c);



	nv_wr32(mc, 0x000200, 0xffffffff); /* everything enabled */

	nvkm_wr32(device, 0x000200, 0xffffffff); /* everything enabled */



	nv_wr32(mc, 0x001700, tmp);

	nv_wr32(mc, 0x001704, 0);

	nv_wr32(mc, 0x001708, 0);

	nv_wr32(mc, 0x00170c, tmp);

	nvkm_wr32(device, 0x001700, tmp);

	nvkm_wr32(device, 0x001704, 0);

	nvkm_wr32(device, 0x001708, 0);

	nvkm_wr32(device, 0x00170c, tmp);



	return nvkm_mc_init(mc);

}