aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2014-08-09 14:10:30 -0400
committerBen Skeggs <bskeggs@redhat.com>2014-08-09 15:28:17 -0400
commitc354080dc8cf450f2db374bcfa8ce24cb97c62f2 (patch)
treec1ff2b7d35fa8421d475e61187c2fbaad9980e0f /drivers/gpu
parentd6bd380373cd72ee5431627c3a2d083d38511576 (diff)
drm/nv50/disp: shhh compiler
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/nouveau/core/engine/disp/nv50.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/nouveau/core/engine/disp/nv50.c b/drivers/gpu/drm/nouveau/core/engine/disp/nv50.c
index 2703910a0211..4b5bb5d58a54 100644
--- a/drivers/gpu/drm/nouveau/core/engine/disp/nv50.c
+++ b/drivers/gpu/drm/nouveau/core/engine/disp/nv50.c
@@ -1574,7 +1574,7 @@ nv50_disp_intr_unk20_2_dp(struct nv50_disp_priv *priv,
1574 int TU, VTUi, VTUf, VTUa; 1574 int TU, VTUi, VTUf, VTUa;
1575 u64 link_data_rate, link_ratio, unk; 1575 u64 link_data_rate, link_ratio, unk;
1576 u32 best_diff = 64 * symbol; 1576 u32 best_diff = 64 * symbol;
1577 u32 link_nr, link_bw, bits, r; 1577 u32 link_nr, link_bw, bits;
1578 1578
1579 /* calculate packed data rate for each lane */ 1579 /* calculate packed data rate for each lane */
1580 if (dpctrl > 0x00030000) link_nr = 4; 1580 if (dpctrl > 0x00030000) link_nr = 4;
@@ -1594,7 +1594,7 @@ nv50_disp_intr_unk20_2_dp(struct nv50_disp_priv *priv,
1594 1594
1595 /* calculate ratio of packed data rate to link symbol rate */ 1595 /* calculate ratio of packed data rate to link symbol rate */
1596 link_ratio = link_data_rate * symbol; 1596 link_ratio = link_data_rate * symbol;
1597 r = do_div(link_ratio, link_bw); 1597 do_div(link_ratio, link_bw);
1598 1598
1599 for (TU = 64; TU >= 32; TU--) { 1599 for (TU = 64; TU >= 32; TU--) {
1600 /* calculate average number of valid symbols in each TU */ 1600 /* calculate average number of valid symbols in each TU */
@@ -1655,8 +1655,8 @@ nv50_disp_intr_unk20_2_dp(struct nv50_disp_priv *priv,
1655 /* XXX close to vbios numbers, but not right */ 1655 /* XXX close to vbios numbers, but not right */
1656 unk = (symbol - link_ratio) * bestTU; 1656 unk = (symbol - link_ratio) * bestTU;
1657 unk *= link_ratio; 1657 unk *= link_ratio;
1658 r = do_div(unk, symbol); 1658 do_div(unk, symbol);
1659 r = do_div(unk, symbol); 1659 do_div(unk, symbol);
1660 unk += 6; 1660 unk += 6;
1661 1661
1662 nv_mask(priv, 0x61c10c + loff, 0x000001fc, bestTU << 2); 1662 nv_mask(priv, 0x61c10c + loff, 0x000001fc, bestTU << 2);