diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2015-06-10 05:30:54 (GMT) |
|---|---|---|
| committer | Kamal Mostafa <kamal@canonical.com> | 2015-07-06 22:59:40 (GMT) |
| commit | bdb01a9532b5a985631d04aefc10e0a421284f28 (patch) | |
| tree | 973e4832ceaf0e4454995a060d01a14ae0a122f3 | |
| parent | bde11f3705c3aef7cd03731bf531c92c67a07358 (diff) | |
Revert "drm/radeon: adjust pll when audio is not enabled"
commit ebb9bf18636926d5da97136c22e882c5d91fda73 upstream.
This reverts commit 7fe04d6fa824ccea704535a597dc417c8687f990.
Fixes some systems at the expense of others. Need to properly
fix the pll divider selection.
bug:
https://bugzilla.kernel.org/show_bug.cgi?id=99651
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
| -rw-r--r-- | drivers/gpu/drm/radeon/atombios_crtc.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c index 1afc0b4..9bd5611 100644 --- a/drivers/gpu/drm/radeon/atombios_crtc.c +++ b/drivers/gpu/drm/radeon/atombios_crtc.c @@ -580,9 +580,6 @@ static u32 atombios_adjust_pll(struct drm_crtc *crtc, else radeon_crtc->pll_flags |= RADEON_PLL_PREFER_LOW_REF_DIV; - /* if there is no audio, set MINM_OVER_MAXP */ - if (!drm_detect_monitor_audio(radeon_connector_edid(connector))) - radeon_crtc->pll_flags |= RADEON_PLL_PREFER_MINM_OVER_MAXP; if (rdev->family < CHIP_RV770) radeon_crtc->pll_flags |= RADEON_PLL_PREFER_MINM_OVER_MAXP; /* use frac fb div on APUs */ |