Attachment 575607 Details for Bug 806091 – Add module parameter to disable InfoFrames per-output

[patch] Add module parameter to disable InfoFrames per-output

nouveau-hdmi-disable-v2.patch (text/plain), 4.39 KB, created by Ian Pilcher on 2012-04-06 04:14:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ian Pilcher

Created: 2012-04-06 04:14:47 UTC

Size: 4.39 KB

patch

obsolete

>diff -ur linux-3.3/drivers/gpu/drm/nouveau/nouveau_connector.c linux-3.3-nouveau/drivers/gpu/drm/nouveau/nouveau_connector.c
>--- linux-3.3/drivers/gpu/drm/nouveau/nouveau_connector.c	2012-03-18 18:15:34.000000000 -0500
>+++ linux-3.3-nouveau/drivers/gpu/drm/nouveau/nouveau_connector.c	2012-04-05 17:53:14.157100578 -0500
>@@ -869,6 +869,25 @@
> 	return DRM_MODE_CONNECTOR_Unknown;
> }
> 
>+static bool
>+nouveau_conn_hdmi_disable(struct drm_connector *connector)
>+{
>+	unsigned int i;
>+	const char *conn_name = drm_get_connector_name(connector);
>+	
>+	for (i = 0; i < nouveau_hdmi_disable_size; ++i) {
>+		if (strcmp(nouveau_hdmi_disable[i], conn_name) == 0 ||
>+			strcmp(nouveau_hdmi_disable[i], "all") == 0) {
>+			NV_INFO(connector->dev,
>+				"disabling HDMI functions on output %s\n",
>+				conn_name);
>+			return 1;
>+		}
>+	}
>+	
>+	return 0;
>+}
>+
> struct drm_connector *
> nouveau_connector_create(struct drm_device *dev, int index)
> {
>@@ -1056,6 +1075,8 @@
> 		if (ret == 0)
> 			connector->polled = DRM_CONNECTOR_POLL_HPD;
> 	}
>+	
>+	nv_connector->hdmi_disable = nouveau_conn_hdmi_disable(connector);
> 
> 	drm_sysfs_connector_add(connector);
> 	return connector;
>diff -ur linux-3.3/drivers/gpu/drm/nouveau/nouveau_connector.h linux-3.3-nouveau/drivers/gpu/drm/nouveau/nouveau_connector.h
>--- linux-3.3/drivers/gpu/drm/nouveau/nouveau_connector.h	2012-03-18 18:15:34.000000000 -0500
>+++ linux-3.3-nouveau/drivers/gpu/drm/nouveau/nouveau_connector.h	2012-04-05 16:11:30.887517934 -0500
>@@ -71,6 +71,8 @@
> 	struct nouveau_encoder *detected_encoder;
> 	struct edid *edid;
> 	struct drm_display_mode *native_mode;
>+	
>+	bool hdmi_disable;
> };
> 
> static inline struct nouveau_connector *nouveau_connector(
>diff -ur linux-3.3/drivers/gpu/drm/nouveau/nouveau_drv.c linux-3.3-nouveau/drivers/gpu/drm/nouveau/nouveau_drv.c
>--- linux-3.3/drivers/gpu/drm/nouveau/nouveau_drv.c	2012-03-18 18:15:34.000000000 -0500
>+++ linux-3.3-nouveau/drivers/gpu/drm/nouveau/nouveau_drv.c	2012-04-05 22:41:54.071927157 -0500
>@@ -128,6 +128,15 @@
> int nouveau_mxmdcb = 1;
> module_param_named(mxmdcb, nouveau_mxmdcb, int, 0400);
> 
>+MODULE_PARM_DESC(hdmi_disable, "List of outputs (or \"all\") on which to\n"
>+		"\t\tdisable HDMI functionality (audio, HDCP, etc.)\n"
>+		"\t\t(Up to " __stringify(NOUVEAU_HDMI_DISABLE_LIST_SIZE)
>+		" comma-separated output names can be listed.)\n");
>+char *nouveau_hdmi_disable[NOUVEAU_HDMI_DISABLE_LIST_SIZE];
>+unsigned int nouveau_hdmi_disable_size;
>+module_param_array_named(hdmi_disable, nouveau_hdmi_disable, charp,
>+			 &nouveau_hdmi_disable_size, 0400);
>+
> int nouveau_fbpercrtc;
> #if 0
> module_param_named(fbpercrtc, nouveau_fbpercrtc, int, 0400);
>diff -ur linux-3.3/drivers/gpu/drm/nouveau/nouveau_drv.h linux-3.3-nouveau/drivers/gpu/drm/nouveau/nouveau_drv.h
>--- linux-3.3/drivers/gpu/drm/nouveau/nouveau_drv.h	2012-03-18 18:15:34.000000000 -0500
>+++ linux-3.3-nouveau/drivers/gpu/drm/nouveau/nouveau_drv.h	2012-04-05 22:46:13.652909395 -0500
>@@ -39,6 +39,17 @@
> #define NOUVEAU_FAMILY   0x0000FFFF
> #define NOUVEAU_FLAGS    0xFFFF0000
> 
>+/*
>+ * This is the maximum number of output names that can be passed with the
>+ * hdmi_disable parameter.  "hdmi_disable=all" can be used to turn off HDMI
>+ * functionality on all outputs, so setting this to 3 effectively supports up to
>+ * 4 in-use outputs.
>+ * 
>+ * NOTE: Don't put any parentheses around the value of this macro; it gets
>+ * stringified in nouveau_drv.c.
>+ */
>+#define NOUVEAU_HDMI_DISABLE_LIST_SIZE	3
>+
> #include "ttm/ttm_bo_api.h"
> #include "ttm/ttm_bo_driver.h"
> #include "ttm/ttm_placement.h"
>@@ -861,6 +872,8 @@
> extern int nouveau_msi;
> extern int nouveau_ctxfw;
> extern int nouveau_mxmdcb;
>+extern char *nouveau_hdmi_disable[];
>+extern unsigned int nouveau_hdmi_disable_size;
> 
> extern int nouveau_pci_suspend(struct pci_dev *pdev, pm_message_t pm_state);
> extern int nouveau_pci_resume(struct pci_dev *pdev);
>diff -ur linux-3.3/drivers/gpu/drm/nouveau/nouveau_hdmi.c linux-3.3-nouveau/drivers/gpu/drm/nouveau/nouveau_hdmi.c
>--- linux-3.3/drivers/gpu/drm/nouveau/nouveau_hdmi.c	2012-03-18 18:15:34.000000000 -0500
>+++ linux-3.3-nouveau/drivers/gpu/drm/nouveau/nouveau_hdmi.c	2012-04-05 17:39:50.694155519 -0500
>@@ -223,6 +223,10 @@
> 	u32 max_ac_packet, rekey;
> 
> 	nv_connector = nouveau_encoder_connector_get(nv_encoder);
>+	
>+	if (nv_connector && nv_connector->hdmi_disable)
>+		return;
>+	
> 	if (!mode || !nv_connector || !nv_connector->edid ||
> 	    !drm_detect_hdmi_monitor(nv_connector->edid)) {
> 		nouveau_hdmi_disconnect(encoder);

Actions: View | Diff

Attachments on bug 806091: 572083 | 572084 | 572085 | 572086 | 572087 | 572089 | 572090 | 572789 | 572790 | 573177 | 575607 | 581917 | 603613 | 642917 | 642918 | 642919 | 678930 | 678931 | 678932 | 711667 | 711668 | 711669 | 738572 | 916523 | 916524 | 916525 | 937268 | 937269