From patchwork Thu Jun 27 11:45:03 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 2792011 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 8EBC49F3A0 for ; Thu, 27 Jun 2013 11:52:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6A9F9201DA for ; Thu, 27 Jun 2013 11:52:43 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 28FB3201BC for ; Thu, 27 Jun 2013 11:52:42 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 208E7E626B for ; Thu, 27 Jun 2013 04:52:42 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ee0-f41.google.com (mail-ee0-f41.google.com [74.125.83.41]) by gabe.freedesktop.org (Postfix) with ESMTP id 52490E6233 for ; Thu, 27 Jun 2013 04:45:23 -0700 (PDT) Received: by mail-ee0-f41.google.com with SMTP id d17so335481eek.14 for ; Thu, 27 Jun 2013 04:45:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=s8wkOav+mq3NlhRm8yXlgjj9AeHXdcRSIfXOwXlo0rc=; b=KjmjPqW+tgcwDpi1IItO/BuCgRy7Rg4eqKwkOs000QBvNTzUYQ4wniTM5mskdDZe5U cltfjfrjGTXFLHtKpLeEzdk3iqU3EiCLQndCxy8xSIJ0QVvaNAeEp4obR/aPmprIJZ6B z/uHVDrPBySBr0jDjGaEGMVB9lVICp2ZfawPc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=s8wkOav+mq3NlhRm8yXlgjj9AeHXdcRSIfXOwXlo0rc=; b=PqLGyBfdi51FWlRleUMIvIe3IbI9G8XJM4YH3ogmKAhN5Taf5qdjiGGCFiQjSj1eZi GReZZNIJLXG1yTm01R7JDgMI6afl5lzwMQXKxQ+fESIKZmqFZLnRrdmd9gAx9aSZq+8g WX/iutJZF9OlKdMJ9cyTxh51GyVegeURRFMhk2H4dQKNqfWOMIpkL5ap/FjmF0Nk38wq q4AZXdgn9hdaIoZaPJe0svWybclFcQ9hmExrSPXwkF7KvBu+rb2nekCwD0UkaeYR8X2E RBpct318oe7CThtWSIb4Rv0247sL/QKnD0RLfMCV7Y+dzn0ImZlx18Cd3TP20sv8fuOm Q2og== X-Received: by 10.14.200.194 with SMTP id z42mr8568595een.106.1372333522333; Thu, 27 Jun 2013 04:45:22 -0700 (PDT) Received: from natalie.ffwll.local (178-83-130-250.dynamic.hispeed.ch. [178.83.130.250]) by mx.google.com with ESMTPSA id w43sm3359444eez.6.2013.06.27.04.45.20 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 27 Jun 2013 04:45:21 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Thu, 27 Jun 2013 13:45:03 +0200 Message-Id: <1372333505-7037-6-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1372333505-7037-1-git-send-email-daniel.vetter@ffwll.ch> References: <1372333505-7037-1-git-send-email-daniel.vetter@ffwll.ch> X-Gm-Message-State: ALoCoQkRzysj3tA1JJ8ZuXAeE+fuoFVrihtdqNfRWlQ5pT5V9qzpyu67lU/71sa5/Sk2STvC14R7 Cc: Egbert Eich , Daniel Vetter Subject: [Intel-gfx] [PATCH 6/8] drm/i915: fold the queue_work into intel_hpd_irq_handler X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org X-Spam-Status: No, score=-5.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Everywhere the same. v2: Rebase on top of the i965g/gm sdvo hpd fix. Cc: Egbert Eich Reviewed-by: Egbert Eich Paulo Zanoni Signed-off-by: Daniel Vetter --- drivers/gpu/drm/i915/i915_irq.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index 26c3127..58f7174 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -913,6 +913,9 @@ static inline void intel_hpd_irq_handler(struct drm_device *dev, if (storm_detected) dev_priv->display.hpd_irq_setup(dev); + + queue_work(dev_priv->wq, + &dev_priv->hotplug_work); } static void gmbus_irq_handler(struct drm_device *dev) @@ -1021,8 +1024,6 @@ static irqreturn_t valleyview_irq_handler(int irq, void *arg) hotplug_status); if (hotplug_trigger) { intel_hpd_irq_handler(dev, hotplug_trigger, hpd_status_i915); - queue_work(dev_priv->wq, - &dev_priv->hotplug_work); } I915_WRITE(PORT_HOTPLUG_STAT, hotplug_status); I915_READ(PORT_HOTPLUG_STAT); @@ -1051,7 +1052,6 @@ static void ibx_irq_handler(struct drm_device *dev, u32 pch_iir) if (hotplug_trigger) { intel_hpd_irq_handler(dev, hotplug_trigger, hpd_ibx); - queue_work(dev_priv->wq, &dev_priv->hotplug_work); } if (pch_iir & SDE_AUDIO_POWER_MASK) { int port = ffs((pch_iir & SDE_AUDIO_POWER_MASK) >> @@ -1155,7 +1155,6 @@ static void cpt_irq_handler(struct drm_device *dev, u32 pch_iir) if (hotplug_trigger) { intel_hpd_irq_handler(dev, hotplug_trigger, hpd_cpt); - queue_work(dev_priv->wq, &dev_priv->hotplug_work); } if (pch_iir & SDE_AUDIO_POWER_MASK_CPT) { int port = ffs((pch_iir & SDE_AUDIO_POWER_MASK_CPT) >> @@ -3238,8 +3237,6 @@ static irqreturn_t i915_irq_handler(int irq, void *arg) hotplug_status); if (hotplug_trigger) { intel_hpd_irq_handler(dev, hotplug_trigger, hpd_status_i915); - queue_work(dev_priv->wq, - &dev_priv->hotplug_work); } I915_WRITE(PORT_HOTPLUG_STAT, hotplug_status); POSTING_READ(PORT_HOTPLUG_STAT); @@ -3484,8 +3481,6 @@ static irqreturn_t i965_irq_handler(int irq, void *arg) if (hotplug_trigger) { intel_hpd_irq_handler(dev, hotplug_trigger, IS_G4X(dev) ? hpd_status_gen4 : hpd_status_i915); - queue_work(dev_priv->wq, - &dev_priv->hotplug_work); } I915_WRITE(PORT_HOTPLUG_STAT, hotplug_status); I915_READ(PORT_HOTPLUG_STAT);