3.16.7-ckt2 -stable review patch.  If anyone has any objections, please let me 
know.

------------------

From: Ben Skeggs <[email protected]>

commit 147ed897e807e1a6e2c6fd9dc91830f1d2831d43 upstream.

Signed-off-by: Ben Skeggs <[email protected]>
Cc: Sven Joachim <[email protected]>
Signed-off-by: Luis Henriques <[email protected]>
---
 drivers/gpu/drm/nouveau/core/subdev/ltcg/gf100.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/nouveau/core/subdev/ltcg/gf100.c 
b/drivers/gpu/drm/nouveau/core/subdev/ltcg/gf100.c
index f2f3338a967a..effe88888bf9 100644
--- a/drivers/gpu/drm/nouveau/core/subdev/ltcg/gf100.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/ltcg/gf100.c
@@ -135,7 +135,7 @@ gf100_ltcg_init_tag_ram(struct nouveau_fb *pfb, struct 
gf100_ltcg_priv *priv)
        if (ret) {
                priv->num_tags = 0;
        } else {
-               u64 tag_base = (priv->tag_ram->offset << 12) + tag_margin;
+               u64 tag_base = ((u64)priv->tag_ram->offset << 12) + tag_margin;
 
                tag_base += tag_align - 1;
                ret = do_div(tag_base, tag_align);
-- 
2.1.0

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to