diff options
author | Dan Carpenter <dan.carpenter@oracle.com> | 2013-11-12 07:34:11 -0500 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2013-11-13 23:57:03 -0500 |
commit | 377cfdc6eeced55e220fea2d07d6ebdd32166e66 (patch) | |
tree | 7072c9b8cac50b0ad052a982c531bf6ca781de51 /drivers | |
parent | 35c336707f51f6336c9cb8a60b6f1aa5a3099ad7 (diff) |
drm/nvc0-/gr: shift wrapping bug in nvc0_grctx_generate_r406800
We care about the upper 32 bits here so we have to use 1ULL instead of 1
to avoid a shift wrapping bug.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc0.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc0.c b/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc0.c index 64dca260912f..fe67415c3e17 100644 --- a/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc0.c +++ b/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc0.c | |||
@@ -1039,7 +1039,7 @@ nvc0_grctx_generate_r406800(struct nvc0_graph_priv *priv) | |||
1039 | } while (!tpcnr[gpc]); | 1039 | } while (!tpcnr[gpc]); |
1040 | tpc = priv->tpc_nr[gpc] - tpcnr[gpc]--; | 1040 | tpc = priv->tpc_nr[gpc] - tpcnr[gpc]--; |
1041 | 1041 | ||
1042 | tpc_set |= 1 << ((gpc * 8) + tpc); | 1042 | tpc_set |= 1ULL << ((gpc * 8) + tpc); |
1043 | } | 1043 | } |
1044 | 1044 | ||
1045 | nv_wr32(priv, 0x406800 + (i * 0x20), lower_32_bits(tpc_set)); | 1045 | nv_wr32(priv, 0x406800 + (i * 0x20), lower_32_bits(tpc_set)); |