[people/amarx/ipfire-3.x.git] / xorg-x11-drv-intel / patches / kill-svideo.patch

diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index d50e640..d6c7cd3 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -412,6 +412,18 @@ drmmode_output_detect(xf86OutputPtr output)
 	drmmode_output->mode_output =
 		drmModeGetConnector(drmmode->fd, drmmode_output->output_id);
 
+	switch (drmmode_output->mode_output->connector_type) {
+	case DRM_MODE_CONNECTOR_SVIDEO:
+		/* FIXME: KMS svideo detection is flaky an causes X to
+		 * come up in 1024x768 when it tries to pick a clone
+		 * mode that fits both the panel and the tv out.  Once
+		 * KMS learns how to detect svideo better we can
+		 * remove this. */
+		return DRM_MODE_UNKNOWNCONNECTION;
+	default:
+		break;
+	}
+
 	switch (drmmode_output->mode_output->connection) {
 	case DRM_MODE_CONNECTED:
 		status = XF86OutputStatusConnected;
Commit	Line	Data
e1244b71 SS	1	diff --git a/src/drmmode_display.c b/src/drmmode_display.c
	2	index d50e640..d6c7cd3 100644
	3	--- a/src/drmmode_display.c
	4	+++ b/src/drmmode_display.c
	5	@@ -412,6 +412,18 @@ drmmode_output_detect(xf86OutputPtr output)
	6	drmmode_output->mode_output =
	7	drmModeGetConnector(drmmode->fd, drmmode_output->output_id);
	8
	9	+ switch (drmmode_output->mode_output->connector_type) {
	10	+ case DRM_MODE_CONNECTOR_SVIDEO:
	11	+ /* FIXME: KMS svideo detection is flaky an causes X to
	12	+ * come up in 1024x768 when it tries to pick a clone
	13	+ * mode that fits both the panel and the tv out. Once
	14	+ * KMS learns how to detect svideo better we can
	15	+ * remove this. */
	16	+ return DRM_MODE_UNKNOWNCONNECTION;
	17	+ default:
	18	+ break;
	19	+ }
	20	+
	21	switch (drmmode_output->mode_output->connection) {
	22	case DRM_MODE_CONNECTED:
	23	status = XF86OutputStatusConnected;