summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.intel.com>2012-04-25 14:33:48 +0100
committerLen Brown <len.brown@intel.com>2012-06-01 13:40:55 -0400
commitc6996bdd850fb53319918487d5f674203517fdc5 (patch)
tree4cae4d09a0c4b4bfd029674e4b965a3a8ce15a52 /drivers
parentcfb46f433a4da97c31780e08a259fac2cb6bd61f (diff)
downloadlinux-stable-c6996bdd850fb53319918487d5f674203517fdc5.tar.gz
linux-stable-c6996bdd850fb53319918487d5f674203517fdc5.tar.bz2
linux-stable-c6996bdd850fb53319918487d5f674203517fdc5.zip
acpi_video: Intel video is not always i915
Stop it poking at random registers on the i740 cards that may be out there still. As per Matthew's feedback remove the conditional checks and never enable the opregion handling unless an appropriate driver has been loaded. Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/acpi/video.c20
1 files changed, 15 insertions, 5 deletions
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index 66e8f7333e9b..609262dc1258 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -1743,10 +1743,18 @@ static int acpi_video_bus_remove(struct acpi_device *device, int type)
return 0;
}
+static int __init is_i740(struct pci_dev *dev)
+{
+ if (dev->device == 0x00D1)
+ return 1;
+ if (dev->device == 0x7000)
+ return 1;
+ return 0;
+}
+
static int __init intel_opregion_present(void)
{
- int i915 = 0;
-#if defined(CONFIG_DRM_I915) || defined(CONFIG_DRM_I915_MODULE)
+ int opregion = 0;
struct pci_dev *dev = NULL;
u32 address;
@@ -1755,13 +1763,15 @@ static int __init intel_opregion_present(void)
continue;
if (dev->vendor != PCI_VENDOR_ID_INTEL)
continue;
+ /* We don't want to poke around undefined i740 registers */
+ if (is_i740(dev))
+ continue;
pci_read_config_dword(dev, 0xfc, &address);
if (!address)
continue;
- i915 = 1;
+ opregion = 1;
}
-#endif
- return i915;
+ return opregion;
}
int acpi_video_register(void)