From patchwork Fri Feb 4 01:05:54 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keith Packard X-Patchwork-Id: 530921 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p141ESOr031414 for ; Fri, 4 Feb 2011 01:14:28 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755280Ab1BDBO0 (ORCPT ); Thu, 3 Feb 2011 20:14:26 -0500 Received: from home.keithp.com ([63.227.221.253]:59248 "EHLO keithp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753585Ab1BDBOZ (ORCPT ); Thu, 3 Feb 2011 20:14:25 -0500 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Fri, 04 Feb 2011 01:14:28 +0000 (UTC) X-Greylist: delayed 504 seconds by postgrey-1.27 at vger.kernel.org; Thu, 03 Feb 2011 20:14:25 EST Received: from localhost (localhost [127.0.0.1]) by keithp.com (Postfix) with ESMTP id 43E877600EF; Thu, 3 Feb 2011 17:05:58 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at keithp.com Received: from keithp.com ([127.0.0.1]) by localhost (keithp.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id gPkT1MEOXjUS; Thu, 3 Feb 2011 17:05:54 -0800 (PST) Received: by keithp.com (Postfix, from userid 1033) id CED497601F5; Thu, 3 Feb 2011 17:05:54 -0800 (PST) Received: from koto.keithp.com (localhost [127.0.0.1]) by keithp.com (Postfix) with ESMTP id CABA57600EF; Thu, 3 Feb 2011 17:05:54 -0800 (PST) Received: by koto.keithp.com (Postfix, from userid 1488) id 4D55411C064; Thu, 3 Feb 2011 17:05:54 -0800 (PST) From: Keith Packard To: Linus Torvalds , Dave Airlie Cc: Carlos Mafra , Dave Airlie , "Rafael J. Wysocki" , Takashi Iwai , Linux Kernel Mailing List , Maciej Rutecki , Florian Mickler , Andrew Morton , Kernel Testers List , Network Development , Linux ACPI , Linux PM List , Linux SCSI List , Linux Wireless List , DRI Subject: Re: 2.6.38-rc3-git1: Reported regressions 2.6.36 -> 2.6.37 In-Reply-To: References: <201102032009.17100.rjw@sisk.pl> User-Agent: Notmuch/0.5 (http://notmuchmail.org) Emacs/23.2.1 (i486-pc-linux-gnu) Date: Thu, 03 Feb 2011 17:05:54 -0800 Message-ID: MIME-Version: 1.0 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c index 952b3d4..17459ee 100644 --- a/drivers/gpu/drm/drm_crtc_helper.c +++ b/drivers/gpu/drm/drm_crtc_helper.c @@ -665,6 +665,12 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set) ret = -EINVAL; goto fail; } + DRM_DEBUG_KMS("Setting connector DPMS state to on\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_get_connector_name(set->connectors[i])); + set->connectors[i]->dpms = DRM_MODE_DPMS_ON; + } } drm_helper_disable_unused_functions(dev); } else if (fb_changed) { @@ -681,12 +687,6 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set) goto fail; } } - DRM_DEBUG_KMS("Setting connector DPMS state to on\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_get_connector_name(set->connectors[i])); - set->connectors[i]->dpms = DRM_MODE_DPMS_ON; - } kfree(save_connectors); kfree(save_encoders);