Skip to content

Commit 8da0dd2

Browse files
crawfxrdcrawfxrd
committed
mb/system76: Set PrimaryDisplay to hybrid graphics
Use the FSP option for (muxless) hybrid graphics. Internally it ends up setting PrimaryDisplay to iGFX, but does some extra configuration for the dGPU. Only galp5 is left as setting PrimaryDisplay to iGFX as the dGPU was optional for the model and I don't know what effect it would have to set it to hybrid for those. Change-Id: I24c5bc154df127fc5c16a388fc7ae4316167ba70 Signed-off-by: Tim Crawford <[email protected]>
1 parent 5b13dc0 commit 8da0dd2

File tree

15 files changed

+29
-28
lines changed

15 files changed

+29
-28
lines changed

‎src/mainboard/system76/addw1/romstage.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ void mainboard_memory_init_params(FSPM_UPD *memupd)
3131
// Enable dGPU power
3232
nvidia_set_power(&config);
3333

34-
// Set primary display to internal graphics
35-
memupd->FspmConfig.PrimaryDisplay = 0;
34+
// Set primary display to hybrid graphics
35+
memupd->FspmConfig.PrimaryDisplay = 4;
3636

3737
cannonlake_memcfg_init(&memupd->FspmConfig, &memcfg);
3838
}

‎src/mainboard/system76/adl/variants/gaze17-3050/romstage.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ void mainboard_memory_init_params(FSPM_UPD *mupd)
2727
// Enable dGPU power
2828
nvidia_set_power(&config);
2929

30-
// Set primary display to internal graphics
31-
mupd->FspmConfig.PrimaryDisplay = 0;
30+
// Set primary display to hybrid graphics
31+
mupd->FspmConfig.PrimaryDisplay = 4;
3232

3333
mupd->FspmConfig.DmiMaxLinkSpeed = 4;
3434
mupd->FspmConfig.GpioOverride = 0;

‎src/mainboard/system76/adl/variants/gaze17-3060-b/romstage.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ void mainboard_memory_init_params(FSPM_UPD *mupd)
2727
// Enable dGPU power
2828
nvidia_set_power(&config);
2929

30-
// Set primary display to internal graphics
31-
mupd->FspmConfig.PrimaryDisplay = 0;
30+
// Set primary display to hybrid graphics
31+
mupd->FspmConfig.PrimaryDisplay = 4;
3232

3333
mupd->FspmConfig.DmiMaxLinkSpeed = 4;
3434
mupd->FspmConfig.GpioOverride = 0;

‎src/mainboard/system76/adl/variants/oryp10/romstage.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ void mainboard_memory_init_params(FSPM_UPD *mupd)
3030
// Enable dGPU power
3131
nvidia_set_power(&config);
3232

33-
// Set primary display to internal graphics
34-
mupd->FspmConfig.PrimaryDisplay = 0;
33+
// Set primary display to hybrid graphics
34+
mupd->FspmConfig.PrimaryDisplay = 4;
3535

3636
mupd->FspmConfig.PchHdaAudioLinkHdaEnable = 1;
3737
mupd->FspmConfig.DmiMaxLinkSpeed = 4;

‎src/mainboard/system76/adl/variants/oryp9/romstage.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ void mainboard_memory_init_params(FSPM_UPD *mupd)
2727
// Enable dGPU power
2828
nvidia_set_power(&config);
2929

30-
// Set primary display to internal graphics
31-
mupd->FspmConfig.PrimaryDisplay = 0;
30+
// Set primary display to hybrid graphics
31+
mupd->FspmConfig.PrimaryDisplay = 4;
3232

3333
mupd->FspmConfig.PchHdaAudioLinkHdaEnable = 1;
3434
mupd->FspmConfig.DmiMaxLinkSpeed = 4;

‎src/mainboard/system76/gaze15/romstage.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ void mainboard_memory_init_params(FSPM_UPD *memupd)
3131
// Enable dGPU power
3232
nvidia_set_power(&config);
3333

34-
// Set primary display to internal graphics
35-
memupd->FspmConfig.PrimaryDisplay = 0;
34+
// Set primary display to hybrid graphics
35+
memupd->FspmConfig.PrimaryDisplay = 4;
3636

3737
cannonlake_memcfg_init(&memupd->FspmConfig, &memcfg);
3838
}

‎src/mainboard/system76/oryp5/romstage.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ void mainboard_memory_init_params(FSPM_UPD *memupd)
3131
// Enable dGPU power
3232
nvidia_set_power(&config);
3333

34-
// Set primary display to internal graphics
35-
memupd->FspmConfig.PrimaryDisplay = 0;
34+
// Set primary display to hybrid graphics
35+
memupd->FspmConfig.PrimaryDisplay = 4;
3636

3737
// Allow memory speeds higher than 2666 MT/s
3838
memupd->FspmConfig.SaOcSupport = 1;

‎src/mainboard/system76/oryp6/romstage.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ void mainboard_memory_init_params(FSPM_UPD *memupd)
3232
// Enable dGPU power
3333
nvidia_set_power(&config);
3434

35-
// Set primary display to internal graphics
36-
memupd->FspmConfig.PrimaryDisplay = 0;
35+
// Set primary display to hybrid graphics
36+
memupd->FspmConfig.PrimaryDisplay = 4;
3737

3838
variant_configure_fspm(memupd);
3939

‎src/mainboard/system76/rpl/variants/addw3/romstage.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ void mainboard_memory_init_params(FSPM_UPD *mupd)
3333
// Enable dGPU power
3434
nvidia_set_power(&config);
3535

36-
// Set primary display to internal graphics
37-
mupd->FspmConfig.PrimaryDisplay = 0;
36+
// Set primary display to hybrid graphics
37+
mupd->FspmConfig.PrimaryDisplay = 4;
3838

3939
mupd->FspmConfig.DmiMaxLinkSpeed = 4;
4040
mupd->FspmConfig.GpioOverride = 0;

‎src/mainboard/system76/rpl/variants/bonw15/romstage.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ void mainboard_memory_init_params(FSPM_UPD *mupd)
3333
// Enable dGPU power
3434
nvidia_set_power(&config);
3535

36-
// Set primary display to internal graphics
37-
mupd->FspmConfig.PrimaryDisplay = 0;
36+
// Set primary display to hybrid graphics
37+
mupd->FspmConfig.PrimaryDisplay = 4;
3838

3939
mupd->FspmConfig.DmiMaxLinkSpeed = 4;
4040
mupd->FspmConfig.GpioOverride = 0;

‎src/mainboard/system76/rpl/variants/gaze18/romstage.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ void mainboard_memory_init_params(FSPM_UPD *mupd)
3030
// Enable dGPU power
3131
nvidia_set_power(&config);
3232

33-
// Set primary display to internal graphics
34-
mupd->FspmConfig.PrimaryDisplay = 0;
33+
// Set primary display to hybrid graphics
34+
mupd->FspmConfig.PrimaryDisplay = 4;
3535

3636
mupd->FspmConfig.DmiMaxLinkSpeed = 4;
3737
mupd->FspmConfig.GpioOverride = 0;

‎src/mainboard/system76/rpl/variants/oryp11/romstage.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ void mainboard_memory_init_params(FSPM_UPD *mupd)
3030
// Enable dGPU power
3131
nvidia_set_power(&config);
3232

33-
// Set primary display to internal graphics
34-
mupd->FspmConfig.PrimaryDisplay = 0;
33+
// Set primary display to hybrid graphics
34+
mupd->FspmConfig.PrimaryDisplay = 4;
3535

3636
mupd->FspmConfig.DmiMaxLinkSpeed = 4;
3737
mupd->FspmConfig.GpioOverride = 0;

‎src/mainboard/system76/rpl/variants/serw13/romstage.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ void mainboard_memory_init_params(FSPM_UPD *mupd)
3232
// Enable dGPU power
3333
nvidia_set_power(&config);
3434

35-
// Set primary display to internal graphics
36-
mupd->FspmConfig.PrimaryDisplay = 0;
35+
// Set primary display to hybrid graphics
36+
mupd->FspmConfig.PrimaryDisplay = 4;
3737

3838
mupd->FspmConfig.DmiMaxLinkSpeed = 4;
3939
mupd->FspmConfig.GpioOverride = 0;

‎src/mainboard/system76/tgl-h/romstage.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ void mainboard_memory_init_params(FSPM_UPD *mupd)
3434
// Enable dGPU power
3535
nvidia_set_power(&config);
3636

37-
// Set primary display to internal graphics
38-
mupd->FspmConfig.PrimaryDisplay = 0;
37+
// Set primary display to hybrid graphics
38+
mupd->FspmConfig.PrimaryDisplay = 4;
3939

4040
variant_memory_init_params(mupd);
4141

‎src/mainboard/system76/tgl-u/variants/galp5/romstage.c

+1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ void mainboard_memory_init_params(FSPM_UPD *mupd)
2929
nvidia_set_power(&config);
3030

3131
// Set primary display to internal graphics
32+
// NOTE: Use iGFX as some units don't have a dGPU for hybrid graphics
3233
mupd->FspmConfig.PrimaryDisplay = 0;
3334

3435
memcfg_init(mupd, &board_cfg, &spd_info, half_populated);

0 commit comments

Comments
 (0)