xf86-video-intel: src/sna/sna_display.c src/sna/sna_driver.c src/sna/sna.h
Chris Wilson
ickle at kemper.freedesktop.org
Thu May 24 04:53:47 PDT 2012
src/sna/sna.h | 1 +
src/sna/sna_display.c | 15 +++++++++++++++
src/sna/sna_driver.c | 1 +
3 files changed, 17 insertions(+)
New commits:
commit 0ab226e27e7920bdb9f7eb62c5174cd097ac7f7f
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Thu May 24 12:51:46 2012 +0100
sna: Query CRTC states following a hotplug event
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/sna.h b/src/sna/sna.h
index 7a01ee7..879940d 100644
--- a/src/sna/sna.h
+++ b/src/sna/sna.h
@@ -310,6 +310,7 @@ struct sna {
Bool sna_mode_pre_init(ScrnInfoPtr scrn, struct sna *sna);
extern void sna_mode_remove_fb(struct sna *sna);
+extern void sna_mode_hotplug(struct sna *sna);
extern void sna_mode_fini(struct sna *sna);
extern int sna_crtc_id(xf86CrtcPtr crtc);
diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index c5b96f2..b8cf3cc 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -2243,3 +2243,18 @@ bool sna_crtc_is_bound(struct sna *sna, xf86CrtcPtr crtc)
mode.mode_valid, sna->mode.fb_id == mode.fb_id));
return mode.mode_valid && sna->mode.fb_id == mode.fb_id;
}
+
+void sna_mode_hotplug(struct sna *sna)
+{
+ xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(sna->scrn);
+ int i;
+
+ /* Validate CRTC attachments */
+ for (i = 0; i < xf86_config->num_crtc; i++) {
+ xf86CrtcPtr crtc = xf86_config->crtc[i];
+ if (crtc->enabled) {
+ struct sna_crtc *sna_crtc = crtc->driver_private;
+ sna_crtc->active = sna_crtc_is_bound(sna, crtc);
+ }
+ }
+}
diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c
index cab6d03..d0b5bde 100644
--- a/src/sna/sna_driver.c
+++ b/src/sna/sna_driver.c
@@ -635,6 +635,7 @@ sna_handle_uevents(int fd, void *closure)
if (memcmp(&s.st_rdev, &udev_devnum, sizeof (dev_t)) == 0 &&
hotplug && atoi(hotplug) == 1) {
DBG(("%s: hotplug event\n", __FUNCTION__));
+ sna_mode_hotplug(sna);
RRGetInfo(xf86ScrnToScreen(scrn), TRUE);
}
More information about the xorg-commit
mailing list