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

sna: Check all connectors for reuse 

Do not rely on the MST path being present to indicate a connector that
may be reused.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=80355
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2014-06-25 07:31:33 +01:00
parent 43ad5dbc60
commit 204ec74a61
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/sna/sna_display.c
View File

@ -3385,19 +3385,6 @@ sna_output_add(struct sna *sna, unsigned id, unsigned serial)
goto skip;
}
if (serial) {
for (i = 0; i < sna->mode.num_real_output; i++) {
output = config->output[i];
if (strcmp(output->name, name) == 0) {
assert(output->scrn == scrn);
assert(output->funcs == &sna_output_funcs);
assert(to_sna_output(output)->id == 0);
sna_output_destroy(output);
goto reset;
}
}
}
str = xf86GetOptValString(sna->Options, OPTION_ZAPHOD);
if (str && !sna_zaphod_match(str, name)) {
DBG(("%s: zaphod mismatch, want %s, have %s\n", __FUNCTION__, str, name));
@ -3408,6 +3395,20 @@ sna_output_add(struct sna *sna, unsigned id, unsigned serial)
len = path;
}
/* Check if we are dynamically reattaching an old connector */
if (serial) {
for (i = 0; i < sna->mode.num_real_output; i++) {
output = config->output[i];
if (strcmp(output->name, name) == 0) {
assert(output->scrn == scrn);
assert(output->funcs == &sna_output_funcs);
assert(to_sna_output(output)->id == 0);
sna_output_destroy(output);
goto reset;
}
}
}
output = calloc(1, sizeof(*output) + len + 1);
if (!output)
goto cleanup;