diff mbox series

[Disco] Revert "UBUNTU: SAUCE: drm/nouveau: Disable nouveau driver by default"

Message ID 20190415133648.3360-1-tjaalton@ubuntu.com
State New
Headers show
Series [Disco] Revert "UBUNTU: SAUCE: drm/nouveau: Disable nouveau driver by default" | expand

Commit Message

Timo Aaltonen April 15, 2019, 1:36 p.m. UTC
From: Timo Aaltonen <timo.aaltonen@canonical.com>

BugLink: https://bugs.launchpad.net/bugs/1824677

This reverts commit 17f55e7d974d75aea10958d2434b5a81f9168ad3.

The fix/break ratio is off, let's revisit this later with a patch
to disable modeset only on hw which is known to be broken instead
for everyone.

Signed-off-by: Timo Aaltonen <timo.aaltonen@canonical.com>
---
 drivers/gpu/drm/nouveau/nouveau_drm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Seth Forshee April 15, 2019, 1:43 p.m. UTC | #1
On Mon, Apr 15, 2019 at 04:36:48PM +0300, Timo Aaltonen wrote:
> From: Timo Aaltonen <timo.aaltonen@canonical.com>
> 
> BugLink: https://bugs.launchpad.net/bugs/1824677
> 
> This reverts commit 17f55e7d974d75aea10958d2434b5a81f9168ad3.
> 
> The fix/break ratio is off, let's revisit this later with a patch
> to disable modeset only on hw which is known to be broken instead
> for everyone.
> 
> Signed-off-by: Timo Aaltonen <timo.aaltonen@canonical.com>

Acked-by: Seth Forshee <seth.forshee@canonical.com>
Colin Ian King April 15, 2019, 1:45 p.m. UTC | #2
On 15/04/2019 14:36, Timo Aaltonen wrote:
> From: Timo Aaltonen <timo.aaltonen@canonical.com>
> 
> BugLink: https://bugs.launchpad.net/bugs/1824677
> 
> This reverts commit 17f55e7d974d75aea10958d2434b5a81f9168ad3.
> 
> The fix/break ratio is off, let's revisit this later with a patch
> to disable modeset only on hw which is known to be broken instead
> for everyone.
> 
> Signed-off-by: Timo Aaltonen <timo.aaltonen@canonical.com>
> ---
>  drivers/gpu/drm/nouveau/nouveau_drm.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c
> index 663c9a2b8ee4..f900e94592f8 100644
> --- a/drivers/gpu/drm/nouveau/nouveau_drm.c
> +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c
> @@ -78,7 +78,7 @@ module_param_named(noaccel, nouveau_noaccel, int, 0400);
>  
>  MODULE_PARM_DESC(modeset, "enable driver (default: auto, "
>  		          "0 = disabled, 1 = enabled, 2 = headless)");
> -int nouveau_modeset = 0;
> +int nouveau_modeset = -1;
>  module_param_named(modeset, nouveau_modeset, int, 0400);
>  
>  MODULE_PARM_DESC(atomic, "Expose atomic ioctl (default: disabled)");
> 

Seems like the best way forward for now.

Acked-by: Colin Ian King <colin.king@canonical.com>
Seth Forshee April 15, 2019, 2:20 p.m. UTC | #3
On Mon, Apr 15, 2019 at 04:36:48PM +0300, Timo Aaltonen wrote:
> From: Timo Aaltonen <timo.aaltonen@canonical.com>
> 
> BugLink: https://bugs.launchpad.net/bugs/1824677
> 
> This reverts commit 17f55e7d974d75aea10958d2434b5a81f9168ad3.
> 
> The fix/break ratio is off, let's revisit this later with a patch
> to disable modeset only on hw which is known to be broken instead
> for everyone.
> 
> Signed-off-by: Timo Aaltonen <timo.aaltonen@canonical.com>

Applied to disco/master-next, thanks!
diff mbox series

Patch

diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c
index 663c9a2b8ee4..f900e94592f8 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_drm.c
@@ -78,7 +78,7 @@  module_param_named(noaccel, nouveau_noaccel, int, 0400);
 
 MODULE_PARM_DESC(modeset, "enable driver (default: auto, "
 		          "0 = disabled, 1 = enabled, 2 = headless)");
-int nouveau_modeset = 0;
+int nouveau_modeset = -1;
 module_param_named(modeset, nouveau_modeset, int, 0400);
 
 MODULE_PARM_DESC(atomic, "Expose atomic ioctl (default: disabled)");