|
@@ -66,6 +66,7 @@ bool nouveau_is_v1_dsm(void) {
|
|
#define NOUVEAU_DSM_HAS_MUX 0x1
|
|
#define NOUVEAU_DSM_HAS_MUX 0x1
|
|
#define NOUVEAU_DSM_HAS_OPT 0x2
|
|
#define NOUVEAU_DSM_HAS_OPT 0x2
|
|
|
|
|
|
|
|
+#ifdef CONFIG_VGA_SWITCHEROO
|
|
static const char nouveau_dsm_muid[] = {
|
|
static const char nouveau_dsm_muid[] = {
|
|
0xA0, 0xA0, 0x95, 0x9D, 0x60, 0x00, 0x48, 0x4D,
|
|
0xA0, 0xA0, 0x95, 0x9D, 0x60, 0x00, 0x48, 0x4D,
|
|
0xB3, 0x4D, 0x7E, 0x5F, 0xEA, 0x12, 0x9F, 0xD4,
|
|
0xB3, 0x4D, 0x7E, 0x5F, 0xEA, 0x12, 0x9F, 0xD4,
|
|
@@ -388,6 +389,11 @@ void nouveau_unregister_dsm_handler(void)
|
|
if (nouveau_dsm_priv.optimus_detected || nouveau_dsm_priv.dsm_detected)
|
|
if (nouveau_dsm_priv.optimus_detected || nouveau_dsm_priv.dsm_detected)
|
|
vga_switcheroo_unregister_handler();
|
|
vga_switcheroo_unregister_handler();
|
|
}
|
|
}
|
|
|
|
+#else
|
|
|
|
+void nouveau_register_dsm_handler(void) {}
|
|
|
|
+void nouveau_unregister_dsm_handler(void) {}
|
|
|
|
+void nouveau_switcheroo_optimus_dsm(void) {}
|
|
|
|
+#endif
|
|
|
|
|
|
/* retrieve the ROM in 4k blocks */
|
|
/* retrieve the ROM in 4k blocks */
|
|
static int nouveau_rom_call(acpi_handle rom_handle, uint8_t *bios,
|
|
static int nouveau_rom_call(acpi_handle rom_handle, uint8_t *bios,
|