|
@@ -1206,7 +1206,9 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
|
|
}
|
|
}
|
|
|
|
|
|
/* Must be done after probing outputs */
|
|
/* Must be done after probing outputs */
|
|
- intel_opregion_init(dev, 0);
|
|
|
|
|
|
+ /* FIXME: verify on IGDNG */
|
|
|
|
+ if (!IS_IGDNG(dev))
|
|
|
|
+ intel_opregion_init(dev, 0);
|
|
|
|
|
|
return 0;
|
|
return 0;
|
|
|
|
|
|
@@ -1240,7 +1242,8 @@ int i915_driver_unload(struct drm_device *dev)
|
|
if (dev_priv->regs != NULL)
|
|
if (dev_priv->regs != NULL)
|
|
iounmap(dev_priv->regs);
|
|
iounmap(dev_priv->regs);
|
|
|
|
|
|
- intel_opregion_free(dev, 0);
|
|
|
|
|
|
+ if (!IS_IGDNG(dev))
|
|
|
|
+ intel_opregion_free(dev, 0);
|
|
|
|
|
|
if (drm_core_check_feature(dev, DRIVER_MODESET)) {
|
|
if (drm_core_check_feature(dev, DRIVER_MODESET)) {
|
|
intel_modeset_cleanup(dev);
|
|
intel_modeset_cleanup(dev);
|