Patchwork Patch: SAUCE: Disable acceleration on GeForce 6100

login
register
mail settings
Submitter Christopher James Halse Rogers
Date April 13, 2010, 11:31 a.m.
Message ID <1271158314.4709.5.camel@Spike>
Download mbox | patch
Permalink /patch/50061/
State Accepted
Delegated to: Andy Whitcroft
Headers show

Comments

Christopher James Halse Rogers - April 13, 2010, 11:31 a.m.
This extra quirk applies on the top of the previous 3 patches.

Subject: [PATCH] UBUNTU: SAUCE: Nouveau: Disable acceleration on 6100
cards

Upstream obviously wants to fix acceleration rather than disable it.
For Lucid however we need these cards to boot more than we need them to
be fast.

With acceleration enabled these cards hang during boot.

BugLink: http://bugs.launchpad.net/bugs/542950

Signed-off-by: Christopher James Halse Rogers
<christopher.halse.rogers@canonical.com>
Andy Whitcroft - April 13, 2010, 12:16 p.m.
On Tue, Apr 13, 2010 at 09:31:54PM +1000, Christopher James Halse Rogers wrote:
> This extra quirk applies on the top of the previous 3 patches.
> 
> Subject: [PATCH] UBUNTU: SAUCE: Nouveau: Disable acceleration on 6100
> cards
> 
> Upstream obviously wants to fix acceleration rather than disable it.
> For Lucid however we need these cards to boot more than we need them to
> be fast.
> 
> With acceleration enabled these cards hang during boot.
> 
> BugLink: http://bugs.launchpad.net/bugs/542950
> 
> Signed-off-by: Christopher James Halse Rogers
> <christopher.halse.rogers@canonical.com>
> 
> 

> From 9532aca5caedaf43086b68c1352422c727373f46 Mon Sep 17 00:00:00 2001
> From: Christopher James Halse Rogers <raof@ubuntu.com>
> Date: Tue, 13 Apr 2010 19:36:39 +1000
> Subject: [PATCH] UBUNTU: SAUCE: Nouveau: Disable acceleration on 6100 cards
> 
> Upstream obviously wants to fix acceleration rather than disable it.
> For Lucid however we need these cards to boot more than we need them to
> be fast.
> 
> With acceleration enabled these cards hang during boot.
> 
> BugLink: http://bugs.launchpad.net/bugs/542950
> 
> Signed-off-by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
> ---
>  drivers/gpu/drm/nouveau/nouveau_state.c |    7 +++++++
>  1 files changed, 7 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c
> index 63014f4..a112998 100644
> --- a/drivers/gpu/drm/nouveau/nouveau_state.c
> +++ b/drivers/gpu/drm/nouveau/nouveau_state.c
> @@ -621,6 +621,13 @@ static void nouveau_apply_noaccel_quirks (struct drm_device *dev)
>  			NV_INFO(dev, "Detected NV20 (GeForce 3) chip. "
>  				 "Disabling acceleration\n");
>  		}
> +		/* GeForce 6100 cards also hang with acceleration */
> +		/* See https://bugs.launchpad.net/bugs/542950 */
> +		if (dev->pdev->device == 0x0242) {
> +			nouveau_noaccel = 1;
> +			NV_INFO(dev, "Detected GeForce 6100 chip. "
> +				 "Disabling acceleration\n");
> +		}
>  	}
>  }

This list is getting comprehensive enough that we should look at making
this into some kind of list if we are going to get any more of these.

-apw
Christopher James Halse Rogers - April 13, 2010, 1:01 p.m.
On Tue, 2010-04-13 at 13:16 +0100, Andy Whitcroft wrote: 
> On Tue, Apr 13, 2010 at 09:31:54PM +1000, Christopher James Halse Rogers wrote:
> > This extra quirk applies on the top of the previous 3 patches.
> > 
> > Subject: [PATCH] UBUNTU: SAUCE: Nouveau: Disable acceleration on 6100
> > cards
> > 
> > Upstream obviously wants to fix acceleration rather than disable it.
> > For Lucid however we need these cards to boot more than we need them to
> > be fast.
> > 
> > With acceleration enabled these cards hang during boot.
> > 
> > BugLink: http://bugs.launchpad.net/bugs/542950
> > 
> > Signed-off-by: Christopher James Halse Rogers
> > <christopher.halse.rogers@canonical.com>
> > 
> > 
> 
> > From 9532aca5caedaf43086b68c1352422c727373f46 Mon Sep 17 00:00:00 2001
> > From: Christopher James Halse Rogers <raof@ubuntu.com>
> > Date: Tue, 13 Apr 2010 19:36:39 +1000
> > Subject: [PATCH] UBUNTU: SAUCE: Nouveau: Disable acceleration on 6100 cards
> > 
> > Upstream obviously wants to fix acceleration rather than disable it.
> > For Lucid however we need these cards to boot more than we need them to
> > be fast.
> > 
> > With acceleration enabled these cards hang during boot.
> > 
> > BugLink: http://bugs.launchpad.net/bugs/542950
> > 
> > Signed-off-by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
> > ---
> >  drivers/gpu/drm/nouveau/nouveau_state.c |    7 +++++++
> >  1 files changed, 7 insertions(+), 0 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c
> > index 63014f4..a112998 100644
> > --- a/drivers/gpu/drm/nouveau/nouveau_state.c
> > +++ b/drivers/gpu/drm/nouveau/nouveau_state.c
> > @@ -621,6 +621,13 @@ static void nouveau_apply_noaccel_quirks (struct drm_device *dev)
> >  			NV_INFO(dev, "Detected NV20 (GeForce 3) chip. "
> >  				 "Disabling acceleration\n");
> >  		}
> > +		/* GeForce 6100 cards also hang with acceleration */
> > +		/* See https://bugs.launchpad.net/bugs/542950 */
> > +		if (dev->pdev->device == 0x0242) {
> > +			nouveau_noaccel = 1;
> > +			NV_INFO(dev, "Detected GeForce 6100 chip. "
> > +				 "Disabling acceleration\n");
> > +		}
> >  	}
> >  }
> 
> This list is getting comprehensive enough that we should look at making
> this into some kind of list if we are going to get any more of these.

I was thinking of that when I wrote the initial patch, but decided
against it because the first two quirks relied on different data (macs
are quirked against pciid, geforce 3 is a broader quirk against chipset
family).

If this list grows any longer I think it'll become obvious what data
needs to be stored for the quirk list.

Patch

From 9532aca5caedaf43086b68c1352422c727373f46 Mon Sep 17 00:00:00 2001
From: Christopher James Halse Rogers <raof@ubuntu.com>
Date: Tue, 13 Apr 2010 19:36:39 +1000
Subject: [PATCH] UBUNTU: SAUCE: Nouveau: Disable acceleration on 6100 cards

Upstream obviously wants to fix acceleration rather than disable it.
For Lucid however we need these cards to boot more than we need them to
be fast.

With acceleration enabled these cards hang during boot.

BugLink: http://bugs.launchpad.net/bugs/542950

Signed-off-by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
---

 drivers/gpu/drm/nouveau/nouveau_state.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c

index 63014f4..a112998 100644

--- a/drivers/gpu/drm/nouveau/nouveau_state.c

+++ b/drivers/gpu/drm/nouveau/nouveau_state.c

@@ -621,6 +621,13 @@  static void nouveau_apply_noaccel_quirks (struct drm_device *dev)

 			NV_INFO(dev, "Detected NV20 (GeForce 3) chip. "
 				 "Disabling acceleration\n");
 		}
+		/* GeForce 6100 cards also hang with acceleration */

+		/* See https://bugs.launchpad.net/bugs/542950 */

+		if (dev->pdev->device == 0x0242) {

+			nouveau_noaccel = 1;

+			NV_INFO(dev, "Detected GeForce 6100 chip. "

+				 "Disabling acceleration\n");

+		}

 	}
 }
 
-- 

1.7.0.4