xf86-video-intel: src/sna/sna_display.c src/sna/sna_display_fake.c
Chris Wilson
ickle at kemper.freedesktop.org
Tue Aug 5 02:19:33 PDT 2014
src/sna/sna_display.c | 13 +++++++++++--
src/sna/sna_display_fake.c | 3 +++
2 files changed, 14 insertions(+), 2 deletions(-)
New commits:
commit 941ae4c868279c994756a2a476af2cd32afc6d35
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Tue Aug 5 10:19:05 2014 +0100
sna: Add some extra logging for hotplugging of outputs
References: https://bugs.freedesktop.org/show_bug.cgi?id=82153
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index e0a1610..342bff2 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -2823,7 +2823,7 @@ sna_output_get_modes(xf86OutputPtr output)
mode);
Modes = xf86ModesAdd(Modes, mode);
if (current && xf86ModesEqual(mode, current)) {
- free(current->name);
+ free((void*)current->name);
free(current);
current = NULL;
}
@@ -3726,6 +3726,9 @@ reset:
(unsigned long)(uintptr_t)output->crtc));
assert(sna_output->id == id);
+ xf86DrvMsg(scrn->scrnIndex, X_INFO,
+ "Enabled output %s\n",
+ output->name);
return 1;
cleanup:
@@ -3893,8 +3896,14 @@ void sna_mode_discover(struct sna *sna)
DBG(("%s: removing output %s (id=%d), serial=%u [now %u]\n",
__FUNCTION__, output->name, to_sna_output(output)->id,
to_sna_output(output)->serial, serial));
+
+ xf86DrvMsg(sna->scrn->scrnIndex, X_INFO,
+ "%s output %s\n",
+ sna->flags & SNA_REMOVE_OUTPUTS ? "Removed" : "Disabled",
+ output->name);
if (sna->flags & SNA_REMOVE_OUTPUTS) {
- sna_output_del(output); i--;
+ sna_output_del(output);
+ i--;
} else {
to_sna_output(output)->id = 0;
output->crtc = NULL;
diff --git a/src/sna/sna_display_fake.c b/src/sna/sna_display_fake.c
index 97c463c..b143d86 100644
--- a/src/sna/sna_display_fake.c
+++ b/src/sna/sna_display_fake.c
@@ -300,6 +300,9 @@ static bool add_fake_output(struct sna *sna, bool late)
}
sna->mode.num_fake++;
+ xf86DrvMsg(scrn->scrnIndex, X_INFO,
+ "Enabled output %s\n",
+ output->name);
return true;
err:
More information about the xorg-commit
mailing list