Attachment 147358 Details for Bug 193500 – Fix/workaround for interrupt storm on GM45 when loading i915kms

[patch] Fix/workaround for interrupt storm on GM45 when loading i915kms

fix-for-interrupt-storm-on-gm45.patch (text/plain), 1.43 KB, created by Jan Kokemüller on 2014-09-15 17:31:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Kokemüller

Created: 2014-09-15 17:31:50 UTC

Size: 1.43 KB

patch

obsolete

>diff --git a/sys/dev/drm2/i915/i915_dma.c b/sys/dev/drm2/i915/i915_dma.c
>index 24cd2cd..d5c7874 100644
>--- a/sys/dev/drm2/i915/i915_dma.c
>+++ b/sys/dev/drm2/i915/i915_dma.c
>@@ -1295,6 +1295,12 @@ i915_driver_load(struct drm_device *dev, unsigned long flags)
> 		}
> 	}
> 
>+	if (IS_GM45(dev)) {
>+		dev->driver->irq_uninstall(dev);
>+		dev->driver->irq_preinstall(dev);
>+		dev->driver->irq_postinstall(dev);
>+	}
>+
> 	intel_opregion_init(dev);
> 
> 	callout_init(&dev_priv->hangcheck_timer, 1);
>diff --git a/sys/dev/drm2/i915/intel_opregion.c b/sys/dev/drm2/i915/intel_opregion.c
>index 7b02f71..16daf8d 100644
>--- a/sys/dev/drm2/i915/intel_opregion.c
>+++ b/sys/dev/drm2/i915/intel_opregion.c
>@@ -271,12 +271,14 @@ void intel_opregion_gse_intr(struct drm_device *dev)
> #define ASLE_PFIT_EN   (1<<2)
> #define ASLE_PFMB_EN   (1<<3)
> 
>+static struct intel_opregion *system_opregion;
>+
> void intel_opregion_enable_asle(struct drm_device *dev)
> {
> 	struct drm_i915_private *dev_priv = dev->dev_private;
> 	struct opregion_asle *asle = dev_priv->opregion.asle;
> 
>-	if (asle) {
>+	if (asle && system_opregion) {
> 		if (IS_MOBILE(dev))
> 			intel_enable_asle(dev);
> 
>@@ -290,8 +292,6 @@ void intel_opregion_enable_asle(struct drm_device *dev)
> #define ACPI_EV_LID            (1<<1)
> #define ACPI_EV_DOCK           (1<<2)
> 
>-static struct intel_opregion *system_opregion;
>-
> #if 0
> static int intel_opregion_video_event(struct notifier_block *nb,
> 				      unsigned long val, void *data)

Actions: View | Diff

Attachments on bug 193500: 147134 | 147135 | 147255 | 147358 | 147359 | 147363 | 147377