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

Commit 14caba44 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/bus: switch to device pri macros 



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

drivers/gpu/drm/nouveau/nvkm/subdev/bus/g94.c

+7 −6
Original line number Diff line number Diff line
@@ -29,15 +29,16 @@ 
static int

g94_bus_hwsq_exec(struct nvkm_bus *bus, u32 *data, u32 size)

{

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

	int i;



	nv_mask(bus, 0x001098, 0x00000008, 0x00000000);

	nv_wr32(bus, 0x001304, 0x00000000);

	nv_wr32(bus, 0x001318, 0x00000000);

	nvkm_mask(device, 0x001098, 0x00000008, 0x00000000);

	nvkm_wr32(device, 0x001304, 0x00000000);

	nvkm_wr32(device, 0x001318, 0x00000000);

	for (i = 0; i < size; i++)

		nv_wr32(bus, 0x080000 + (i * 4), data[i]);

	nv_mask(bus, 0x001098, 0x00000018, 0x00000018);

	nv_wr32(bus, 0x00130c, 0x00000001);

		nvkm_wr32(device, 0x080000 + (i * 4), data[i]);

	nvkm_mask(device, 0x001098, 0x00000018, 0x00000018);

	nvkm_wr32(device, 0x00130c, 0x00000001);



	return nv_wait(bus, 0x001308, 0x00000100, 0x00000000) ? 0 : -ETIMEDOUT;

}

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

+10 −8
Original line number Diff line number Diff line
@@ -28,11 +28,12 @@ static void 
gf100_bus_intr(struct nvkm_subdev *subdev)

{

	struct nvkm_bus *bus = nvkm_bus(subdev);

	u32 stat = nv_rd32(bus, 0x001100) & nv_rd32(bus, 0x001140);

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

	u32 stat = nvkm_rd32(device, 0x001100) & nvkm_rd32(device, 0x001140);



	if (stat & 0x0000000e) {

		u32 addr = nv_rd32(bus, 0x009084);

		u32 data = nv_rd32(bus, 0x009088);

		u32 addr = nvkm_rd32(device, 0x009084);

		u32 data = nvkm_rd32(device, 0x009088);



		nv_error(bus, "MMIO %s of 0x%08x FAULT at 0x%06x [ %s%s%s]\n",

			 (addr & 0x00000002) ? "write" : "read", data,
@@ -41,14 +42,14 @@ gf100_bus_intr(struct nvkm_subdev *subdev) 
			 (stat & 0x00000004) ? "IBUS " : "",

			 (stat & 0x00000008) ? "TIMEOUT " : "");



		nv_wr32(bus, 0x009084, 0x00000000);

		nv_wr32(bus, 0x001100, (stat & 0x0000000e));

		nvkm_wr32(device, 0x009084, 0x00000000);

		nvkm_wr32(device, 0x001100, (stat & 0x0000000e));

		stat &= ~0x0000000e;

	}



	if (stat) {

		nv_error(bus, "unknown intr 0x%08x\n", stat);

		nv_mask(bus, 0x001140, stat, 0x00000000);

		nvkm_mask(device, 0x001140, stat, 0x00000000);

	}

}
@@ -56,14 +57,15 @@ static int 
gf100_bus_init(struct nvkm_object *object)

{

	struct nvkm_bus *bus = (void *)object;

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

	int ret;



	ret = nvkm_bus_init(bus);

	if (ret)

		return ret;



	nv_wr32(bus, 0x001100, 0xffffffff);

	nv_wr32(bus, 0x001140, 0x0000000e);

	nvkm_wr32(device, 0x001100, 0xffffffff);

	nvkm_wr32(device, 0x001140, 0x0000000e);

	return 0;

}

drivers/gpu/drm/nouveau/nvkm/subdev/bus/hwsq.h

+2 −1
Original line number Diff line number Diff line
@@ -85,8 +85,9 @@ hwsq_exec(struct hwsq *ram, bool exec) 
static inline u32

hwsq_rd32(struct hwsq *ram, struct hwsq_reg *reg)

{

	struct nvkm_device *device = ram->subdev->device;

	if (reg->sequence != ram->sequence)

		reg->data = nv_rd32(ram->subdev, reg->addr);

		reg->data = nvkm_rd32(device, reg->addr);

	return reg->data;

}

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

+8 −6
Original line number Diff line number Diff line
@@ -28,12 +28,13 @@ static void 
nv04_bus_intr(struct nvkm_subdev *subdev)

{

	struct nvkm_bus *bus = nvkm_bus(subdev);

	u32 stat = nv_rd32(bus, 0x001100) & nv_rd32(bus, 0x001140);

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

	u32 stat = nvkm_rd32(device, 0x001100) & nvkm_rd32(device, 0x001140);



	if (stat & 0x00000001) {

		nv_error(bus, "BUS ERROR\n");

		stat &= ~0x00000001;

		nv_wr32(bus, 0x001100, 0x00000001);

		nvkm_wr32(device, 0x001100, 0x00000001);

	}



	if (stat & 0x00000110) {
@@ -41,12 +42,12 @@ nv04_bus_intr(struct nvkm_subdev *subdev) 
		if (subdev && subdev->intr)

			subdev->intr(subdev);

		stat &= ~0x00000110;

		nv_wr32(bus, 0x001100, 0x00000110);

		nvkm_wr32(device, 0x001100, 0x00000110);

	}



	if (stat) {

		nv_error(bus, "unknown intr 0x%08x\n", stat);

		nv_mask(bus, 0x001140, stat, 0x00000000);

		nvkm_mask(device, 0x001140, stat, 0x00000000);

	}

}
@@ -54,9 +55,10 @@ static int 
nv04_bus_init(struct nvkm_object *object)

{

	struct nvkm_bus *bus = (void *)object;

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



	nv_wr32(bus, 0x001100, 0xffffffff);

	nv_wr32(bus, 0x001140, 0x00000111);

	nvkm_wr32(device, 0x001100, 0xffffffff);

	nvkm_wr32(device, 0x001140, 0x00000111);



	return nvkm_bus_init(bus);

}

drivers/gpu/drm/nouveau/nvkm/subdev/bus/nv31.c

+11 −9
Original line number Diff line number Diff line
@@ -28,8 +28,9 @@ static void 
nv31_bus_intr(struct nvkm_subdev *subdev)

{

	struct nvkm_bus *bus = nvkm_bus(subdev);

	u32 stat = nv_rd32(bus, 0x001100) & nv_rd32(bus, 0x001140);

	u32 gpio = nv_rd32(bus, 0x001104) & nv_rd32(bus, 0x001144);

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

	u32 stat = nvkm_rd32(device, 0x001100) & nvkm_rd32(device, 0x001140);

	u32 gpio = nvkm_rd32(device, 0x001104) & nvkm_rd32(device, 0x001144);



	if (gpio) {

		subdev = nvkm_subdev(bus, NVDEV_SUBDEV_GPIO);
@@ -38,15 +39,15 @@ nv31_bus_intr(struct nvkm_subdev *subdev) 
	}



	if (stat & 0x00000008) {  /* NV41- */

		u32 addr = nv_rd32(bus, 0x009084);

		u32 data = nv_rd32(bus, 0x009088);

		u32 addr = nvkm_rd32(device, 0x009084);

		u32 data = nvkm_rd32(device, 0x009088);



		nv_error(bus, "MMIO %s of 0x%08x FAULT at 0x%06x\n",

			 (addr & 0x00000002) ? "write" : "read", data,

			 (addr & 0x00fffffc));



		stat &= ~0x00000008;

		nv_wr32(bus, 0x001100, 0x00000008);

		nvkm_wr32(device, 0x001100, 0x00000008);

	}



	if (stat & 0x00070000) {
@@ -54,12 +55,12 @@ nv31_bus_intr(struct nvkm_subdev *subdev) 
		if (subdev && subdev->intr)

			subdev->intr(subdev);

		stat &= ~0x00070000;

		nv_wr32(bus, 0x001100, 0x00070000);

		nvkm_wr32(device, 0x001100, 0x00070000);

	}



	if (stat) {

		nv_error(bus, "unknown intr 0x%08x\n", stat);

		nv_mask(bus, 0x001140, stat, 0x00000000);

		nvkm_mask(device, 0x001140, stat, 0x00000000);

	}

}
@@ -67,14 +68,15 @@ static int 
nv31_bus_init(struct nvkm_object *object)

{

	struct nvkm_bus *bus = (void *)object;

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

	int ret;



	ret = nvkm_bus_init(bus);

	if (ret)

		return ret;



	nv_wr32(bus, 0x001100, 0xffffffff);

	nv_wr32(bus, 0x001140, 0x00070008);

	nvkm_wr32(device, 0x001100, 0xffffffff);

	nvkm_wr32(device, 0x001140, 0x00070008);

	return 0;

}