summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2016-02-18 04:03:39 +1000
committerBen Skeggs <bskeggs@redhat.com>2016-03-14 10:13:17 +1000
commit989f57847396d1d042204747985d6aacf5399c8a (patch)
tree2a043c39eb2fed6d4ead80a90a33ab2c3a611b32 /drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c
parent96aedd0ba9122a13fd0f756e022856ce7f05f086 (diff)
downloadblackbird-obmc-linux-989f57847396d1d042204747985d6aacf5399c8a.tar.gz
blackbird-obmc-linux-989f57847396d1d042204747985d6aacf5399c8a.zip
drm/nouveau/bios/devinit: rename INIT_DP_CONDITION to INIT_GENERIC_CONDITION
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c')
-rw-r--r--drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c
index a7d69ce7abc1..c99b6676171b 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c
@@ -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 },
OpenPOWER on IntegriCloud