Skip to content

Commit

Permalink
drm/radeon/kms: fix divide by 0 in clocks code
Browse files Browse the repository at this point in the history
If the chip isn't initialised properly this can happen.
also fix return value in combios clocks function.

Signed-off-by: Dave Airlie <airlied@redhat.com>
  • Loading branch information
Dave Airlie committed Dec 2, 2009
1 parent 7dde8a1 commit 4b30b87
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
8 changes: 8 additions & 0 deletions drivers/gpu/drm/radeon/radeon_clocks.c
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,10 @@ uint32_t radeon_legacy_get_engine_clock(struct radeon_device *rdev)

ref_div =
RREG32_PLL(RADEON_M_SPLL_REF_FB_DIV) & RADEON_M_SPLL_REF_DIV_MASK;

if (ref_div == 0)
return 0;

sclk = fb_div / ref_div;

post_div = RREG32_PLL(RADEON_SCLK_CNTL) & RADEON_SCLK_SRC_SEL_MASK;
Expand All @@ -70,6 +74,10 @@ static uint32_t radeon_legacy_get_memory_clock(struct radeon_device *rdev)

ref_div =
RREG32_PLL(RADEON_M_SPLL_REF_FB_DIV) & RADEON_M_SPLL_REF_DIV_MASK;

if (ref_div == 0)
return 0;

mclk = fb_div / ref_div;

post_div = RREG32_PLL(RADEON_MCLK_CNTL) & 0x7;
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/radeon/radeon_combios.c
Original file line number Diff line number Diff line change
Expand Up @@ -495,7 +495,7 @@ bool radeon_combios_get_clock_info(struct drm_device *dev)
uint16_t sclk, mclk;

if (rdev->bios == NULL)
return NULL;
return false;

pll_info = combios_get_table_offset(dev, COMBIOS_PLL_INFO_TABLE);
if (pll_info) {
Expand Down

0 comments on commit 4b30b87

Please sign in to comment.