Skip to content

Commit

Permalink
drm/radeon: fix ordering in pll picking on dce4+
Browse files Browse the repository at this point in the history
No functional change, but re-order the cases so they
evaluate properly due to the way the DCE macros work.

Noticed by kallisti5 on IRC.

Signed-off-by: Alex Deucher <[email protected]>
  • Loading branch information
alexdeucher committed Aug 13, 2012
1 parent 81ee8fb commit ecd6795
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/gpu/drm/radeon/atombios_crtc.c
Original file line number Diff line number Diff line change
Expand Up @@ -1531,12 +1531,12 @@ static int radeon_atom_pick_pll(struct drm_crtc *crtc)
* crtc virtual pixel clock.
*/
if (ENCODER_MODE_IS_DP(atombios_get_encoder_mode(test_encoder))) {
if (ASIC_IS_DCE5(rdev))
return ATOM_DCPLL;
if (rdev->clock.dp_extclk)
return ATOM_PPLL_INVALID;
else if (ASIC_IS_DCE6(rdev))
return ATOM_PPLL0;
else if (rdev->clock.dp_extclk)
return ATOM_PPLL_INVALID;
else if (ASIC_IS_DCE5(rdev))
return ATOM_DCPLL;
}
}
}
Expand Down

0 comments on commit ecd6795

Please sign in to comment.