Subject: [folded-merged] drm-nouveau-make-vga_switcheroo-code-depend-on-vga_switcheroo-fix.patch removed from -mm tree
To: rdunlap@xxxxxxxxxxxxx,airlied@xxxxxxxx,bskeggs@xxxxxxxxxx,jeffm@xxxxxxxx,jslaby@xxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Fri, 15 Nov 2013 14:14:17 -0800
The patch titled
Subject: nouveau: fix build eror when VGA_SWITCHEROO is not enabled
has been removed from the -mm tree. Its filename was
drm-nouveau-make-vga_switcheroo-code-depend-on-vga_switcheroo-fix.patch
This patch was dropped because it was folded into drm-nouveau-make-vga_switcheroo-code-depend-on-vga_switcheroo.patch
------------------------------------------------------
From: Randy Dunlap <rdunlap@xxxxxxxxxxxxx>
Subject: nouveau: fix build eror when VGA_SWITCHEROO is not enabled
Fix nouveau build error on x86, when ACPI is enabled but VGA_SWITCHEROO is
not enabled, by providing a stub function.
drivers/built-in.o: In function `nouveau_pmops_runtime_suspend':
nouveau_drm.c:(.text+0x3aac89): undefined reference to `nouveau_switcheroo_optimus_dsm'
Signed-off-by: Randy Dunlap <rdunlap@xxxxxxxxxxxxx>
Cc: Ben Skeggs <bskeggs@xxxxxxxxxx>
Cc: Jeff Mahoney <jeffm@xxxxxxxx>
Cc: Jiri Slaby <jslaby@xxxxxxx>
Cc: David Airlie <airlied@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/nouveau/nouveau_acpi.c | 1 +
1 file changed, 1 insertion(+)
diff -puN drivers/gpu/drm/nouveau/nouveau_acpi.c~drm-nouveau-make-vga_switcheroo-code-depend-on-vga_switcheroo-fix drivers/gpu/drm/nouveau/nouveau_acpi.c
--- a/drivers/gpu/drm/nouveau/nouveau_acpi.c~drm-nouveau-make-vga_switcheroo-code-depend-on-vga_switcheroo-fix
+++ a/drivers/gpu/drm/nouveau/nouveau_acpi.c
@@ -380,6 +380,7 @@ void nouveau_unregister_dsm_handler(void
#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 */
_
Patches currently in -mm which might be from rdunlap@xxxxxxxxxxxxx are
origin.patch
drm-nouveau-make-vga_switcheroo-code-depend-on-vga_switcheroo.patch
mtd-cmdlinepart-use-cmdline-partition-parser-lib-fix.patch
linux-next.patch
debugging-keep-track-of-page-owners-fix-2.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
