Alexandre Courbot
2015-Feb-17 06:55 UTC
[Nouveau] [PATCH] graph/nvc0: Fix engine pointer retrieval
From: Lauri Peltonen <lpeltonen at nvidia.com>
Other methods in this file suggest this is the correct way to retrieve
the engine pointer.
Signed-off-by: Lauri Peltonen <lpeltonen at nvidia.com>
Signed-off-by: Alexandre Courbot <acourbot at nvidia.com>
---
drm/nouveau/nvkm/engine/gr/gf100.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drm/nouveau/nvkm/engine/gr/gf100.c
b/drm/nouveau/nvkm/engine/gr/gf100.c
index b751d0dc4bf3..34b6d4baea16 100644
--- a/drm/nouveau/nvkm/engine/gr/gf100.c
+++ b/drm/nouveau/nvkm/engine/gr/gf100.c
@@ -241,7 +241,7 @@ static int
gf100_gr_set_shader_exceptions(struct nvkm_object *object, u32 mthd,
void *pdata, u32 size)
{
- struct gf100_gr_priv *priv = (void *)nv_engine(object);
+ struct gf100_gr_priv *priv = (void *)object->engine;
if (size >= sizeof(u32)) {
u32 data = *(u32 *)pdata ? 0xffffffff : 0x00000000;
nv_wr32(priv, 0x419e44, data);
--
2.3.0
Ben Skeggs
2015-Feb-17 22:48 UTC
[Nouveau] [PATCH] graph/nvc0: Fix engine pointer retrieval
On Tue, Feb 17, 2015 at 4:55 PM, Alexandre Courbot <acourbot at nvidia.com> wrote:> From: Lauri Peltonen <lpeltonen at nvidia.com> > > Other methods in this file suggest this is the correct way to retrieve > the engine pointer.Yes, oops. I've been working to find a way to make all this stuff less dodgy and error-prone, while still keeping the amount of boiler-plate to a minimum. It's not an easy task, and I've dropped several approaches already. I think I'm onto a decent one, finally, but it's a lot of work and tricky to do in a bisectable way. Hopefully I'll have something mergable soon. Thanks for the patch :) Ben.> > Signed-off-by: Lauri Peltonen <lpeltonen at nvidia.com> > Signed-off-by: Alexandre Courbot <acourbot at nvidia.com> > --- > drm/nouveau/nvkm/engine/gr/gf100.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drm/nouveau/nvkm/engine/gr/gf100.c b/drm/nouveau/nvkm/engine/gr/gf100.c > index b751d0dc4bf3..34b6d4baea16 100644 > --- a/drm/nouveau/nvkm/engine/gr/gf100.c > +++ b/drm/nouveau/nvkm/engine/gr/gf100.c > @@ -241,7 +241,7 @@ static int > gf100_gr_set_shader_exceptions(struct nvkm_object *object, u32 mthd, > void *pdata, u32 size) > { > - struct gf100_gr_priv *priv = (void *)nv_engine(object); > + struct gf100_gr_priv *priv = (void *)object->engine; > if (size >= sizeof(u32)) { > u32 data = *(u32 *)pdata ? 0xffffffff : 0x00000000; > nv_wr32(priv, 0x419e44, data); > -- > 2.3.0 > > _______________________________________________ > Nouveau mailing list > Nouveau at lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/nouveau