From patchwork Tue Aug 9 17:09:06 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 1050482 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p79H9QLs008479 for ; Tue, 9 Aug 2011 17:09:47 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5B1A99EC6D for ; Tue, 9 Aug 2011 10:09:26 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-vw0-f49.google.com (mail-vw0-f49.google.com [209.85.212.49]) by gabe.freedesktop.org (Postfix) with ESMTP id 18F1B9E8B8 for ; Tue, 9 Aug 2011 10:09:16 -0700 (PDT) Received: by vws8 with SMTP id 8so207464vws.36 for ; Tue, 09 Aug 2011 10:09:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; bh=GL5k+TVu271xYiPGno8P3ODvd59vkyXCw9uUgh6GDaY=; b=OhU+uNhTy5ojbCPIS4hvAbYF5AUAEtlqFHVdcjmOBmC9wcp0QGXZ5m7ZkVdK6xy4MN sKZJAAQWIo9YPNnrVBVyEkKKJ4qut+A0qNQVwnEMEpKtTsZCIK5TrFdw2mfXo2Uwx/xt SByXlw8gN+t4Yj/W5GY2jZb+Ss87KmRf1IdC4= Received: by 10.52.74.74 with SMTP id r10mr7265873vdv.374.1312909756096; Tue, 09 Aug 2011 10:09:16 -0700 (PDT) Received: from localhost.localdomain (static-74-96-105-7.washdc.fios.verizon.net [74.96.105.7]) by mx.google.com with ESMTPS id gw3sm101112vdb.20.2011.08.09.10.09.14 (version=SSLv3 cipher=OTHER); Tue, 09 Aug 2011 10:09:15 -0700 (PDT) From: alexdeucher@gmail.com To: airlied@gmail.com, dri-devel@lists.freedesktop.org Subject: [PATCH] drm/radeon/kms: don't enable connectors that are off in the hotplug handler Date: Tue, 9 Aug 2011 13:09:06 -0400 Message-Id: <1312909746-4919-1-git-send-email-alexdeucher@gmail.com> X-Mailer: git-send-email 1.7.1.1 Cc: Alex Deucher , stable@kernel.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.11 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 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Tue, 09 Aug 2011 17:09:48 +0000 (UTC) From: Alex Deucher If we get a hotplug event on an connector that is off, don't attempt to turn it on or off, it should already be off. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=728228 Signed-off-by: Alex Deucher Cc: stable@kernel.org --- drivers/gpu/drm/radeon/radeon_connectors.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c index cbfca3a..8365f75 100644 --- a/drivers/gpu/drm/radeon/radeon_connectors.c +++ b/drivers/gpu/drm/radeon/radeon_connectors.c @@ -54,6 +54,10 @@ void radeon_connector_hotplug(struct drm_connector *connector) radeon_hpd_set_polarity(rdev, radeon_connector->hpd.hpd); + /* if the connector is already off, don't turn it back on */ + if (connector->dpms != DRM_MODE_DPMS_ON) + return; + /* powering up/down the eDP panel generates hpd events which * can interfere with modesetting. */