Commit e05e06cd authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/privring: ack interrupts the same way as RM 



Whatever it is that we were doing before doesn't work on Ampere.

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

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

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

 */

#include "priv.h"

#include <subdev/timer.h>



static void

gf100_ibus_intr_hub(struct nvkm_subdev *ibus, int i)
@@ -31,7 +32,6 @@ gf100_ibus_intr_hub(struct nvkm_subdev *ibus, int i) 
	u32 data = nvkm_rd32(device, 0x122124 + (i * 0x0400));

	u32 stat = nvkm_rd32(device, 0x122128 + (i * 0x0400));

	nvkm_debug(ibus, "HUB%d: %06x %08x (%08x)\n", i, addr, data, stat);

	nvkm_mask(device, 0x122128 + (i * 0x0400), 0x00000200, 0x00000000);

}



static void
@@ -42,7 +42,6 @@ gf100_ibus_intr_rop(struct nvkm_subdev *ibus, int i) 
	u32 data = nvkm_rd32(device, 0x124124 + (i * 0x0400));

	u32 stat = nvkm_rd32(device, 0x124128 + (i * 0x0400));

	nvkm_debug(ibus, "ROP%d: %06x %08x (%08x)\n", i, addr, data, stat);

	nvkm_mask(device, 0x124128 + (i * 0x0400), 0x00000200, 0x00000000);

}



static void
@@ -53,7 +52,6 @@ gf100_ibus_intr_gpc(struct nvkm_subdev *ibus, int i) 
	u32 data = nvkm_rd32(device, 0x128124 + (i * 0x0400));

	u32 stat = nvkm_rd32(device, 0x128128 + (i * 0x0400));

	nvkm_debug(ibus, "GPC%d: %06x %08x (%08x)\n", i, addr, data, stat);

	nvkm_mask(device, 0x128128 + (i * 0x0400), 0x00000200, 0x00000000);

}



void
@@ -90,6 +88,12 @@ gf100_ibus_intr(struct nvkm_subdev *ibus) 
			intr1 &= ~stat;

		}

	}



	nvkm_mask(device, 0x121c4c, 0x0000003f, 0x00000002);

	nvkm_msec(device, 2000,

		if (!(nvkm_rd32(device, 0x121c4c) & 0x0000003f))

			break;

	);

}



static int

drivers/gpu/drm/nouveau/nvkm/subdev/ibus/gk104.c

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

 */

#include "priv.h"

#include <subdev/timer.h>



static void

gk104_ibus_intr_hub(struct nvkm_subdev *ibus, int i)
@@ -31,7 +32,6 @@ gk104_ibus_intr_hub(struct nvkm_subdev *ibus, int i) 
	u32 data = nvkm_rd32(device, 0x122124 + (i * 0x0800));

	u32 stat = nvkm_rd32(device, 0x122128 + (i * 0x0800));

	nvkm_debug(ibus, "HUB%d: %06x %08x (%08x)\n", i, addr, data, stat);

	nvkm_mask(device, 0x122128 + (i * 0x0800), 0x00000200, 0x00000000);

}



static void
@@ -42,7 +42,6 @@ gk104_ibus_intr_rop(struct nvkm_subdev *ibus, int i) 
	u32 data = nvkm_rd32(device, 0x124124 + (i * 0x0800));

	u32 stat = nvkm_rd32(device, 0x124128 + (i * 0x0800));

	nvkm_debug(ibus, "ROP%d: %06x %08x (%08x)\n", i, addr, data, stat);

	nvkm_mask(device, 0x124128 + (i * 0x0800), 0x00000200, 0x00000000);

}



static void
@@ -53,7 +52,6 @@ gk104_ibus_intr_gpc(struct nvkm_subdev *ibus, int i) 
	u32 data = nvkm_rd32(device, 0x128124 + (i * 0x0800));

	u32 stat = nvkm_rd32(device, 0x128128 + (i * 0x0800));

	nvkm_debug(ibus, "GPC%d: %06x %08x (%08x)\n", i, addr, data, stat);

	nvkm_mask(device, 0x128128 + (i * 0x0800), 0x00000200, 0x00000000);

}



void
@@ -90,6 +88,12 @@ gk104_ibus_intr(struct nvkm_subdev *ibus) 
			intr1 &= ~stat;

		}

	}



	nvkm_mask(device, 0x12004c, 0x0000003f, 0x00000002);

	nvkm_msec(device, 2000,

		if (!(nvkm_rd32(device, 0x12004c) & 0x0000003f))

			break;

	);

}



static int