drm/nouveau/bios/devinit: rename INIT_DP_CONDITION to INIT_GENERIC_CONDITION
authorBen Skeggs <bskeggs@redhat.com>
Wed, 17 Feb 2016 18:03:39 +0000 (04:03 +1000)
committerBen Skeggs <bskeggs@redhat.com>
Mon, 14 Mar 2016 00:13:17 +0000 (10:13 +1000)
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c

index a7d69ce7abc1ad33b5fd283a5f4b5321feb89f18..c99b6676171bacb49ac9d1786a90f35da4c59e2c 100644 (file)
@@ -786,11 +786,11 @@ init_io_flag_condition(struct nvbios_init *init)
 }
 
 /**
- * INIT_DP_CONDITION - opcode 0x3a
+ * INIT_GENERIC_CONDITION - opcode 0x3a
  *
  */
 static void
-init_dp_condition(struct nvbios_init *init)
+init_generic_condition(struct nvbios_init *init)
 {
        struct nvkm_bios *bios = init->bios;
        struct nvbios_dpout info;
@@ -799,7 +799,7 @@ init_dp_condition(struct nvbios_init *init)
        u8  ver, hdr, cnt, len;
        u16 data;
 
-       trace("DP_CONDITION\t0x%02x 0x%02x\n", cond, unkn);
+       trace("GENERIC_CONDITION\t0x%02x 0x%02x\n", cond, unkn);
        init->offset += 3;
 
        switch (cond) {
@@ -828,7 +828,7 @@ init_dp_condition(struct nvbios_init *init)
                        init_exec_set(init, false);
                break;
        default:
-               warn("unknown dp condition 0x%02x\n", cond);
+               warn("INIT_GENERIC_CONDITON: unknown 0x%02x\n", cond);
                break;
        }
 }
@@ -2205,7 +2205,7 @@ static struct nvbios_init_opcode {
        [0x37] = { init_copy },
        [0x38] = { init_not },
        [0x39] = { init_io_flag_condition },
-       [0x3a] = { init_dp_condition },
+       [0x3a] = { init_generic_condition },
        [0x3b] = { init_io_mask_or },
        [0x3c] = { init_io_or },
        [0x47] = { init_andn_reg },