Skip to content

Commit

Permalink
drm/nv50/disp: shhh compiler
Browse files Browse the repository at this point in the history
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
  • Loading branch information
Ben Skeggs committed Aug 9, 2014
1 parent d6bd380 commit c354080
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/gpu/drm/nouveau/core/engine/disp/nv50.c
Original file line number Diff line number Diff line change
Expand Up @@ -1574,7 +1574,7 @@ nv50_disp_intr_unk20_2_dp(struct nv50_disp_priv *priv,
int TU, VTUi, VTUf, VTUa;
u64 link_data_rate, link_ratio, unk;
u32 best_diff = 64 * symbol;
u32 link_nr, link_bw, bits, r;
u32 link_nr, link_bw, bits;

/* calculate packed data rate for each lane */
if (dpctrl > 0x00030000) link_nr = 4;
Expand All @@ -1594,7 +1594,7 @@ nv50_disp_intr_unk20_2_dp(struct nv50_disp_priv *priv,

/* calculate ratio of packed data rate to link symbol rate */
link_ratio = link_data_rate * symbol;
r = do_div(link_ratio, link_bw);
do_div(link_ratio, link_bw);

for (TU = 64; TU >= 32; TU--) {
/* calculate average number of valid symbols in each TU */
Expand Down Expand Up @@ -1655,8 +1655,8 @@ nv50_disp_intr_unk20_2_dp(struct nv50_disp_priv *priv,
/* XXX close to vbios numbers, but not right */
unk = (symbol - link_ratio) * bestTU;
unk *= link_ratio;
r = do_div(unk, symbol);
r = do_div(unk, symbol);
do_div(unk, symbol);
do_div(unk, symbol);
unk += 6;

nv_mask(priv, 0x61c10c + loff, 0x000001fc, bestTU << 2);
Expand Down

0 comments on commit c354080

Please sign in to comment.