From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marcin Slusarz Subject: Re: [PATCH] gallium/nouveau: use pre-calculated stride for resource_get_handle Date: Thu, 4 Oct 2012 16:58:21 +0200 Message-ID: <20121004145821.GE4979@joi.lan> References: <20121004112911.GA4979@joi.lan> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline In-Reply-To: <20121004112911.GA4979-OI9uyE9O0yo@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: nouveau-bounces+gcfxn-nouveau=m.gmane.org-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Errors-To: nouveau-bounces+gcfxn-nouveau=m.gmane.org-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org To: nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org List-Id: nouveau.vger.kernel.org On Thu, Oct 04, 2012 at 01:29:11PM +0200, Marcin Slusarz wrote: > Fixes FDO#55294. > --- BTW, I'd like to also apply it to 9.0 branch. > src/gallium/drivers/nv30/nv30_miptree.c | 3 +-- > src/gallium/drivers/nv50/nv50_miptree.c | 3 +-- > 2 files changed, 2 insertions(+), 4 deletions(-) > > diff --git a/src/gallium/drivers/nv30/nv30_miptree.c b/src/gallium/drivers/nv30/nv30_miptree.c > index 5a9a63b..9700fa8 100644 > --- a/src/gallium/drivers/nv30/nv30_miptree.c > +++ b/src/gallium/drivers/nv30/nv30_miptree.c > @@ -56,8 +56,7 @@ nv30_miptree_get_handle(struct pipe_screen *pscreen, > if (!mt || !mt->base.bo) > return FALSE; > > - stride = util_format_get_stride(mt->base.base.format, > - mt->base.base.width0); > + stride = mt->level[0].pitch; > > return nouveau_screen_bo_get_handle(pscreen, mt->base.bo, stride, handle); > } > diff --git a/src/gallium/drivers/nv50/nv50_miptree.c b/src/gallium/drivers/nv50/nv50_miptree.c > index 7b8dfb8..70e8c77 100644 > --- a/src/gallium/drivers/nv50/nv50_miptree.c > +++ b/src/gallium/drivers/nv50/nv50_miptree.c > @@ -133,8 +133,7 @@ nv50_miptree_get_handle(struct pipe_screen *pscreen, > if (!mt || !mt->base.bo) > return FALSE; > > - stride = util_format_get_stride(mt->base.base.format, > - mt->base.base.width0); > + stride = mt->level[0].pitch; > > return nouveau_screen_bo_get_handle(pscreen, > mt->base.bo, > --