drm/nouveau/bios/init: handle INIT_RESET_END devinit opcode

[linux.git] / drivers / gpu / drm / nouveau / nvkm / subdev / bios / init.c

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c
index ec0e9f7224b5a95bf2841058a151d8e25c273293..9de74f41dcd2a89087c6a38b32d8121e4606295b 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c
@@ -834,7 +834,7 @@ init_generic_condition(struct nvbios_init *init)
                init_exec_set(init, false);
                break;
        default:
-               warn("INIT_GENERIC_CONDITON: unknown 0x%02x\n", cond);
+               warn("INIT_GENERIC_CONDITION: unknown 0x%02x\n", cond);
                init->offset += size;
                break;
        }
@@ -1934,6 +1934,28 @@ init_ram_restrict_pll(struct nvbios_init *init)
        }
 }
 
+/**
+ * INIT_RESET_BEGUN - opcode 0x8c
+ *
+ */
+static void
+init_reset_begun(struct nvbios_init *init)
+{
+       trace("RESET_BEGUN\n");
+       init->offset += 1;
+}
+
+/**
+ * INIT_RESET_END - opcode 0x8d
+ *
+ */
+static void
+init_reset_end(struct nvbios_init *init)
+{
+       trace("RESET_END\n");
+       init->offset += 1;
+}
+
 /**
  * INIT_GPIO - opcode 0x8e
  *
@@ -2260,8 +2282,8 @@ static struct nvbios_init_opcode {
        [0x79] = { init_pll },
        [0x7a] = { init_zm_reg },
        [0x87] = { init_ram_restrict_pll },
-       [0x8c] = { init_reserved },
-       [0x8d] = { init_reserved },
+       [0x8c] = { init_reset_begun },
+       [0x8d] = { init_reset_end },
        [0x8e] = { init_gpio },
        [0x8f] = { init_ram_restrict_zm_reg_group },
        [0x90] = { init_copy_zm_reg },