mb/system76: Set PrimaryDisplay to hybrid graphics

crawfxrd · crawfxrd · commit 37e6e64d0d55 · 2023-06-19T16:01:02.000-06:00
Use the FSP option for (muxless) hybrid graphics. Internally it ends up
setting PrimaryDisplay to iGFX, but does some extra configuration for
the dGPU.

Change-Id: I24c5bc154df127fc5c16a388fc7ae4316167ba70
Signed-off-by: Tim Crawford &lt;tcrawford@system76.com&gt;
diff --git a/src/mainboard/system76/addw1/romstage.c b/src/mainboard/system76/addw1/romstage.c
@@ -31,8 +31,8 @@ void mainboard_memory_init_params(FSPM_UPD *memupd)
 	// Enable dGPU power
 	nvidia_set_power(&config);
 
-	// Set primary display to internal graphics
-	memupd->FspmConfig.PrimaryDisplay = 0;
+	// Set primary display to hybrid graphics
+	memupd->FspmConfig.PrimaryDisplay = 4;
 
 	// Disable higher memory speeds
 	memupd->FspmConfig.SaOcSupport = 0;
diff --git a/src/mainboard/system76/adl/variants/gaze17-3050/romstage.c b/src/mainboard/system76/adl/variants/gaze17-3050/romstage.c
@@ -27,8 +27,8 @@ void mainboard_memory_init_params(FSPM_UPD *mupd)
 	// Enable dGPU power
 	nvidia_set_power(&config);
 
-	// Set primary display to internal graphics
-	mupd->FspmConfig.PrimaryDisplay = 0;
+	// Set primary display to hybrid graphics
+	mupd->FspmConfig.PrimaryDisplay = 4;
 
 	mupd->FspmConfig.PchHdaAudioLinkHdaEnable = 1;
 	mupd->FspmConfig.DmiMaxLinkSpeed = 4;
diff --git a/src/mainboard/system76/adl/variants/gaze17-3060-b/romstage.c b/src/mainboard/system76/adl/variants/gaze17-3060-b/romstage.c
@@ -27,8 +27,8 @@ void mainboard_memory_init_params(FSPM_UPD *mupd)
 	// Enable dGPU power
 	nvidia_set_power(&config);
 
-	// Set primary display to internal graphics
-	mupd->FspmConfig.PrimaryDisplay = 0;
+	// Set primary display to hybrid graphics
+	mupd->FspmConfig.PrimaryDisplay = 4;
 
 	mupd->FspmConfig.PchHdaAudioLinkHdaEnable = 1;
 	mupd->FspmConfig.DmiMaxLinkSpeed = 4;
diff --git a/src/mainboard/system76/adl/variants/oryp10/romstage.c b/src/mainboard/system76/adl/variants/oryp10/romstage.c
@@ -30,8 +30,8 @@ void mainboard_memory_init_params(FSPM_UPD *mupd)
 	// Enable dGPU power
 	nvidia_set_power(&config);
 
-	// Set primary display to internal graphics
-	mupd->FspmConfig.PrimaryDisplay = 0;
+	// Set primary display to hybrid graphics
+	mupd->FspmConfig.PrimaryDisplay = 4;
 
 	mupd->FspmConfig.PchHdaAudioLinkHdaEnable = 1;
 	mupd->FspmConfig.DmiMaxLinkSpeed = 4;
diff --git a/src/mainboard/system76/adl/variants/oryp9/romstage.c b/src/mainboard/system76/adl/variants/oryp9/romstage.c
@@ -27,8 +27,8 @@ void mainboard_memory_init_params(FSPM_UPD *mupd)
 	// Enable dGPU power
 	nvidia_set_power(&config);
 
-	// Set primary display to internal graphics
-	mupd->FspmConfig.PrimaryDisplay = 0;
+	// Set primary display to hybrid graphics
+	mupd->FspmConfig.PrimaryDisplay = 4;
 
 	mupd->FspmConfig.PchHdaAudioLinkHdaEnable = 1;
 	mupd->FspmConfig.DmiMaxLinkSpeed = 4;
diff --git a/src/mainboard/system76/gaze15/romstage.c b/src/mainboard/system76/gaze15/romstage.c
@@ -31,8 +31,8 @@ void mainboard_memory_init_params(FSPM_UPD *memupd)
 	// Enable dGPU power
 	nvidia_set_power(&config);
 
-	// Set primary display to internal graphics
-	memupd->FspmConfig.PrimaryDisplay = 0;
+	// Set primary display to hybrid graphics
+	memupd->FspmConfig.PrimaryDisplay = 4;
 
 	cannonlake_memcfg_init(&memupd->FspmConfig, &memcfg);
 }
diff --git a/src/mainboard/system76/oryp5/romstage.c b/src/mainboard/system76/oryp5/romstage.c
@@ -31,8 +31,8 @@ void mainboard_memory_init_params(FSPM_UPD *memupd)
 	// Enable dGPU power
 	nvidia_set_power(&config);
 
-	// Set primary display to internal graphics
-	memupd->FspmConfig.PrimaryDisplay = 0;
+	// Set primary display to hybrid graphics
+	memupd->FspmConfig.PrimaryDisplay = 4;
 
 	// Allow memory speeds higher than 2666 MT/s
 	memupd->FspmConfig.SaOcSupport = 1;
diff --git a/src/mainboard/system76/oryp6/romstage.c b/src/mainboard/system76/oryp6/romstage.c
@@ -32,8 +32,8 @@ void mainboard_memory_init_params(FSPM_UPD *memupd)
 	// Enable dGPU power
 	nvidia_set_power(&config);
 
-	// Set primary display to internal graphics
-	memupd->FspmConfig.PrimaryDisplay = 0;
+	// Set primary display to hybrid graphics
+	memupd->FspmConfig.PrimaryDisplay = 4;
 
 	variant_configure_fspm(memupd);
 
diff --git a/src/mainboard/system76/rpl/variants/addw3/romstage.c b/src/mainboard/system76/rpl/variants/addw3/romstage.c
@@ -32,8 +32,8 @@ void mainboard_memory_init_params(FSPM_UPD *mupd)
 	// Enable dGPU power
 	nvidia_set_power(&config);
 
-	// Set primary display to internal graphics
-	mupd->FspmConfig.PrimaryDisplay = 0;
+	// Set primary display to hybrid graphics
+	mupd->FspmConfig.PrimaryDisplay = 4;
 
 	mupd->FspmConfig.PchHdaAudioLinkHdaEnable = 1;
 	mupd->FspmConfig.DmiMaxLinkSpeed = 4;
diff --git a/src/mainboard/system76/rpl/variants/bonw15/romstage.c b/src/mainboard/system76/rpl/variants/bonw15/romstage.c
@@ -32,8 +32,8 @@ void mainboard_memory_init_params(FSPM_UPD *mupd)
 	// Enable dGPU power
 	nvidia_set_power(&config);
 
-	// Set primary display to internal graphics
-	mupd->FspmConfig.PrimaryDisplay = 0;
+	// Set primary display to hybrid graphics
+	mupd->FspmConfig.PrimaryDisplay = 4;
 
 	mupd->FspmConfig.PchHdaAudioLinkHdaEnable = 1;
 	mupd->FspmConfig.DmiMaxLinkSpeed = 4;
diff --git a/src/mainboard/system76/rpl/variants/gaze18/romstage.c b/src/mainboard/system76/rpl/variants/gaze18/romstage.c
@@ -30,8 +30,8 @@ void mainboard_memory_init_params(FSPM_UPD *mupd)
 	// Enable dGPU power
 	nvidia_set_power(&config);
 
-	// Set primary display to internal graphics
-	mupd->FspmConfig.PrimaryDisplay = 0;
+	// Set primary display to hybrid graphics
+	mupd->FspmConfig.PrimaryDisplay = 4;
 
 	mupd->FspmConfig.PchHdaAudioLinkHdaEnable = 1;
 	mupd->FspmConfig.DmiMaxLinkSpeed = 4;
diff --git a/src/mainboard/system76/rpl/variants/oryp11/romstage.c b/src/mainboard/system76/rpl/variants/oryp11/romstage.c
@@ -30,8 +30,8 @@ void mainboard_memory_init_params(FSPM_UPD *mupd)
 	// Enable dGPU power
 	nvidia_set_power(&config);
 
-	// Set primary display to internal graphics
-	mupd->FspmConfig.PrimaryDisplay = 0;
+	// Set primary display to hybrid graphics
+	mupd->FspmConfig.PrimaryDisplay = 4;
 
 	mupd->FspmConfig.PchHdaAudioLinkHdaEnable = 1;
 	mupd->FspmConfig.DmiMaxLinkSpeed = 4;
diff --git a/src/mainboard/system76/rpl/variants/serw13/romstage.c b/src/mainboard/system76/rpl/variants/serw13/romstage.c
@@ -32,8 +32,8 @@ void mainboard_memory_init_params(FSPM_UPD *mupd)
 	// Enable dGPU power
 	nvidia_set_power(&config);
 
-	// Set primary display to internal graphics
-	mupd->FspmConfig.PrimaryDisplay = 0;
+	// Set primary display to hybrid graphics
+	mupd->FspmConfig.PrimaryDisplay = 4;
 
 	mupd->FspmConfig.PchHdaAudioLinkHdaEnable = 1;
 	mupd->FspmConfig.DmiMaxLinkSpeed = 4;
diff --git a/src/mainboard/system76/tgl-h/romstage.c b/src/mainboard/system76/tgl-h/romstage.c
@@ -38,8 +38,8 @@ void mainboard_memory_init_params(FSPM_UPD *mupd)
 	// Enable dGPU power
 	nvidia_set_power(&config);
 
-	// Set primary display to internal graphics
-	mupd->FspmConfig.PrimaryDisplay = 0;
+	// Set primary display to hybrid graphics
+	mupd->FspmConfig.PrimaryDisplay = 4;
 
 	memcfg_init(mupd, &board_cfg, &spd_info, half_populated);
 }
diff --git a/src/mainboard/system76/tgl-u/variants/galp5/romstage.c b/src/mainboard/system76/tgl-u/variants/galp5/romstage.c
@@ -30,6 +30,7 @@ void mainboard_memory_init_params(FSPM_UPD *mupd)
 	nvidia_set_power(&config);
 
 	// Set primary display to internal graphics
+	// NOTE: Use iGFX as some units don't have a dGPU for hybrid graphics
 	mupd->FspmConfig.PrimaryDisplay = 0;
 
 	// Allow memory clocks higher than 2933 MHz

Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,8 @@ void mainboard_memory_init_params(FSPM_UPD *memupd)`
`31`	`31`	`// Enable dGPU power`
`32`	`32`	`nvidia_set_power(&config);`
`33`	`33`
`34`		`- // Set primary display to internal graphics`
`35`		`- memupd->FspmConfig.PrimaryDisplay = 0;`
	`34`	`+ // Set primary display to hybrid graphics`
	`35`	`+ memupd->FspmConfig.PrimaryDisplay = 4;`
`36`	`36`
`37`	`37`	`cannonlake_memcfg_init(&memupd->FspmConfig, &memcfg);`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,8 +38,8 @@ void mainboard_memory_init_params(FSPM_UPD *mupd)`
`38`	`38`	`// Enable dGPU power`
`39`	`39`	`nvidia_set_power(&config);`
`40`	`40`
`41`		`- // Set primary display to internal graphics`
`42`		`- mupd->FspmConfig.PrimaryDisplay = 0;`
	`41`	`+ // Set primary display to hybrid graphics`
	`42`	`+ mupd->FspmConfig.PrimaryDisplay = 4;`
`43`	`43`
`44`	`44`	`memcfg_init(mupd, &board_cfg, &spd_info, half_populated);`
`45`	`45`	`}`