leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/nouveau/bios/init: label existing INIT_GENERIC_CONDITION types

Browse Source 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2019-02-12 22:28:13 +10:00
parent c774ce66c5
commit 81f2bb5d65
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c
View File

@ -806,12 +806,12 @@ init_generic_condition(struct nvbios_init *init)
init->offset += 3; init->offset += 3;
switch (cond) { switch (cond) {
case 0: case 0: /* CONDITION_ID_INT_DP. */
if (init_conn(init) != DCB_CONNECTOR_eDP) if (init_conn(init) != DCB_CONNECTOR_eDP)
init_exec_set(init, false); init_exec_set(init, false);
break; break;
case 1: case 1: /* CONDITION_ID_USE_SPPLL0. */
case 2: case 2: /* CONDITION_ID_USE_SPPLL1. */
if ( init->outp && if ( init->outp &&
(data = nvbios_dpout_match(bios, DCB_OUTPUT_DP, (data = nvbios_dpout_match(bios, DCB_OUTPUT_DP,
(init->outp->or << 0) | (init->outp->or << 0) |
@ -826,7 +826,7 @@ init_generic_condition(struct nvbios_init *init)
if (init_exec(init)) if (init_exec(init))
warn("script needs dp output table data\n"); warn("script needs dp output table data\n");
break; break;
case 5: case 5: /* CONDITION_ID_ASSR_SUPPORT. */
if (!(init_rdauxr(init, 0x0d) & 1)) if (!(init_rdauxr(init, 0x0d) & 1))
init_exec_set(init, false); init_exec_set(init, false);
break; break;