| Message ID | 1403096497-7570-2-git-send-email-hdegoede@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Jun 18, 2014 at 03:01:37PM +0200, Hans de Goede wrote: > 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 <hdegoede@redhat.com> Do you want to reference your bugzilla here for background on the bug? -Chris
Hi, On 06/18/2014 03:14 PM, Chris Wilson wrote: > On Wed, Jun 18, 2014 at 03:01:37PM +0200, Hans de Goede wrote: >> 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 <hdegoede@redhat.com> > > 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
On Wed, Jun 18, 2014 at 03:50:45PM +0200, Hans de Goede wrote: > Hi, > > On 06/18/2014 03:14 PM, Chris Wilson wrote: > > On Wed, Jun 18, 2014 at 03:01:37PM +0200, Hans de Goede wrote: > >> 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 <hdegoede@redhat.com> > > > > 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
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;
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 <hdegoede@redhat.com> --- src/uxa/intel_display.c | 8 ++++++++ 1 file changed, 8 insertions(+)