From patchwork Sun Jan 31 11:49:09 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Lutomirski X-Patchwork-Id: 75962 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o0VBnXnM006322 for ; Sun, 31 Jan 2010 11:50:09 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BCEB19EC1D; Sun, 31 Jan 2010 03:49:32 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-fx0-f209.google.com (mail-fx0-f209.google.com [209.85.220.209]) by gabe.freedesktop.org (Postfix) with ESMTP id BACE79EC1C for ; Sun, 31 Jan 2010 03:49:30 -0800 (PST) Received: by fxm1 with SMTP id 1so477941fxm.24 for ; Sun, 31 Jan 2010 03:49:29 -0800 (PST) MIME-Version: 1.0 Received: by 10.223.76.69 with SMTP id b5mr3082972fak.20.1264938569135; Sun, 31 Jan 2010 03:49:29 -0800 (PST) In-Reply-To: References: From: Andrew Lutomirski Date: Sun, 31 Jan 2010 06:49:09 -0500 X-Google-Sender-Auth: f18da4983c879d99 Message-ID: To: intel-gfx@lists.freedesktop.org Subject: Re: [Intel-gfx] i915: hotplug events gone wild X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.9 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Sun, 31 Jan 2010 11:50:09 +0000 (UTC) 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..0cda630 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 */ + DRM_DEBUG_DRIVER("i915_hotplug_work_func\n"); drm_sysfs_hotplug_event(dev); } @@ -616,8 +617,8 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS) (iir & I915_DISPLAY_PORT_INTERRUPT)) { u32 hotplug_status = I915_READ(PORT_HOTPLUG_STAT); - DRM_DEBUG_DRIVER("hotplug event received, stat 0x%08x\n", - hotplug_status); + DRM_DEBUG_DRIVER("hotplug event received, stat 0x%08x, mask 0x%08x\n", + hotplug_status, dev_priv->hotplug_supported_mask); if (hotplug_status & dev_priv->hotplug_supported_mask) queue_work(dev_priv->wq, &dev_priv->hotplug_work); 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; _______________________________________________