View | Details | Raw Unified | Return to bug 193500 | Differences between
and this patch

Collapse All | Expand All

(-)b/sys/dev/drm2/i915/i915_irq.c (-2 lines)
Lines 1769-1776 i915_driver_irq_postinstall(struct drm_device *dev) Link Here
1769
		I915_WRITE(PORT_HOTPLUG_EN, hotplug_en);
1769
		I915_WRITE(PORT_HOTPLUG_EN, hotplug_en);
1770
	}
1770
	}
1771
1771
1772
	intel_opregion_enable_asle(dev);
1773
1774
	return 0;
1772
	return 0;
1775
}
1773
}
1776
1774
(-)b/sys/dev/drm2/i915/intel_iic.c (-2 / +5 lines)
Lines 128-137 intel_iic_reset(struct drm_device *dev) Link Here
128
	struct drm_i915_private *dev_priv;
128
	struct drm_i915_private *dev_priv;
129
129
130
	dev_priv = dev->dev_private;
130
	dev_priv = dev->dev_private;
131
	if (HAS_PCH_SPLIT(dev))
131
	if (HAS_PCH_SPLIT(dev)) {
132
		I915_WRITE(PCH_GMBUS0, 0);
132
		I915_WRITE(PCH_GMBUS0, 0);
133
	else
133
		I915_WRITE(PCH_GMBUS4, 0);
134
	} else {
134
		I915_WRITE(GMBUS0, 0);
135
		I915_WRITE(GMBUS0, 0);
136
		I915_WRITE(GMBUS4, 0);
137
	}
135
}
138
}
136
139
137
static int
140
static int

Return to bug 193500