From patchwork Tue Oct 23 18:23:38 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 1632261 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork2.kernel.org (Postfix) with ESMTP id D49BADF283 for ; Tue, 23 Oct 2012 19:37:57 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C59949F763 for ; Tue, 23 Oct 2012 12:37:57 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wi0-f171.google.com (mail-wi0-f171.google.com [209.85.212.171]) by gabe.freedesktop.org (Postfix) with ESMTP id A3D1E9F71D for ; Tue, 23 Oct 2012 12:32:03 -0700 (PDT) Received: by mail-wi0-f171.google.com with SMTP id hj13so3080966wib.12 for ; Tue, 23 Oct 2012 12:32:03 -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=IWgaGb6KXN+pbCUbEckE9WDOAeoZgQxXPfLpju/Jv3A=; b=KCYmlC5mhjodGcSFlbHMQlphARQj6JX5r1lPN+w4lwjOmmafSR84PCeU/hc5aAe73N Q6pNd6Bn2UF/nzhXZJsUX61qWkyy81Zcgrj+Dd73QIcOKCJaXJowkK5O+4d4LdsQEJxF inxlNIBdPqpUYVY6yaNKFYDpuR6ZDdp17xzSU= 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=IWgaGb6KXN+pbCUbEckE9WDOAeoZgQxXPfLpju/Jv3A=; b=a2VXhaWGYx4T3ieRJ7UMu+LXvf13vLFihlfcqCmjlZFUxThp7Xy3Y7vM851RZ9HTxl zYxGT8P5CQnbwZy5QqSSV/qsCt/C8l1k2lns2uCJL9yqkdd5yAmVSubJQA2SCmFvgcZh Ni2zd5QybM+uV+1mgWXKYcqucx8prNO8kK+1iv3C9yjG7UQJd5206HGhz4X5mYq8siJX lv+u8Eg7Kp8p2ZqJz9zB24AenzKxvO1HCOa+95e/JBfAjBAMbPFzsaBpzyq/JuTVpsP1 57j6bNh6hml7PZ7zz/vOx/Zy3yVaQ3SrZUxIMigBIXIzoxe0H0CuWgo4U0aLMeWx5CM6 ff5w== Received: by 10.216.210.5 with SMTP id t5mr7983951weo.32.1351020723098; Tue, 23 Oct 2012 12:32:03 -0700 (PDT) Received: from wespe.ffwll.local (178-83-130-250.dynamic.hispeed.ch. [178.83.130.250]) by mx.google.com with ESMTPS id di7sm312800wib.11.2012.10.23.12.32.02 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 23 Oct 2012 12:32:02 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 7/7] drm: don't poll forced connectors Date: Tue, 23 Oct 2012 20:23:38 +0200 Message-Id: <1351016618-2752-8-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1351016618-2752-1-git-send-email-daniel.vetter@ffwll.ch> References: <1351016618-2752-1-git-send-email-daniel.vetter@ffwll.ch> X-Gm-Message-State: ALoCoQk0o6bRH6DD0PZU2KIdrAQZ5im7q4jqAHY6RFKNRF0UGqPtBacKk2Z0E0PveHa3EFwXmScc Cc: Daniel Vetter 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 Otherwise if the detect callback reports a different state than what the user forced (rather likely), we continously annoy userspace about a hotplug uevent. Signed-Off-by: Daniel Vetter --- drivers/gpu/drm/drm_crtc_helper.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c index bd0574a..e2967e6 100644 --- a/drivers/gpu/drm/drm_crtc_helper.c +++ b/drivers/gpu/drm/drm_crtc_helper.c @@ -947,6 +947,10 @@ static void output_poll_execute(struct work_struct *work) mutex_lock(&dev->mode_config.mutex); list_for_each_entry(connector, &dev->mode_config.connector_list, head) { + /* Ignore forced connectors. */ + if (connector->force) + continue; + /* Ignore HPD capable connectors and connectors where we don't * want any hotplug detection at all for polling. */ if (!connector->polled || connector->polled == DRM_CONNECTOR_POLL_HPD)