Commit 17c602e3 authored by Alexandre Courbot's avatar Alexandre Courbot Committed by Ben Skeggs

drm/nouveau/falcon: fix IMEM port access

All IMEM registers are duplicated per port.
Signed-off-by: default avatarAlexandre Courbot <acourbot@nvidia.com>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent ca179c85
...@@ -40,8 +40,8 @@ nvkm_falcon_v1_load_imem(struct nvkm_falcon *falcon, void *data, u32 start, ...@@ -40,8 +40,8 @@ nvkm_falcon_v1_load_imem(struct nvkm_falcon *falcon, void *data, u32 start,
for (i = 0; i < size / 4; i++) { for (i = 0; i < size / 4; i++) {
/* write new tag every 256B */ /* write new tag every 256B */
if ((i & 0x3f) == 0) if ((i & 0x3f) == 0)
nvkm_falcon_wr32(falcon, 0x188, tag++); nvkm_falcon_wr32(falcon, 0x188 + (port * 16), tag++);
nvkm_falcon_wr32(falcon, 0x184, ((u32 *)data)[i]); nvkm_falcon_wr32(falcon, 0x184 + (port * 16), ((u32 *)data)[i]);
} }
/* /*
...@@ -53,14 +53,15 @@ nvkm_falcon_v1_load_imem(struct nvkm_falcon *falcon, void *data, u32 start, ...@@ -53,14 +53,15 @@ nvkm_falcon_v1_load_imem(struct nvkm_falcon *falcon, void *data, u32 start,
/* write new tag every 256B */ /* write new tag every 256B */
if ((i & 0x3f) == 0) if ((i & 0x3f) == 0)
nvkm_falcon_wr32(falcon, 0x188, tag++); nvkm_falcon_wr32(falcon, 0x188 + (port * 16), tag++);
nvkm_falcon_wr32(falcon, 0x184, extra & (BIT(rem * 8) - 1)); nvkm_falcon_wr32(falcon, 0x184 + (port * 16),
extra & (BIT(rem * 8) - 1));
++i; ++i;
} }
/* code must be padded to 0x40 words */ /* code must be padded to 0x40 words */
for (; i & 0x3f; i++) for (; i & 0x3f; i++)
nvkm_falcon_wr32(falcon, 0x184, 0); nvkm_falcon_wr32(falcon, 0x184 + (port * 16), 0);
} }
static void static void
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment