hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

drm/nouveau/bios/devinit: rename INIT_DP_CONDITION to INIT_GENERIC_CONDITION 

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2016-02-18 04:03:39 +10:00
parent 96aedd0ba9
commit 989f578473
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c
View 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 static void
init_dp_condition(struct nvbios_init *init) init_generic_condition(struct nvbios_init *init)
{ {
struct nvkm_bios *bios = init->bios; struct nvkm_bios *bios = init->bios;
struct nvbios_dpout info; struct nvbios_dpout info;
@ -799,7 +799,7 @@ init_dp_condition(struct nvbios_init *init)
u8 ver, hdr, cnt, len; u8 ver, hdr, cnt, len;
u16 data; 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; init->offset += 3;
switch (cond) { switch (cond) {
@ -828,7 +828,7 @@ init_dp_condition(struct nvbios_init *init)
init_exec_set(init, false); init_exec_set(init, false);
break; break;
default: default:
warn("unknown dp condition 0x%02x\n", cond); warn("INIT_GENERIC_CONDITON: unknown 0x%02x\n", cond);
break; break;
} }
} }
@ -2205,7 +2205,7 @@ static struct nvbios_init_opcode {
[0x37] = { init_copy }, [0x37] = { init_copy },
[0x38] = { init_not }, [0x38] = { init_not },
[0x39] = { init_io_flag_condition }, [0x39] = { init_io_flag_condition },
[0x3a] = { init_dp_condition }, [0x3a] = { init_generic_condition },
[0x3b] = { init_io_mask_or }, [0x3b] = { init_io_mask_or },
[0x3c] = { init_io_or }, [0x3c] = { init_io_or },
[0x47] = { init_andn_reg }, [0x47] = { init_andn_reg },