From patchwork Tue Jul 7 07:09:07 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 6730441 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 91452C05AC for ; Tue, 7 Jul 2015 07:06:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B04312052A for ; Tue, 7 Jul 2015 07:06:30 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 16B022073F for ; Tue, 7 Jul 2015 07:06:29 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3BD006E286; Tue, 7 Jul 2015 00:06:27 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wi0-f169.google.com (mail-wi0-f169.google.com [209.85.212.169]) by gabe.freedesktop.org (Postfix) with ESMTPS id 70C856E286 for ; Tue, 7 Jul 2015 00:06:26 -0700 (PDT) Received: by widjy10 with SMTP id jy10so179758139wid.1 for ; Tue, 07 Jul 2015 00:06:24 -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; bh=Air9EVt25xgwsu1dJRSX7t56UJD1pYcCgdE9qXQDf9Y=; b=FRXpckfpF6Peh/fWM5hP/WF/7PNTTs0doYvv0uxHTZWpY53TWQFVXguyP+isiL5/se C7uLcqHhvj8mZnrGx2tU5sSrtRrrHe6LIero689Fq1tL1iBrlj8fIh2Rk4zE2mYodd2Q PRvhXnDVW+ek4hEMxljI8OQQcjLEPwOATRpNE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=Air9EVt25xgwsu1dJRSX7t56UJD1pYcCgdE9qXQDf9Y=; b=P0m3wfop46M+7xPx5Szd7CNmKkgFH852O4iKXnkcPTKFrOZ88axgsCPxpt0wKJTtEg KUyGNXuowXaaKELZQfP4l1GXd8fUpt20Q5U4ZW77+CVJwfhYoJc3hMgx1F8/qxiH0gOi G1IGKRYzBGAQ9Rpal+u/7Uw6pmrJwBbN6T7ycB3MOABbp0r+s936LPgvxvHrJCyMwG9D 2LbDMlYCFMzYeQwVdO7LkzJr7HBFhmI/Ur5tXWilby8QAROyK1NN+F6ET6W4BycfA0aM x3aYvuGTbJBwi991Fhl3GzZhZ7nETk6zqz02QdAK6HlSJkTHT68b9ETXVTsuLzIDKHCt W+QA== X-Gm-Message-State: ALoCoQmvXPbqYrT3V4ko/gv5zkdiOP6T911yEjkJuoCDfwPsS4hfuYVZAzFpm16/Fl8r75wga4RW X-Received: by 10.194.9.161 with SMTP id a1mr5283022wjb.39.1436252784682; Tue, 07 Jul 2015 00:06:24 -0700 (PDT) Received: from phenom.ffwll.local (212-51-149-109.fiber7.init7.net. [212.51.149.109]) by mx.google.com with ESMTPSA id q4sm31821617wja.24.2015.07.07.00.06.22 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 07 Jul 2015 00:06:23 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH RESEND] drm/kms-helper: disable hpd_irq handling when poll=0 Date: Tue, 7 Jul 2015 09:09:07 +0200 Message-Id: <1436252947-19859-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.1.4 Cc: George Amanakis , Daniel Vetter , Intel Graphics Development , stable@vger.kernel.org, Dave Airlie X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.9 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 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. v2: Rebased over more than 2 years of history :( Reported-by: George Amanakis Cc: George Amanakis Cc: Dave Airlie Cc: stable@vger.kernel.org Signed-off-by: Daniel Vetter --- drivers/gpu/drm/drm_probe_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_probe_helper.c b/drivers/gpu/drm/drm_probe_helper.c index 04203c0d2ecb..7356f3e75e4f 100644 --- a/drivers/gpu/drm/drm_probe_helper.c +++ b/drivers/gpu/drm/drm_probe_helper.c @@ -491,7 +491,7 @@ bool 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 false; mutex_lock(&dev->mode_config.mutex);