File U_05-sna-Remove-redundant-RRGetInfo-on-hotplug-... of Package xf86-video-intel

Overview Repositories Revisions Requests Users Attributes Meta

File U_05-sna-Remove-redundant-RRGetInfo-on-hotplug-discovery.patch of Package xf86-video-intel (Revision 867afb226f80761328c300c81f617901)

Currently displaying revision 867afb226f80761328c300c81f617901 , Show latest

From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Fri Mar 13 14:39:56 2015 +0000
Subject: [PATCH 5/10]sna: Remove redundant RRGetInfo on hotplug discovery
Patch-mainline: Upstream
Git-repo: git://anongit.freedesktop.org/git/xorg/driver/xf86-video-intel
Git-commit: c2381ac065e0d7fc39ae029045eda54b36766324
References: boo#971885
Signed-off-by: Egbert Eich <eich@suse.com>

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
 src/sna/sna_display.c | 7 ++++++-
 src/sna/sna_driver.c  | 6 ++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index fae91d7..2ddbf6d 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -4460,8 +4460,11 @@ void sna_mode_discover(struct sna *sna)
 			continue;
 
 		sna_output->last_detect = 0;
-		if (sna_output->serial == serial)
+		if (sna_output->serial == serial) {
+			if (sna_output_detect(output) != output->status)
+				RROutputChanged(output->randr_output, TRUE);
 			continue;
+		}
 
 		DBG(("%s: removing output %s (id=%d), serial=%u [now %u]\n",
 		     __FUNCTION__, output->name, sna_output->id,
@@ -4496,6 +4499,8 @@ void sna_mode_discover(struct sna *sna)
 
 		xf86RandR12TellChanged(screen);
 	}
+
+	RRTellChanged(screen);
 }
 
 static void copy_front(struct sna *sna, PixmapPtr old, PixmapPtr new)
diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c
index ab9ce04..5092bfb 100644
--- a/src/sna/sna_driver.c
+++ b/src/sna/sna_driver.c
@@ -770,7 +770,6 @@ sna_handle_uevents(int fd, void *closure)
 		if (scrn->vtSema) {
 			sna_mode_discover(sna);
 			sna_mode_check(sna);
-			RRGetInfo(xf86ScrnToScreen(scrn), TRUE);
 		} else
 			sna->flags |= SNA_REPROBE;
 	}
@@ -1206,12 +1205,11 @@ static Bool sna_enter_vt(VT_FUNC_ARGS_DECL)
 		return FALSE;
 
 	if (sna->flags & SNA_REPROBE) {
-		DBG(("%s: reporting deferred hotplug event\n",
-		     __FUNCTION__));
+		DBG(("%s: reporting deferred hotplug event\n", __FUNCTION__));
 		sna_mode_discover(sna);
-		RRGetInfo(xf86ScrnToScreen(scrn), TRUE);
 		sna->flags &= ~SNA_REPROBE;
 	}
+	sna_mode_check(sna);
 
 	if (!sna_set_desired_mode(sna)) {
 		intel_put_master(sna->dev);

Places

File U_05-sna-Remove-redundant-RRGetInfo-on-hotplug-discovery.patch of Package xf86-video-intel (Revision 867afb226f80761328c300c81f617901)

Places