drm/nouveau: consider CLASS_DISPLAY_3D devices while detecting dsm/optimus
authorEmil Velikov <emil.l.velikov@gmail.com>
Wed, 9 Oct 2013 07:25:16 +0000 (08:25 +0100)
committerDave Airlie <airlied@redhat.com>
Fri, 8 Nov 2013 06:02:47 +0000 (16:02 +1000)
commit4c60fac111961e7eb71a08928c22b43cff55f1fb
tree84c677306b4ca1c9d07a4805255219028233cad4
parent4a15cdffa96bdd19d6233a25d394d0c50ab4d539
drm/nouveau: consider CLASS_DISPLAY_3D devices while detecting dsm/optimus

The present code assumes that optimus is present whenever two
VGA (PCI_CLASS_DISPLAY_VGA) devices are present. This does not
seem to be the case of newer laptops with optimus, in which
case the nvidia gpu is a PCI_CLASS_DISPLAY_3D device.

Rework the logic so that we count both VGA and 3D devices,
when contemplating if optimus is present on the platform.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=70208
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
drivers/gpu/drm/nouveau/nouveau_acpi.c