Attachment 573177 Details for Bug 806091 – Add a module parameter to disable nouveau HDMI functionality

[patch] Add a module parameter to disable nouveau HDMI functionality

nouveau-hdmi-disable.patch (text/plain), 2.39 KB, created by Ian Pilcher on 2012-03-27 20:45:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ian Pilcher

Created: 2012-03-27 20:45:53 UTC

Size: 2.39 KB

patch

obsolete

>diff -ur linux-3.3/drivers/gpu/drm/nouveau/nouveau_drv.c linux-3.3-nouveau-hdmi/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-hdmi/drivers/gpu/drm/nouveau/nouveau_drv.c	2012-03-27 14:33:05.762975164 -0500
>@@ -128,6 +128,10 @@
> int nouveau_mxmdcb = 1;
> module_param_named(mxmdcb, nouveau_mxmdcb, int, 0400);
> 
>+MODULE_PARM_DESC(hdmi_disable, "Disable HDMI functions (HDCP, audio, etc.)\n");
>+bool nouveau_hdmi_disable = 0;
>+module_param_named(hdmi_disable, nouveau_hdmi_disable, bool, 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-hdmi/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-hdmi/drivers/gpu/drm/nouveau/nouveau_drv.h	2012-03-27 14:47:32.231037710 -0500
>@@ -861,6 +861,7 @@
> extern int nouveau_msi;
> extern int nouveau_ctxfw;
> extern int nouveau_mxmdcb;
>+extern bool nouveau_hdmi_disable;
> 
> extern int nouveau_pci_suspend(struct pci_dev *pdev, pm_message_t pm_state);
> extern int nouveau_pci_resume(struct pci_dev *pdev);
>@@ -1115,7 +1116,14 @@
> int nouveau_ttm_mmap(struct file *, struct vm_area_struct *);
> 
> /* nouveau_hdmi.c */
>-void nouveau_hdmi_mode_set(struct drm_encoder *, struct drm_display_mode *);
>+void __nouveau_hdmi_mode_set(struct drm_encoder *, struct drm_display_mode *);
>+
>+static inline void nouveau_hdmi_mode_set(struct drm_encoder *encoder,
>+					 struct drm_display_mode *mode)
>+{
>+	if (!nouveau_hdmi_disable)
>+		__nouveau_hdmi_mode_set(encoder, mode);
>+}
> 
> /* nouveau_dp.c */
> int nouveau_dp_auxch(struct nouveau_i2c_chan *auxch, int cmd, int addr,
>diff -ur linux-3.3/drivers/gpu/drm/nouveau/nouveau_hdmi.c linux-3.3-nouveau-hdmi/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-hdmi/drivers/gpu/drm/nouveau/nouveau_hdmi.c	2012-03-27 14:43:44.278021255 -0500
>@@ -214,8 +214,8 @@
> }
> 
> void
>-nouveau_hdmi_mode_set(struct drm_encoder *encoder,
>-		      struct drm_display_mode *mode)
>+__nouveau_hdmi_mode_set(struct drm_encoder *encoder,
>+			struct drm_display_mode *mode)
> {
> 	struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);
> 	struct nouveau_connector *nv_connector;

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