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

Collapse All | Expand All

(-)b/sys/dev/drm2/i915/i915_dma.c (+6 lines)
Lines 1295-1300 i915_driver_load(struct drm_device *dev, unsigned long flags) Link Here
1295
		}
1295
		}
1296
	}
1296
	}
1297
1297
1298
	if (IS_GM45(dev)) {
1299
		dev->driver->irq_uninstall(dev);
1300
		dev->driver->irq_preinstall(dev);
1301
		dev->driver->irq_postinstall(dev);
1302
	}
1303
1298
	intel_opregion_init(dev);
1304
	intel_opregion_init(dev);
1299
1305
1300
	callout_init(&dev_priv->hangcheck_timer, 1);
1306
	callout_init(&dev_priv->hangcheck_timer, 1);
(-)b/sys/dev/drm2/i915/intel_opregion.c (-3 / +3 lines)
Lines 271-282 void intel_opregion_gse_intr(struct drm_device *dev) Link Here
271
#define ASLE_PFIT_EN   (1<<2)
271
#define ASLE_PFIT_EN   (1<<2)
272
#define ASLE_PFMB_EN   (1<<3)
272
#define ASLE_PFMB_EN   (1<<3)
273
273
274
static struct intel_opregion *system_opregion;
275
274
void intel_opregion_enable_asle(struct drm_device *dev)
276
void intel_opregion_enable_asle(struct drm_device *dev)
275
{
277
{
276
	struct drm_i915_private *dev_priv = dev->dev_private;
278
	struct drm_i915_private *dev_priv = dev->dev_private;
277
	struct opregion_asle *asle = dev_priv->opregion.asle;
279
	struct opregion_asle *asle = dev_priv->opregion.asle;
278
280
279
	if (asle) {
281
	if (asle && system_opregion) {
280
		if (IS_MOBILE(dev))
282
		if (IS_MOBILE(dev))
281
			intel_enable_asle(dev);
283
			intel_enable_asle(dev);
282
284
Lines 290-297 void intel_opregion_enable_asle(struct drm_device *dev) Link Here
290
#define ACPI_EV_LID            (1<<1)
292
#define ACPI_EV_LID            (1<<1)
291
#define ACPI_EV_DOCK           (1<<2)
293
#define ACPI_EV_DOCK           (1<<2)
292
294
293
static struct intel_opregion *system_opregion;
294
295
#if 0
295
#if 0
296
static int intel_opregion_video_event(struct notifier_block *nb,
296
static int intel_opregion_video_event(struct notifier_block *nb,
297
				      unsigned long val, void *data)
297
				      unsigned long val, void *data)

Return to bug 193500