From patchwork Sat Apr 6 16:05: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: 2402201 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork1.kernel.org (Postfix) with ESMTP id 4409E3FD40 for ; Sat, 6 Apr 2013 16:02:23 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1D168E6986 for ; Sat, 6 Apr 2013 09:02:23 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-ee0-f42.google.com (mail-ee0-f42.google.com [74.125.83.42]) by gabe.freedesktop.org (Postfix) with ESMTP id EBCF5E5CCA for ; Sat, 6 Apr 2013 09:02:10 -0700 (PDT) Received: by mail-ee0-f42.google.com with SMTP id d4so951802eek.15 for ; Sat, 06 Apr 2013 09:02:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=x-received:from:to:cc:subject:date:message-id:x-mailer; bh=TzonSn3/+t31CXSCVvtmnNq0F0FlCqmPfLRhPC3FIMU=; b=MyYa/SNLoDhNP+oTfmK2p8rP5C/0ME8J3VxUvVd6T2oG7gt06c/sJFq2o/a14R5hMV xgQe8E1dTm3St5VLLXxPoqU7fXs3d4vrma9j4Ms7v8hkBHK9bjRf5zZhJR9LOIXsv+qC sbibumwB8t/I87zeVk7EBiHKUiIoD/kKvv6sw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer :x-gm-message-state; bh=TzonSn3/+t31CXSCVvtmnNq0F0FlCqmPfLRhPC3FIMU=; b=X/y05fFSHahjgG1OnEIEkulZojzUKukB0Jd0F9/EpOArE8lBQ3rXhcHvCHku4gbDjj BaaCpqd8RuzvO6e9hAwUXphDmMEo1EPDkanq2pM1C0NMN1cV5iLmpDiU8fZ+CZHEBMuu YkgCEQmeonR3KjLtz1HYlEDl2PaBsstJoo3eskWwiEkuviwYP1cNL6Hd+xJGbUD0xVMr kS+612n/Lj6mC2mTXPxVzYstYOYgixp/uLQgMi8qelV/oP9b97UMko1D4bq8duog/nf1 0jlzd6oRPfS9VCAHYXVpIQwUsS7jd0q4t9YCYlnGxa8MApt/GfDTXfPX1v3d7H0Vwv0H x4ZA== X-Received: by 10.15.76.132 with SMTP id n4mr11114443eey.16.1365264129897; Sat, 06 Apr 2013 09:02:09 -0700 (PDT) Received: from phenom.ffwll.local (178-83-130-250.dynamic.hispeed.ch. [178.83.130.250]) by mx.google.com with ESMTPS id h5sm21655052eem.1.2013.04.06.09.02.07 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 06 Apr 2013 09:02:08 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development , DRI Development Subject: [PATCH] drm/kms-helper: disable hpd_irq handling when poll=0 Date: Sat, 6 Apr 2013 18:05:03 +0200 Message-Id: <1365264303-27813-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.10.4 X-Gm-Message-State: ALoCoQlbw0mmHRXBRRhxNTgAtV6K1hbAwP8SKOvre/KRL05VPbFGVKsyLUs1XWdpgXqwZ+34r6Dz Cc: George Amanakis , Daniel Vetter , "for 3.8" , Dave Airlie X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org When inlining the actual hpd output probing in commit 69787f7da6b2adc4054357a661aaa1701a9ca76f Author: Daniel Vetter Date: Tue Oct 23 18:23:34 2012 +0000 drm: run the hpd irq event code directly the check for the drm_kms_hlper.poll module option was lost. This regressed systems where this option is used to work-around output probing issues (like irq storms). Restore the old behaviour. Reported-by: George Amanakis Cc: George Amanakis Cc: Dave Airlie Cc: stable@vger.kernel.org (for 3.8) Signed-off-by: Daniel Vetter --- drivers/gpu/drm/drm_crtc_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c index 7b2d378..3260736 100644 --- a/drivers/gpu/drm/drm_crtc_helper.c +++ b/drivers/gpu/drm/drm_crtc_helper.c @@ -1067,7 +1067,7 @@ void drm_helper_hpd_irq_event(struct drm_device *dev) enum drm_connector_status old_status; bool changed = false; - if (!dev->mode_config.poll_enabled) + if (!dev->mode_config.poll_enabled || !drm_kms_helper_poll) return; mutex_lock(&dev->mode_config.mutex);