From: Hans de Goede Subject: [PATCH 1/2] uxa: When the output is off, report the cached backlight value Date: Wed, 18 Jun 2014 15:01:36 +0200 Message-ID: <1403096497-7570-1-git-send-email-hdegoede@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by gabe.freedesktop.org (Postfix) with ESMTP id 1B7F56E54E for ; Wed, 18 Jun 2014 06:01:40 -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 s5ID1en9015178 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 18 Jun 2014 09:01:40 -0400 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org This is a "backport" of commit b545e10c50cb to uxa, so that users who are still using uxa, don't end up with a black screen after suspend / resume. Signed-off-by: Hans de Goede --- src/uxa/intel_display.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/uxa/intel_display.c b/src/uxa/intel_display.c index b90061b..e00b9c2 100644 --- a/src/uxa/intel_display.c +++ b/src/uxa/intel_display.c @@ -1257,9 +1257,13 @@ intel_output_get_property(xf86OutputPtr output, Atom property) if (!intel_output->backlight.iface) return FALSE; - val = intel_output_backlight_get(output); - if (val < 0) - return FALSE; + if (intel_output->dpms_mode == DPMSModeOn) { + val = intel_output_backlight_get(output); + if (val < 0) + return FALSE; + } else { + val = intel_output->backlight_active_level; + } err = RRChangeOutputProperty(output->randr_output, property, XA_INTEGER, 32, PropModeReplace, 1, &val, -- 2.0.0