aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_dma.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/i915/i915_dma.c')
-rw-r--r--drivers/gpu/drm/i915/i915_dma.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index 0c222c28b8c1..fa105bd119a6 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -1206,7 +1206,9 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
1206 } 1206 }
1207 1207
1208 /* Must be done after probing outputs */ 1208 /* Must be done after probing outputs */
1209 intel_opregion_init(dev, 0); 1209 /* FIXME: verify on IGDNG */
1210 if (!IS_IGDNG(dev))
1211 intel_opregion_init(dev, 0);
1210 1212
1211 return 0; 1213 return 0;
1212 1214
@@ -1240,7 +1242,8 @@ int i915_driver_unload(struct drm_device *dev)
1240 if (dev_priv->regs != NULL) 1242 if (dev_priv->regs != NULL)
1241 iounmap(dev_priv->regs); 1243 iounmap(dev_priv->regs);
1242 1244
1243 intel_opregion_free(dev, 0); 1245 if (!IS_IGDNG(dev))
1246 intel_opregion_free(dev, 0);
1244 1247
1245 if (drm_core_check_feature(dev, DRIVER_MODESET)) { 1248 if (drm_core_check_feature(dev, DRIVER_MODESET)) {
1246 intel_modeset_cleanup(dev); 1249 intel_modeset_cleanup(dev);