From patchwork Wed Jun 18 13:01:37 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 4376071 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E1E619F433 for ; Wed, 18 Jun 2014 13:01:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E37532010C for ; Wed, 18 Jun 2014 13:01:49 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 98AB820204 for ; Wed, 18 Jun 2014 13:01:43 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D38A36E589; Wed, 18 Jun 2014 06:01:42 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by gabe.freedesktop.org (Postfix) with ESMTP id 1DDA86E54E for ; Wed, 18 Jun 2014 06:01:42 -0700 (PDT) Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s5ID1fYU015190 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 18 Jun 2014 09:01:41 -0400 Received: from shalem.localdomain.com (vpn1-5-177.ams2.redhat.com [10.36.5.177]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s5ID1cEk031185; Wed, 18 Jun 2014 09:01:40 -0400 From: Hans de Goede To: intel-gfx@lists.freedesktop.org Date: Wed, 18 Jun 2014 15:01:37 +0200 Message-Id: <1403096497-7570-2-git-send-email-hdegoede@redhat.com> In-Reply-To: <1403096497-7570-1-git-send-email-hdegoede@redhat.com> References: <1403096497-7570-1-git-send-email-hdegoede@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 Subject: [Intel-gfx] [PATCH 2/2] uxa: Mark the output as off before making pipe changes X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, 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 This is a partial "backport" of commit c6cd10f536, which makes the same change for sna, to avoid users still using uxa ending up with a blackscreen after plugging in an external monitor. Signed-off-by: Hans de Goede --- src/uxa/intel_display.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/uxa/intel_display.c b/src/uxa/intel_display.c index e00b9c2..a745dc5 100644 --- a/src/uxa/intel_display.c +++ b/src/uxa/intel_display.c @@ -320,6 +320,14 @@ intel_crtc_apply(xf86CrtcPtr crtc) xf86OutputPtr output = xf86_config->output[i]; struct intel_output *intel_output; + /* Make sure we mark the output as off (and save the backlight) + * before the kernel turns it off due to changing the pipe. + * This is necessary as the kernel may turn off the backlight + * and we lose track of the user settings. + */ + if (output->crtc == NULL) + output->funcs->dpms(output, DPMSModeOff); + if (output->crtc != crtc) continue;