[PATCH] drm/nouveau: Fix a complier warning in the card init error path

[PATCH] drm/nouveau: Fix a complier warning in the card init error path

[Jimmy Rentz]

Fix an unitialized variable complier warning in nouveau_card_init.
    
Signed-off-by: Jimmy Rentz <jb17bsome-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>

diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c
index 3404950..66e8037 100644
--- a/drivers/gpu/drm/nouveau/nouveau_state.c
+++ b/drivers/gpu/drm/nouveau/nouveau_state.c
@@ -679,7 +679,7 @@ out_fifo:
 		engine->fifo.takedown(dev);
 out_engine:
 	if (!nouveau_noaccel) {
-		for (e = e - 1; e >= 0; e--) {
+		for (e = NVOBJ_ENGINE_NR - 1; e >= 0; e--) {
 			if (!dev_priv->eng[e])
 				continue;
 			dev_priv->eng[e]->fini(dev, e);

Re: [PATCH] drm/nouveau: Fix a complier warning in the card init error path

[Marcin Slusarz]

On Sun, Apr 17, 2011 at 04:14:53PM -0400, Jimmy Rentz wrote:
> Fix an unitialized variable complier warning in nouveau_card_init.
>     
> Signed-off-by: Jimmy Rentz <jb17bsome-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> 
> diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c
> index 3404950..66e8037 100644
> --- a/drivers/gpu/drm/nouveau/nouveau_state.c
> +++ b/drivers/gpu/drm/nouveau/nouveau_state.c
> @@ -679,7 +679,7 @@ out_fifo:
>  		engine->fifo.takedown(dev);
>  out_engine:
>  	if (!nouveau_noaccel) {
> -		for (e = e - 1; e >= 0; e--) {
> +		for (e = NVOBJ_ENGINE_NR - 1; e >= 0; e--) {
>  			if (!dev_priv->eng[e])
>  				continue;
>  			dev_priv->eng[e]->fini(dev, e);

This code is supposed to handle the situation when one of engine initialization
routines failed and this change will break it...

Marcin

Re: [PATCH] drm/nouveau: Fix a complier warning in the card init error path

[Jimmy Rentz]

On Sun, 17 Apr 2011 23:18:36 +0200
Marcin Slusarz <marcin.slusarz-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:

> On Sun, Apr 17, 2011 at 04:14:53PM -0400, Jimmy Rentz wrote:
> > Fix an unitialized variable complier warning in nouveau_card_init.
> >     
> > Signed-off-by: Jimmy Rentz <jb17bsome-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> > 
> > diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c
> > b/drivers/gpu/drm/nouveau/nouveau_state.c index 3404950..66e8037
> > 100644 --- a/drivers/gpu/drm/nouveau/nouveau_state.c
> > +++ b/drivers/gpu/drm/nouveau/nouveau_state.c
> > @@ -679,7 +679,7 @@ out_fifo:
> >  		engine->fifo.takedown(dev);
> >  out_engine:
> >  	if (!nouveau_noaccel) {
> > -		for (e = e - 1; e >= 0; e--) {
> > +		for (e = NVOBJ_ENGINE_NR - 1; e >= 0; e--) {
> >  			if (!dev_priv->eng[e])
> >  				continue;
> >  			dev_priv->eng[e]->fini(dev, e);
> 
> This code is supposed to handle the situation when one of engine
> initialization routines failed and this change will break it...
> 
> Marcin

Really?  It wasn't intentional.  I didn't see the e referenced above.

Re: [PATCH] drm/nouveau: Fix a complier warning in the card init error path

[Ben Skeggs]

On Sun, 2011-04-17 at 18:27 -0400, Jimmy Rentz wrote:
> On Sun, 17 Apr 2011 23:18:36 +0200
> Marcin Slusarz <marcin.slusarz-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:
> 
> > On Sun, Apr 17, 2011 at 04:14:53PM -0400, Jimmy Rentz wrote:
> > > Fix an unitialized variable complier warning in nouveau_card_init.
> > >     
> > > Signed-off-by: Jimmy Rentz <jb17bsome-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> > > 
> > > diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c
> > > b/drivers/gpu/drm/nouveau/nouveau_state.c index 3404950..66e8037
> > > 100644 --- a/drivers/gpu/drm/nouveau/nouveau_state.c
> > > +++ b/drivers/gpu/drm/nouveau/nouveau_state.c
> > > @@ -679,7 +679,7 @@ out_fifo:
> > >  		engine->fifo.takedown(dev);
> > >  out_engine:
> > >  	if (!nouveau_noaccel) {
> > > -		for (e = e - 1; e >= 0; e--) {
> > > +		for (e = NVOBJ_ENGINE_NR - 1; e >= 0; e--) {
> > >  			if (!dev_priv->eng[e])
> > >  				continue;
> > >  			dev_priv->eng[e]->fini(dev, e);
> > 
> > This code is supposed to handle the situation when one of engine
> > initialization routines failed and this change will break it...
> > 
> > Marcin
> 
> Really?  It wasn't intentional.  I didn't see the e referenced above.
It's used above, but I don't think it's actually an error.  The
situation where it's uninitialised can't actually happen

I pushed a patch that'll silence any compiler that may be complaining.

Ben.
> _______________________________________________
> Nouveau mailing list
> Nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org
> http://lists.freedesktop.org/mailman/listinfo/nouveau