diff --git a/[refs] b/[refs] index 56e17d391b10..e4774ad42208 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cade2413e940763cd99e9febba873fe1899d98cb +refs/heads/master: 8cb303a85b5782c337fe75d2525ca1638b30f057 diff --git a/trunk/drivers/gpu/drm/nouveau/core/subdev/ltcg/nvc0.c b/trunk/drivers/gpu/drm/nouveau/core/subdev/ltcg/nvc0.c index a529563b5f8c..e4940fb166e8 100644 --- a/trunk/drivers/gpu/drm/nouveau/core/subdev/ltcg/nvc0.c +++ b/trunk/drivers/gpu/drm/nouveau/core/subdev/ltcg/nvc0.c @@ -151,7 +151,7 @@ nvc0_ltcg_init_tag_ram(struct nouveau_fb *pfb, struct nvc0_ltcg_priv *priv) u64 tag_base = (priv->tag_ram->offset << 12) + tag_margin; tag_base += tag_align - 1; - tag_base /= tag_align; + ret = do_div(tag_base, tag_align); nv_wr32(priv, 0x17e8d4, tag_base); }