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 <tcrawford@system76.com>

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
+	// Set primary display to hybrid graphics
-	memupd->FspmConfig.PrimaryDisplay = 0;
+	memupd->FspmConfig.PrimaryDisplay = 4;
 
 	cannonlake_memcfg_init(&memupd->FspmConfig, &memcfg);
 }

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
+	// Set primary display to hybrid graphics
-	mupd->FspmConfig.PrimaryDisplay = 0;
+	mupd->FspmConfig.PrimaryDisplay = 4;
 
 	mupd->FspmConfig.DmiMaxLinkSpeed = 4;
 	mupd->FspmConfig.GpioOverride = 0;

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
+	// Set primary display to hybrid graphics
-	mupd->FspmConfig.PrimaryDisplay = 0;
+	mupd->FspmConfig.PrimaryDisplay = 4;
 
 	mupd->FspmConfig.DmiMaxLinkSpeed = 4;
 	mupd->FspmConfig.GpioOverride = 0;

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
+	// Set primary display to hybrid graphics
-	mupd->FspmConfig.PrimaryDisplay = 0;
+	mupd->FspmConfig.PrimaryDisplay = 4;
 
 	mupd->FspmConfig.PchHdaAudioLinkHdaEnable = 1;
 	mupd->FspmConfig.DmiMaxLinkSpeed = 4;

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
+	// Set primary display to hybrid graphics
-	mupd->FspmConfig.PrimaryDisplay = 0;
+	mupd->FspmConfig.PrimaryDisplay = 4;
 
 	mupd->FspmConfig.PchHdaAudioLinkHdaEnable = 1;
 	mupd->FspmConfig.DmiMaxLinkSpeed = 4;

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
+	// Set primary display to hybrid graphics
-	memupd->FspmConfig.PrimaryDisplay = 0;
+	memupd->FspmConfig.PrimaryDisplay = 4;
 
 	cannonlake_memcfg_init(&memupd->FspmConfig, &memcfg);
 }

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
+	// Set primary display to hybrid graphics
-	memupd->FspmConfig.PrimaryDisplay = 0;
+	memupd->FspmConfig.PrimaryDisplay = 4;
 
 	// Allow memory speeds higher than 2666 MT/s
 	memupd->FspmConfig.SaOcSupport = 1;

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
+	// Set primary display to hybrid graphics
-	memupd->FspmConfig.PrimaryDisplay = 0;
+	memupd->FspmConfig.PrimaryDisplay = 4;
 
 	variant_configure_fspm(memupd);
 

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

@@ -33,8 +33,8 @@ void mainboard_memory_init_params(FSPM_UPD *mupd)
 	// Enable dGPU power
 	nvidia_set_power(&config);
 
-	// Set primary display to internal graphics
+	// Set primary display to hybrid graphics
-	mupd->FspmConfig.PrimaryDisplay = 0;
+	mupd->FspmConfig.PrimaryDisplay = 4;
 
 	mupd->FspmConfig.DmiMaxLinkSpeed = 4;
 	mupd->FspmConfig.GpioOverride = 0;

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

@@ -33,8 +33,8 @@ void mainboard_memory_init_params(FSPM_UPD *mupd)
 	// Enable dGPU power
 	nvidia_set_power(&config);
 
-	// Set primary display to internal graphics
+	// Set primary display to hybrid graphics
-	mupd->FspmConfig.PrimaryDisplay = 0;
+	mupd->FspmConfig.PrimaryDisplay = 4;
 
 	mupd->FspmConfig.DmiMaxLinkSpeed = 4;
 	mupd->FspmConfig.GpioOverride = 0;

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
+	// Set primary display to hybrid graphics
-	mupd->FspmConfig.PrimaryDisplay = 0;
+	mupd->FspmConfig.PrimaryDisplay = 4;
 
 	mupd->FspmConfig.DmiMaxLinkSpeed = 4;
 	mupd->FspmConfig.GpioOverride = 0;

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
+	// Set primary display to hybrid graphics
-	mupd->FspmConfig.PrimaryDisplay = 0;
+	mupd->FspmConfig.PrimaryDisplay = 4;
 
 	mupd->FspmConfig.DmiMaxLinkSpeed = 4;
 	mupd->FspmConfig.GpioOverride = 0;

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
+	// Set primary display to hybrid graphics
-	mupd->FspmConfig.PrimaryDisplay = 0;
+	mupd->FspmConfig.PrimaryDisplay = 4;
 
 	mupd->FspmConfig.DmiMaxLinkSpeed = 4;
 	mupd->FspmConfig.GpioOverride = 0;

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

@@ -34,8 +34,8 @@ void mainboard_memory_init_params(FSPM_UPD *mupd)
 	// Enable dGPU power
 	nvidia_set_power(&config);
 
-	// Set primary display to internal graphics
+	// Set primary display to hybrid graphics
-	mupd->FspmConfig.PrimaryDisplay = 0;
+	mupd->FspmConfig.PrimaryDisplay = 4;
 
 	variant_memory_init_params(mupd);
 

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

@@ -29,6 +29,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;
 
 	memcfg_init(mupd, &board_cfg, &spd_info, half_populated);