From 7beba42f42bb6579412a470135d8a5c92ec08ee3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Ko=C5=9Bcielnicki?= Date: Sun, 10 Jan 2010 17:09:14 +0000 Subject: [PATCH] --- yaml --- r: 179881 b: refs/heads/master c: fe5a64acbfab4f79ccd18972c3d4c1cae31f3b8d h: refs/heads/master i: 179879: c889937981559c11cd8a64ad13f95439c102aa2c v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/nv04_graph.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 87736404518a..fdafd60bf261 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 75c99da6cdd0ec9d70747f9ced3e85b2dd955cdf +refs/heads/master: fe5a64acbfab4f79ccd18972c3d4c1cae31f3b8d diff --git a/trunk/drivers/gpu/drm/nouveau/nv04_graph.c b/trunk/drivers/gpu/drm/nouveau/nv04_graph.c index 98f3b40318d4..e260986ea65a 100644 --- a/trunk/drivers/gpu/drm/nouveau/nv04_graph.c +++ b/trunk/drivers/gpu/drm/nouveau/nv04_graph.c @@ -537,7 +537,7 @@ nv04_graph_mthd_set_operation(struct nouveau_channel *chan, int grclass, int mthd, uint32_t data) { struct drm_device *dev = chan->dev; - uint32_t instance = nv_rd32(dev, NV04_PGRAPH_CTX_SWITCH4) & 0xffff; + uint32_t instance = (nv_rd32(dev, NV04_PGRAPH_CTX_SWITCH4) & 0xffff) << 4; int subc = (nv_rd32(dev, NV04_PGRAPH_TRAPPED_ADDR) >> 13) & 0x7; uint32_t tmp;