From fb478cd2485d753d31b8e852ef300958e6fd21cc Mon Sep 17 00:00:00 2001 From: Marcin Slusarz Date: Tue, 6 Nov 2012 22:48:50 +0100 Subject: [PATCH] --- yaml --- r: 335471 b: refs/heads/master c: a4dd4ec250fc2ac1fee371a08020bfca498a8375 h: refs/heads/master i: 335469: 68c23cce98c17b909df01fc3c4b7c0f542c1564b 335467: 2a32fb7a3a0a3ac18e7418b98750c2d0745495b6 335463: 5048d54b94c592c96bdbba22e0bdee610dc7a7ed 335455: e1c9af1edac26b1d05492ccb1e5fb1dbe59cc649 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/core/engine/graph/nv40.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 822c5f720f7d..c68fa7fea4e6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 479dd5670521a46ebcb55f535f8a41919cb93696 +refs/heads/master: a4dd4ec250fc2ac1fee371a08020bfca498a8375 diff --git a/trunk/drivers/gpu/drm/nouveau/core/engine/graph/nv40.c b/trunk/drivers/gpu/drm/nouveau/core/engine/graph/nv40.c index 8d0021049ec0..425001204a89 100644 --- a/trunk/drivers/gpu/drm/nouveau/core/engine/graph/nv40.c +++ b/trunk/drivers/gpu/drm/nouveau/core/engine/graph/nv40.c @@ -156,8 +156,8 @@ nv40_graph_context_ctor(struct nouveau_object *parent, static int nv40_graph_context_fini(struct nouveau_object *object, bool suspend) { - struct nv04_graph_priv *priv = (void *)object->engine; - struct nv04_graph_chan *chan = (void *)object; + struct nv40_graph_priv *priv = (void *)object->engine; + struct nv40_graph_chan *chan = (void *)object; u32 inst = 0x01000000 | nv_gpuobj(chan)->addr >> 4; int ret = 0;