projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drm/nouveau/bios/devinit: rename INIT_DP_CONDITION to INIT_GENERIC_CONDITION
[cascardo/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
a7d69ce
..
c99b667
100644
(file)
--- 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
*
*/
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;
{
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;
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) {
init->offset += 3;
switch (cond) {
@@
-828,7
+828,7
@@
init_dp_condition(struct nvbios_init *init)
init_exec_set(init, false);
break;
default:
init_exec_set(init, false);
break;
default:
- warn("
unknown dp conditio
n 0x%02x\n", cond);
+ warn("
INIT_GENERIC_CONDITON: unknow
n 0x%02x\n", cond);
break;
}
}
break;
}
}
@@
-2205,7
+2205,7
@@
static struct nvbios_init_opcode {
[0x37] = { init_copy },
[0x38] = { init_not },
[0x39] = { init_io_flag_condition },
[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 },
[0x3b] = { init_io_mask_or },
[0x3c] = { init_io_or },
[0x47] = { init_andn_reg },