Subject: + drm-nouveau-make-vga_switcheroo-code-depend-on-vga_switcheroo-fix.patch added to -mm tree To: rdunlap@xxxxxxxxxxxxx,airlied@xxxxxxxx,bskeggs@xxxxxxxxxx,jeffm@xxxxxxxx,jslaby@xxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Mon, 23 Sep 2013 11:33:30 -0700 The patch titled Subject: nouveau: fix build eror when VGA_SWITCHEROO is not enabled has been added to the -mm tree. Its filename is drm-nouveau-make-vga_switcheroo-code-depend-on-vga_switcheroo-fix.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/drm-nouveau-make-vga_switcheroo-code-depend-on-vga_switcheroo-fix.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/drm-nouveau-make-vga_switcheroo-code-depend-on-vga_switcheroo-fix.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ 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 @@ -373,6 +373,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 include-linux-of_irqh-fix-warnings-when-config_of=n.patch drm-nouveau-make-vga_switcheroo-code-depend-on-vga_switcheroo-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