From patchwork Thu Feb 3 22:10:51 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Torvalds X-Patchwork-Id: 530751 Received: from smtp1.linux-foundation.org (smtp1.linux-foundation.org [140.211.169.13]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p13MDCTK029838 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL) for ; Thu, 3 Feb 2011 22:13:33 GMT Received: from daredevil.linux-foundation.org (localhost [127.0.0.1]) by smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with ESMTP id p13MBEt2018490; Thu, 3 Feb 2011 14:11:15 -0800 Received: from mail-iy0-f175.google.com (mail-iy0-f175.google.com [209.85.210.175]) (authenticated bits=0) by smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with ESMTP id p13MBDk5018449 (version=TLSv1/SSLv3 cipher=RC4-MD5 bits=128 verify=FAIL) for ; Thu, 3 Feb 2011 14:11:13 -0800 Received: by iyj18 with SMTP id 18so1561338iyj.6 for ; Thu, 03 Feb 2011 14:11:11 -0800 (PST) Received: by 10.231.145.68 with SMTP id c4mr12283335ibv.47.1296771071201; Thu, 03 Feb 2011 14:11:11 -0800 (PST) MIME-Version: 1.0 Received: by 10.231.191.213 with HTTP; Thu, 3 Feb 2011 14:10:51 -0800 (PST) In-Reply-To: References: <201102032009.17100.rjw@sisk.pl> From: Linus Torvalds Date: Thu, 3 Feb 2011 14:10:51 -0800 Message-ID: To: Carlos Mafra , Keith Packard , Dave Airlie X-Spam-Status: No, hits=-104.306 required=5 tests=ALL_TRUSTED, AWL, BAYES_00, OSDL_HEADER_SUBJECT_BRACKETED, USER_IN_WHITELIST X-Spam-Checker-Version: SpamAssassin 3.2.4-osdl_revision__1.47__ X-MIMEDefang-Filter: lf$Revision: 1.188 $ X-Scanned-By: MIMEDefang 2.63 on 140.211.169.21 Cc: Linux SCSI List , Linux ACPI , Takashi Iwai , Network Development , Linux Wireless List , Linux Kernel Mailing List , DRI , Florian Mickler , Andrew Morton , Kernel Testers List , Linux PM List , Maciej Rutecki Subject: Re: [linux-pm] 2.6.38-rc3-git1: Reported regressions 2.6.36 -> 2.6.37 X-BeenThere: linux-pm@lists.linux-foundation.org X-Mailman-Version: 2.1.9 Precedence: list List-Id: Linux power management List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-pm-bounces@lists.linux-foundation.org Errors-To: linux-pm-bounces@lists.linux-foundation.org Received-SPF: pass (localhost is always allowed.) X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Thu, 03 Feb 2011 22:13:33 +0000 (UTC) drivers/gpu/drm/drm_crtc_helper.c | 6 +++--- include/drm/drm_mode.h | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c index 952b3d4..7f585ed 100644 --- a/drivers/gpu/drm/drm_crtc_helper.c +++ b/drivers/gpu/drm/drm_crtc_helper.c @@ -681,11 +681,11 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set) goto fail; } } - DRM_DEBUG_KMS("Setting connector DPMS state to on\n"); + DRM_DEBUG_KMS("Setting connector DPMS state to 'unknown'\n"); for (i = 0; i < set->num_connectors; i++) { - DRM_DEBUG_KMS("\t[CONNECTOR:%d:%s] set DPMS on\n", set->connectors[i]->base.id, + DRM_DEBUG_KMS("\t[CONNECTOR:%d:%s] set DPMS 'unknown'\n", set->connectors[i]->base.id, drm_get_connector_name(set->connectors[i])); - set->connectors[i]->dpms = DRM_MODE_DPMS_ON; + set->connectors[i]->dpms = DRM_MODE_DPMS_UNKNOWN; } kfree(save_connectors); diff --git a/include/drm/drm_mode.h b/include/drm/drm_mode.h index 0fc7397..4b5144c 100644 --- a/include/drm/drm_mode.h +++ b/include/drm/drm_mode.h @@ -59,6 +59,7 @@ /* DPMS flags */ /* bit compatible with the xorg definitions. */ +#define DRM_MODE_DPMS_UNKNOWN (-1) #define DRM_MODE_DPMS_ON 0 #define DRM_MODE_DPMS_STANDBY 1 #define DRM_MODE_DPMS_SUSPEND 2