uxa: When the output is off, report the cached backlight value
PATCH 1/2 uxa: When the output is off, report the cached backlight value
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.
--- src/uxa/intel_display.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
src/uxa/intel_display.c +7 -3
@@ -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,
Signature · 1 line
2.0.0
PATCH 2/2 uxa: Mark the output as off before making pipe changes
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.
--- src/uxa/intel_display.c | 8 ++++++++ 1 file changed, 8 insertions(+)
src/uxa/intel_display.c +8 -0
@@ -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 ;
Signature · 1 line
2.0.0
Re: [PATCH 2/2] uxa: Mark the output as off before making pipe changes
Quoted 5 lines · Hans de Goede
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 <[email protected]>
Do you want to reference your bugzilla here for background on the bug? -Chris
Signature · 1 line
Chris Wilson, Intel Open Source Technology Centre
Re: [PATCH 2/2] uxa: Mark the output as off before making pipe changes
Hi,
Quoted 8 lines · Chris Wilson
Quoted 5 lines · Hans de Goede
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 <[email protected]>Do you want to reference your bugzilla here for background on the bug?
I wasn't sure, which is why I omitted it, but yes that probably makes sense, please add these links to the commit msg:
https://bugzilla.redhat.com/show_bug.cgi?id=1032978
https://bugzilla.redhat.com/show_bug.cgi?id=1103806
Thanks,
Hans
Re: [PATCH 2/2] uxa: Mark the output as off before making pipe changes
Quoted 10 lines · Hans de Goede
Hi,
Quoted 7 lines · Chris Wilson
Quoted 5 lines · Hans de Goede
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 <[email protected]>
Quoted 7 lines
Quoted 1 line
Do you want to reference your bugzilla here for background on the bug?
I wasn't sure, which is why I omitted it, but yes that probably makes sense, please add these links to the commit msg:
https://bugzilla.redhat.com/show_bug.cgi?id=1032978
https://bugzilla.redhat.com/show_bug.cgi?id=1103806
Added, and pushed. Thanks a lot for tracking down the cause of this one, -Chris
Signature · 1 line
Chris Wilson, Intel Open Source Technology Centre