i915: hotplug events gone wild

Commit Message

Andrew Lutomirski Jan. 31, 2010, 3:02 a.m. UTC

None

Patch

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 0c67924..d0977ea 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -1618,7 +1618,7 @@  i915_add_request(struct drm_device *dev, struct
drm_file *file_priv,
 	OUT_RING(MI_USER_INTERRUPT);
 	ADVANCE_LP_RING();

-	DRM_DEBUG_DRIVER("%d\n", seqno);
+	//DRM_DEBUG_DRIVER("%d\n", seqno);

 	request->seqno = seqno;
 	request->emitted_jiffies = jiffies;
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 89a071a..920ec44 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -266,6 +266,7 @@  static void i915_hotplug_work_func(struct work_struct *work)
 		}
 	}
 	/* Just fire off a uevent and let userspace tell us what to do */
+	printk(KERN_ERR, "i915 uevent: i915_hotplug_work_func\n");
 	drm_sysfs_hotplug_event(dev);
 }

diff --git a/drivers/gpu/drm/i915/intel_display.c
b/drivers/gpu/drm/i915/intel_display.c
index 45da78e..f2040bf 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -3759,7 +3759,7 @@  static void intel_gpu_idle_timer(unsigned long arg)
 	struct drm_device *dev = (struct drm_device *)arg;
 	drm_i915_private_t *dev_priv = dev->dev_private;

-	DRM_DEBUG_DRIVER("idle timer fired, downclocking\n");
+	//DRM_DEBUG_DRIVER("idle timer fired, downclocking\n");

 	dev_priv->busy = false;

@@ -3774,7 +3774,7 @@  static void intel_crtc_idle_timer(unsigned long arg)
 	struct drm_crtc *crtc = &intel_crtc->base;
 	drm_i915_private_t *dev_priv = crtc->dev->dev_private;

-	DRM_DEBUG_DRIVER("idle timer fired, downclocking\n");
+	//DRM_DEBUG_DRIVER("idle timer fired, downclocking\n");

 	intel_crtc->busy = false;
_______________________________________________