Aurelien
/
xf86-video-intel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sna: Ensure compat_output is sane after sorting outputs 

We always arrange for the panels to be first, and we want to use that
for our compat output.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2015-06-04 11:32:41 +01:00
parent 1525b01778
commit 7d30ccea21
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/sna/sna_display.c
View File

@ -4520,6 +4520,7 @@ static void sort_config_outputs(struct sna *sna)
{
xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(sna->scrn);
qsort(config->output, sna->mode.num_real_output, sizeof(*config->output), output_rank);
config->compat_output = 0; /* make sure it is a sane value */
sna_mode_compute_possible_outputs(sna);
}
@ -6337,13 +6338,23 @@ static bool sna_probe_initial_configuration(struct sna *sna)
crtc->enabled = TRUE;
crtc_enabled++;
output_set_gamma(output, crtc);
if (output->conf_monitor) {
output->mm_width = output->conf_monitor->mon_width;
output->mm_height = output->conf_monitor->mon_height;
}
#if 0
sna_output_attach_edid(output);
sna_output_attach_tile(output);
#endif
if (output->mm_width == 0 || output->mm_height == 0) {
output->mm_height = (crtc->desiredMode.VDisplay * 254) / (10*DEFAULT_DPI);
output->mm_width = (crtc->desiredMode.HDisplay * 254) / (10*DEFAULT_DPI);
}
output_set_gamma(output, crtc);
M = calloc(1, sizeof(DisplayModeRec));
if (M) {
*M = crtc->desiredMode;
@ -6564,6 +6575,7 @@ bool sna_mode_pre_init(ScrnInfoPtr scrn, struct sna *sna)
xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
xf86_config->xf86_crtc_notify = sna_crtc_config_notify;
xf86_config->compat_output = 0;
for (i = 0; i < res->count_crtcs; i++)
if (!sna_crtc_add(scrn, res->crtcs[i]))