]> git.baikalelectronics.ru Git - kernel.git/commit
ACPI / nouveau: fix probing regression related to _DSM
authorJiang Liu <jiang.liu@linux.intel.com>
Thu, 20 Feb 2014 09:23:16 +0000 (17:23 +0800)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 20 Feb 2014 20:19:47 +0000 (21:19 +0100)
commit9306556d5cf1cb2a453fa306eb64196b26a7b2fc
treef5c085ac2ac29ecd34543394a4991d16895994d6
parentaf18dbdc538d68661a2dc170065e02fb49a2ec53
ACPI / nouveau: fix probing regression related to _DSM

Fix regression caused by commit d66cdb4, which breaks loading nouveau
driver on optimus laptops.

On some platforms, ACPI _DSM method (nouveau_op_dsm_muid, function 0)
has special requirements on the fourth parameter, which is different
from ACPI specifications. So revert to the private implementation
to check availability of _DSM functions instead of using common
acpi_check_dsm() interface.

Fixes: d66cdb45aabe (ACPI / nouveau: replace open-coded _DSM code with helper functions)
Reported-and-tested-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
[rjw: Subject]
Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
drivers/gpu/drm/nouveau/nouveau_acpi.c